签约信息中的代发账户管理

src/api/business/accInfo.js

@@ -9,6 +9,15 @@ export function listAccInfo(query) {
   })
 }
 
+// 查询商户付款账户列表-无部门过滤
+export function listLaborAcc(query) {
+  return request({
+    url: '/business/accInfo/labor/accList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询商户付款账户所有列表
 export function listAllAccInfo(query) {
   return request({

src/api/business/laborSign.js

@@ -60,11 +60,12 @@ export function agreeSign(id) {
   })
 }
 
-// 删除代发合约签订
-export function giveAccToLabor(laborId) {
+// 分配代发账户
+export function giveAccToLabor(data) {
   return request({
-    url: '/business/unitInfo/acc/give/' + laborId,
-    method: 'post'
+    url: '/business/unitInfo/acc/give',
+    method: 'post',
+    data: data
   })
 }
 

src/views/business/companyPayChannel/index.vue

@@ -95,7 +95,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="companyName">
-          <el-input v-model="form.companyName" disabled placeholder="请输入通道标识" />
+          <el-input v-model="form.companyName" disabled placeholder="企业名称" />
         </el-form-item>
         <el-form-item label="企业类型" prop="unitType">
           <el-select disabled v-model="form.unitType" placeholder="请选择企业类型">

src/views/business/salaryAccount/index.vue

@@ -735,9 +735,13 @@ export default {
             this.aliQRCodeRechargeOpen = false
             if (200 === res.code) {
               if (1 === this.aliQRCodeRechargeForm.bindType) {
+                if (res.data.status) {
                   this.qrPayPanel.payUrl = res.data.msg
                   this.qrPayPanel.open = true
                   this.$forceUpdate()
+                } else {
+                  this.$modal.msgWarning(res.data.msg)
+                }
               } else {
                 this.$modal.msgSuccess("充值成功！");
               }

src/views/business/taxUnit/signList.vue

@@ -45,7 +45,7 @@
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-lollipop" @click="givePayAcc(scope.row)"
             v-if="scope.row.signStatus && 2 === scope.row.signStatus && !scope.row.payAccNo"
-            v-hasPermi="['business:unitInfo:add']">分配账户
+            v-hasPermi="['business:unitInfo:add']">代发账户
           </el-button>
         </template>
       </el-table-column>
@@ -148,33 +148,7 @@ export default {
       this.doAgreePanelVisible = false
     },
     givePayAcc(row) {
-      this.$confirm(`确认给[${row.inviterName}]分配付款专户吗？`, '操作提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$modal.loading("处理中...")
-        giveAccToLabor(row.id).then(resp => {
-          if (200 === resp.code) {
-            if (200 === resp.data.code) {
-              this.$modal.msgSuccess("操作成功")
-              this.getList()
-            } else if (202 === resp.data.code) {
-              this.$confirm(row.taxUnitName + ':未签约支付协议，暂无法进行此操作', '操作提示', {
-                distinguishCancelAndClose: true,
-                confirmButtonText: '去签约',
-                cancelButtonText: '取消'
-              }).then(() => {
-                this.$router.push({ path: "/taxUnit/payAcc" });
-              }).catch(action => {
-
-              });
-            }
-          }
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }).catch(() => { });
+      this.$router.push({ path: '/business/laborAcc', query: { signId: row.id } })
     }
   }
 }