完善出纳付款列表--批量处理功能

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js

@@ -28,6 +28,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 更新
+  batchUpdate: function(params) {
+    return request({
+      url: '/fin/v1/finpaymentrecord/batchUpdate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 通过sid作废一条或多条记录
   abandonApply: function(params) {
     return request({

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -41,6 +41,9 @@
               <el-form-item label="付款账号">
                 <el-input v-model="listQuery.params.payBankAccount" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="批量付款编号">
+                <el-input v-model="listQuery.params.batchNumber" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="审批日期">
                 <el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -147,6 +150,11 @@
                 <span>{{ scope.row.payDate }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="批量付款编号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.batchNumber }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="付款凭证" align="center" class-name="small-padding fixed-width" width="120">
               <template slot-scope="scope">
                 <el-button v-show="scope.row.payFiles" size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
@@ -364,7 +372,8 @@ export default {
           cost: '',
           busRemarks: '',
           payBank: '',
-          payBankAccount: ''
+          payBankAccount: '',
+          batchNumber: ''
         },
         current: 1,
         size: 10,
@@ -537,7 +546,8 @@ export default {
           cost: '',
           busRemarks: '',
           payBank: '',
-          payBankAccount: ''
+          payBankAccount: '',
+          batchNumber: ''
         },
         current: 1,
         size: 10,
@@ -664,8 +674,8 @@ export default {
               this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含已支付的,操作失败' })
               return
             }
-            if (this.nodeState_list[i].receiveBankAccount !== this.nodeState_list[this.nodeState_list.length - 1].receiveBankAccount) {
+            if (this.nodeState_list[i].receiveBankAccount !== this.nodeState_list[this.nodeState_list.length - 1].receiveBankAccount && this.nodeState_list[i].costTypeValue !== this.nodeState_list[this.nodeState_list.length - 1].costTypeValue) {
-              this.$message({ showClose: true, type: 'error', message: '因选择的记录中存在收款账号不一致的,操作失败' })
+              this.$message({ showClose: true, type: 'error', message: '请选择款项名称和收款账号一致的记录进行操作' })
               return
             }
           }
@@ -731,18 +741,33 @@ export default {
             return
           }
           this.submitdisabled = true
-          req.update(this.formobj).then((resp) => {
+          if (this.formobj.sids.length > 1) {
-            if (resp.success) {
+            req.batchUpdate(this.formobj).then((resp) => {
+              if (resp.success) {
+                this.submitdisabled = false
+                this.$message({ showClose: true, type: 'success', message: resp.msg })
+                this.handColse()
+                this.getList()
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
               this.submitdisabled = false
-              this.$message({ showClose: true, type: 'success', message: resp.msg })
+            })
-              this.handColse()
+          } else {
-              this.getList()
+            req.update(this.formobj).then((resp) => {
-            } else {
+              if (resp.success) {
+                this.submitdisabled = false
+                this.$message({ showClose: true, type: 'success', message: resp.msg })
+                this.handColse()
+                this.getList()
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
               this.submitdisabled = false
-            }
+            })
-          }).catch(() => {
+          }
-            this.submitdisabled = false
-          })
         } else {
           return false
         }