Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/administrative/empBankAccount.vue

@@ -134,7 +134,7 @@
             class="normalBtn"
             value="查询"
           />
-					<input type="button" @click="AddAccount" class="normalBtn" :value="$t('pub.addBtn')" />
+					<input type="button" @click="AddAccountBank" class="normalBtn" :value="$t('pub.addBtn')" />
 				</li>
 			</ul>
 		</div>
@@ -169,7 +169,9 @@
 				<td class="empBankAccountIcon">
 					<el-button-group>
 					    <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
-						    <el-button  @click="outerVisible = true,dialogTitle=$t('ground.xiugaizhanghu'),updateData(item.ID)"  type="primary"  style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-bianji-smal" ></el-button>
+						    <el-button  @click="outerVisible = true,dialogTitle=$t('ground.xiugaizhanghu'),updateData(item.ID)"
+                type="primary"  style='background:#409EFF; border-color:#409EFF'
+                icon="iconfont icon-bianji-smal" ></el-button>
 						 </el-tooltip>
 						 <el-tooltip class="item" effect="dark" :content="item.Status=='1'? $t('fnc.qiyong'):$t('pub.fressSel')" placement="top-start">
               <el-button v-if='item.Status==1'  @click="deleteData(item.ID)"  type="primary"  style='background:#09D49D; border-color:#09D49D' icon="iconfont icon-qidong" ></el-button>
@@ -266,14 +268,13 @@
 			this.changeTitle()
 		},
 		methods: {
-      AddAccount(){
-        if(this.list&&this.list.length==1){
-          this.$message.info('已有账户,试试编辑已有账户吧！')
-          return
+      AddAccountBank(){
+        if(this.list&&this.list.length>0){
+          return this.$message.info('已有账户,试试编辑已有账户吧！')
         }
-        this.outerVisible = true
-        this.dialogTitle= this.$t('ground.xinzengzhanghu')
-        this.resetForm('addMsg')
+          this.outerVisible = true
+          this.dialogTitle= this.$t('ground.xinzengzhanghu')
+          this.resetForm('addMsg')
       },
 			changeTitle(){
 				if(this.addMsg.AccountClassify==1){
@@ -300,7 +301,7 @@
 				}
 			},
 			getList() {     //获取列表数据
-
+        this.loading = true
 				this.apipost("admin_get_GetEmpBankAccountPageList", this.msg, res => {
 					 if(res.data.resultCode==1){
 						this.list = res.data.data.pageData;
@@ -385,22 +386,25 @@
 //			    this.addMsg.Status = this.dataList[index].Status.toString();
 			},
 			deleteData(id){
-				this.$confirm(this.$t('ground.querenqiyong'), '提示', {
-					confirmButtonText: this.$t('pub.sureBtn'),
-					cancelButtonText: this.$t('pub.cancelBtn'),
+        let that = this
+				this.$confirm(that.$t('ground.querenqiyong'), '提示', {
+					confirmButtonText: that.$t('pub.sureBtn'),
+					cancelButtonText: that.$t('pub.cancelBtn'),
 					type: 'warning'
 				}).then(() => {
 					this.apipost('admin_post_DelEmpBankAccount', {
 						BAId:id
 					}, res => {
 						if(res.data.resultCode == 1) {
-							this.$message.success(this.$t('pub.saveYes'))
-							this.getList();
-						}
+							that.$message.success('操作成功')
+							that.getList();
+						}else{
+              that.$message.info('操作失败')
+            }
 					}, err => {})
 
 				}).catch(() => {
-					this.$message.info(this.$t('ground.yiquxiao'))
+					that.$message.info('操作失败')
 				});
 			},
 			handleCurrentChange(val) {