Merge branch 'feat/tax' of...

Merge branch 'feat/tax' of http://git.manong.atliangtian.com/longbiao/hr-xinruitong-ui into feat/tax

src/views/business/agent/index.vue

@@ -109,12 +109,10 @@
           <el-input v-model="form.identityCode" placeholder="请输入代理商编码" />
         </el-form-item>
         <el-form-item label="到卡费率" prop="toBankRate">
-          <el-input-number v-model="form.identityCode" :precision="4" :step="0.0010" :max="1" placeholder="请输入代理商编码"></el-input-number>
-          <el-input v-model="form.toBankRate" placeholder="请输入到卡费率" />
+          <el-input-number v-model="form.toBankRate" :precision="4" :step="0.0010" :max="1" placeholder="请输入到卡费率"></el-input-number>
         </el-form-item>
         <el-form-item label="到户费率" prop="toAlipayRate">
-          <el-input-number v-model="form.identityCode" :precision="4" :step="0.0010" :max="1" placeholder="请输入代理商编码"></el-input-number>
-          <el-input v-model="form.toAlipayRate" placeholder="请输入到户费率" />
+          <el-input-number v-model="form.toAlipayRate" :precision="4" :step="0.0010" :max="1" placeholder="请输入到户费率"></el-input-number>
         </el-form-item>
         <el-form-item label="负责人" prop="leader">
           <el-input v-model="form.leader" placeholder="请输入负责人" />

src/views/business/invoiceInfo/index.vue

@@ -257,7 +257,8 @@ export default {
         bankAccount: [
           { required: true, message: "开户账号不能为空", trigger: "blur" },
           {
-            pattern: /^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/,
+            //银行账号校验 16-19位
+            pattern: /^\d{16,19}$/,
             message: "请输入正确的开户账号",
             trigger: "blur"
           }

src/views/business/salaryAccount/taxSignComponent.vue

@@ -124,7 +124,7 @@ export default {
   },
   methods: {
     getPayerCompanyList() {
-      listAllCompanyInfo().then(resp => {
+      listAllCompanyInfo({bindType: 1}).then(resp => {
         if (200 == resp.code) {
           this.payerCompanyArr = resp.data
         }

src/views/business/taxUnit/signList.vue

@@ -153,6 +153,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.$modal.loading("处理中...")
         giveAccToLabor(row.id).then(resp => {
           if (200 === resp.code) {
             if (200 === resp.data.code) {
@@ -170,6 +171,8 @@ export default {
               });
             }
           }
+        }).finally(() => {
+          this.$modal.closeLoading()
         })
       }).catch(() => { });
     }