diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml index 9ed9aaf..26b16ac 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml @@ -1,6 +1,6 @@ - + UPDATE NX_RECYCLE_DELIVERY_ORDER diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java index 0577654..b5b4ba3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java @@ -15,5 +15,5 @@ import org.apache.ibatis.annotations.Param; */ public interface RecycleDeliveryOrderMapper extends BaseMapper { - int auditBatch(@Param("bacth") DeliveryAuditBatch batch); + int auditBatch(@Param("batch") DeliveryAuditBatch batch); } 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 65da9a0..4bfa5e7 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 @@ -607,6 +607,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl 0) return ActionResult.success("审核操作成功"); - else return ActionResult.fail("审核操作失败"); + if (up > 0) return ActionResult.success("审核成功"); + else return ActionResult.fail("审核失败"); } } diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/DialogComponent.vue b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/DialogComponent.vue new file mode 100644 index 0000000..9c1e527 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/DialogComponent.vue @@ -0,0 +1,51 @@ + + + \ No newline at end of file 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 b4d28c1..2458331 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue @@ -27,6 +27,9 @@ 新增 + 批量审核 +
@@ -40,8 +43,9 @@
- + :span-method="arraySpanMethod" @selection-change="handleSelectionChange"> + + @@ -53,7 +57,7 @@ - + @@ -152,17 +154,21 @@ import columnList from './columnList' import { thousandsFormat } from "@/components/Generator/utils/index" import SuperQuery from '@/components/SuperQuery' import superQueryJson from './superQueryJson' +import DialogComponent from './DialogComponent.vue'; export default { components: { JNPFForm, Detail, Audit, + DialogComponent, ExportBox, ToFormDetail, SuperQuery }, data() { return { - + selectedRows: [], + selectedIds:[], + showDialog: false, keyword: '', expandsTree: true, refreshTree: true, @@ -172,7 +178,6 @@ export default { mergeList: [], exportList: [], columnList, - superQueryVisible: false, superQueryJson, uploadBoxVisible: false, @@ -226,10 +231,14 @@ export default { }, created() { 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); + }, toDetail(defaultValue, modelId) { if (!defaultValue) return getConfigData(modelId).then(res => { @@ -509,6 +518,34 @@ export default { this.flowVisible = false if (isrRefresh) this.reset() }, + handleSubmit(rows) { + if (this.selectedIds.length == 0) { + this.$message.error('请选择要审核的单据!'); + return; + } + if (rows.adjustComm == null || rows.adjustComm == '') { + this.$message.error('请填写您的审核意见!'); + return; + } + let _query = { + adjustStatus: 1, + ids:this.selectedIds, + adjustComm:rows.adjustComm, + entryStatus:1 + }; + request({ + url: `/api/scm/RecycleCleanOrder/auditBatch`, + method: 'post', + data: _query + }).then(res => { + this.$message({ + message: res.msg, + type: 'success', + duration: 1000, + }) + this.initData() + }) + }, } } 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 244613c..6d25686 100644 --- a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue @@ -1,95 +1,84 @@ - - - - - - -