diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java index 95389cc..c7a616f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java @@ -560,6 +560,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); wrapper.lambda() .set(RecycleDeliveryOrderEntity::getAdjustStatus, form.getAdjustStatus()) @@ -569,9 +570,17 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl 审核
- 通过 - - 纠正 + 纠正 --> 取 消
@@ -35,54 +18,7 @@ label-position="right"> @@ -504,6 +387,10 @@ export default { _data.adjustStatus = "1"; _data.entryStatus = "1"; _data.lastModifyTime = null; + if ((_data.adjustWeight != _data.weight) && (_data.adjustComm == undefined || _data.adjustComm == null || _data.adjustComm == '')) { + this.$message.error('审核后重量与清运重量不一致，请填写审核说明'); + return; + } if (_data.adjustWeight == 0) { this.$message.error('审核后重量不能为 0'); return; diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue index ff4ebf8..6f114e7 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue @@ -171,8 +171,9 @@ export default { }, data() { return { + selectedWeights: [], selectedRows: [], - selectedIds:[], + selectedIds: [], showDialog: false, keyword: '', expandsTree: true, @@ -239,13 +240,14 @@ export default { this.query.deviceCode = this.$route.query.deviceCode console.log(this.query) this.getColumnList(), - this.initSearchDataAndListData() + this.initSearchDataAndListData() this.queryData = JSON.parse(JSON.stringify(this.query)) }, methods: { handleSelectionChange(val) { this.selectedRows = val; this.selectedIds = this.selectedRows.map(row => row.id); + this.selectedWeights = this.selectedRows.map(row => row.weight); }, toDetail(defaultValue, modelId) { if (!defaultValue) return @@ -527,6 +529,14 @@ export default { if (isrRefresh) this.reset() }, handleSubmit(rows) { + if (this.selectedWeights.some(str => { + const num = parseFloat(str); + return !isNaN(num) && (num === 0 || num < 0); + })) { + console.log(1111111); + this.$message.error('清运重量存在异议！请检查所选数据'); + return; + } if (this.selectedIds.length == 0) { this.$message.error('请选择要审核的单据！'); return; @@ -537,9 +547,9 @@ export default { } let _query = { adjustStatus: 1, - ids:this.selectedIds, - adjustComm:rows.adjustComm, - entryStatus:1 + ids: this.selectedIds, + adjustComm: rows.adjustComm, + entryStatus: 1 }; request({ url: `/api/scm/RecycleCleanOrder/auditBatch`, diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue index f05490b..a92e198 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue @@ -4,30 +4,12 @@
审核
- 通过 - 纠正 + 拒绝 取 消
@@ -36,231 +18,110 @@ label-position="right"> @@ -348,7 +209,7 @@ export default { activeripxar: ["1", "2"], dataRule: { - + }, deviceCodeOptions: [], deviceCodeProps: { "label": "device_name", "value": "device_code" }, @@ -449,6 +310,7 @@ export default { url: '/api/scm/RecycleDeliveryOrder/' + id, method: 'get' }).then(res => { + this.reportW = res.data.reportWeight this.dataInfo(res.data) }); }, @@ -681,6 +543,10 @@ export default { let _data = this.dataList() _data.adjustStatus = "1"; _data.lastModifyTime = null; + if ((_data.adjustWeight != _data.reportWeight) && (_data.adjustComm == undefined || _data.adjustComm == null || _data.adjustComm == '')) { + this.$message.error('审核后重量与上报重量不一致，请填写审核说明'); + return; + } if (_data.adjustWeight == 0) { this.$message.error('审核后重量不能为 0'); return; @@ -690,74 +556,70 @@ export default { } else { this.btnLoading = true } - request({ - url: '/api/scm/RecycleDeliveryOrder/audit', - method: 'post', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 1000, - onClose: () => { - if (this.dataFormSubmitType == 2) { - this.$nextTick(() => { - this.clearData() - this.initDefaultData() - }) - this.continueBtnLoading = false - return - } - this.visible = false - this.btnLoading = false - this.$emit('refresh', true) + request({ + url: '/api/scm/RecycleDeliveryOrder/audit', + method: 'post', + data: _data + }).then((res) => { + this.$message({ + message: res.msg, + type: 'success', + duration: 1000, + onClose: () => { + if (this.dataFormSubmitType == 2) { + this.$nextTick(() => { + this.clearData() + this.initDefaultData() + }) + this.continueBtnLoading = false + return } - }) - }).catch(() => { - this.btnLoading = false - this.continueBtnLoading = false + this.visible = false + this.btnLoading = false + this.$emit('refresh', true) + } }) + }).catch(() => { + this.btnLoading = false + this.continueBtnLoading = false + }) }, requestEdit() { let _data = this.dataList() - _data.adjustStatus = "2"; + _data.adjustStatus = "3"; _data.lastModifyTime = null; - if (_data.adjustWeight == 0) { - this.$message.error('审核后重量不能为 0'); - return; - } if (this.dataFormSubmitType == 2) { this.continueBtnLoading = true } else { this.btnLoading = true } - request({ - url: '/api/scm/RecycleDeliveryOrder/audit', - method: 'post', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 1000, - onClose: () => { - if (this.dataFormSubmitType == 2) { - this.$nextTick(() => { - this.clearData() - this.initDefaultData() - }) - this.continueBtnLoading = false - return - } - this.visible = false - this.btnLoading = false - this.$emit('refresh', true) + request({ + url: '/api/scm/RecycleDeliveryOrder/audit', + method: 'post', + data: _data + }).then((res) => { + this.$message({ + message: res.msg, + type: 'success', + duration: 1000, + onClose: () => { + if (this.dataFormSubmitType == 2) { + this.$nextTick(() => { + this.clearData() + this.initDefaultData() + }) + this.continueBtnLoading = false + return } - }) - }).catch(() => { - this.btnLoading = false - this.continueBtnLoading = false + this.visible = false + this.btnLoading = false + this.$emit('refresh', true) + } }) + }).catch(() => { + this.btnLoading = false + this.continueBtnLoading = false + }) }, openSelectDialog(key) { this.currTableConf = this.addTableConf[key] diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/form.vue index 3beca1c..138b9c2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/form.vue @@ -2,10 +2,7 @@
- +
@@ -20,131 +17,67 @@ {{ "下一条" }} - + {{ !dataForm.id ? "确定并新增" : "确定并继续" - }} + }} - - 保 存 + + 保 存 取 消
- - + + - +
@@ -606,7 +419,7 @@ export default { }, { pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/, - message: "请输入正确的重量", + message: "请输入正确的金额", trigger: "blur" } ], @@ -779,6 +592,9 @@ export default { }; }, computed: { + changeId() { + return !this.dataForm.id; + }, ...mapGetters(["userInfo"]) }, watch: {}, @@ -787,7 +603,7 @@ export default { this.initDefaultData(); this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)); }, - mounted() {}, + mounted() { }, methods: { prev() { this.index--; @@ -886,10 +702,10 @@ export default { if (relationFieldAll.length > 1 && index > -1) { val = this.dataForm[relationFieldAll[0] + "List"] && - this.dataForm[relationFieldAll[0] + "List"].length + this.dataForm[relationFieldAll[0] + "List"].length ? this.dataForm[relationFieldAll[0] + "List"][index][ - relationFieldAll[1] - ] + relationFieldAll[1] + ] : ""; } else { val = this.dataForm[relationFieldAll]; @@ -919,10 +735,10 @@ export default { if (relationFieldAll.length > 1 && index > -1) { val = this.dataForm[relationFieldAll[0] + "List"] && - this.dataForm[relationFieldAll[0] + "List"].length + this.dataForm[relationFieldAll[0] + "List"].length ? this.dataForm[relationFieldAll[0] + "List"][index][ - relationFieldAll[1] - ] + relationFieldAll[1] + ] : ""; } else { val = this.dataForm[relationFieldAll]; @@ -958,10 +774,10 @@ export default { if (relationFieldAll.length > 1 && index > -1) { val = this.dataForm[relationFieldAll[0] + "List"] && - this.dataForm[relationFieldAll[0] + "List"].length + this.dataForm[relationFieldAll[0] + "List"].length ? this.dataForm[relationFieldAll[0] + "List"][index][ - relationFieldAll[1] - ] + relationFieldAll[1] + ] : ""; } else { val = this.dataForm[relationFieldAll]; @@ -1007,10 +823,10 @@ export default { if (relationFieldAll.length > 1 && index > -1) { val = this.dataForm[relationFieldAll[0] + "List"] && - this.dataForm[relationFieldAll[0] + "List"].length + this.dataForm[relationFieldAll[0] + "List"].length ? this.dataForm[relationFieldAll[0] + "List"][index][ - relationFieldAll[1] - ] + relationFieldAll[1] + ] : ""; } else { val = this.dataForm[relationFieldAll]; @@ -1069,7 +885,7 @@ export default { this.$store.commit("generator/UPDATE_RELATION_DATA", {}); }, //初始化默认数据 - initDefaultData() {}, + initDefaultData() { }, // 表单提交 dataFormSubmit(type) { this.dataFormSubmitType = type ? type : 0; diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue index 68a591d..3f00767 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue @@ -11,13 +11,8 @@ - + @@ -30,39 +25,22 @@ - 查询 - 重置 - + 查询 + 重置 + 展开 - + 收起 @@ -144,64 +91,29 @@
- 新增 + 新增 - 批量审核 + 批量审核
- + - - + +
- + - + - + @@ -232,11 +144,7 @@ - + @@ -357,6 +225,8 @@ export default { return { selectedRows: [], selectedIds: [], + selectedPrices: [], + selectedWeights: [], showDialog: false, keyword: "", expandsTree: true, @@ -465,13 +335,15 @@ export default { this.getColumnList(), this.initSearchDataAndListData(); this.getadjustStatusOptions(); this.getdeviceCodeOptions(); - + this.queryData = JSON.parse(JSON.stringify(this.query)); }, methods: { handleSelectionChange(val) { this.selectedRows = val; this.selectedIds = this.selectedRows.map(row => row.id); + this.selectedPrices = this.selectedRows.map(row => row.totalPrice); + this.selectedWeights = this.selectedRows.map(row => row.reportWeight); }, toDetail(defaultValue, modelId) { if (!defaultValue) return; @@ -669,7 +541,7 @@ export default { this.initData(); }, //初始化查询的默认数据 - async initSearchData() {}, + async initSearchData() { }, initData() { this.listLoading = true; let _query = { @@ -713,7 +585,7 @@ export default { }); }); }) - .catch(() => {}); + .catch(() => { }); }, handelUpload() { this.uploadBoxVisible = true; @@ -792,6 +664,10 @@ export default { if (isrRefresh) this.reset(); }, handleSubmit(rows) { + if (this.selectedWeights.some(num => num < 0) || this.selectedPrices.some(num => num < 0) ) { + this.$message.error("请检查所选择的数据，上报重量或者总价存在异议！"); + return; + } if (this.selectedIds.length == 0) { this.$message.error("请选择要审核的单据！"); return;