diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js
index 5418ee7fe3..e97139b71e 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js
+++ b/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({
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
index a5433c96b5..e375101f44 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
@@ -41,6 +41,9 @@
+
+
+
至
@@ -147,6 +150,11 @@
{{ scope.row.payDate }}
+
+
+ {{ scope.row.batchNumber }}
+
+
查看
@@ -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) {
- this.$message({ showClose: true, type: 'error', message: '因选择的记录中存在收款账号不一致的,操作失败' })
+ 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: '请选择款项名称和收款账号一致的记录进行操作' })
return
}
}
@@ -731,18 +741,33 @@ export default {
return
}
this.submitdisabled = true
- req.update(this.formobj).then((resp) => {
- if (resp.success) {
+ if (this.formobj.sids.length > 1) {
+ 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()
- this.getList()
- } else {
+ })
+ } else {
+ req.update(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
- }
- }).catch(() => {
- this.submitdisabled = false
- })
+ })
+ }
} else {
return false
}