diff --git a/src/assets/add.png b/src/assets/add.png new file mode 100644 index 0000000..c834339 Binary files /dev/null and b/src/assets/add.png differ diff --git a/src/assets/pause.png b/src/assets/pause.png new file mode 100644 index 0000000..893fc3f Binary files /dev/null and b/src/assets/pause.png differ diff --git a/src/assets/play.png b/src/assets/play.png new file mode 100644 index 0000000..bbf8a47 Binary files /dev/null and b/src/assets/play.png differ diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue index e603652..2646312 100644 --- a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue +++ b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue @@ -298,7 +298,7 @@ export default { }, { label: "预计领料日期", - prop: "goodsCode", + prop: "estUseTime", search: true, width: 120, searchLabelWidth: 100, @@ -308,12 +308,12 @@ export default { startPlaceholder: "开始时间", endPlaceholder: "结束时间", }, - { - label: "预计使用时间", - prop: "estUseTime", - search: false, - width: 120, - }, + // { + // label: "预计使用时间", + // prop: "estUseTime", + // search: false, + // width: 120, + // }, { label: "创建时间", prop: "createTime", @@ -515,10 +515,16 @@ export default { }, onLoad() { // this.loading = true + let params = { + ...this.query, + startEstUseTime: this.query && this.query.estUseTime && this.query.estUseTime.length != 0 && this.query.estUseTime[0], + endEstUseTime: this.query && this.query.estUseTime && this.query.estUseTime.length != 0 && this.query.estUseTime[1], + } + if(params.estUseTime) delete params.estUseTime getList({ current:this.page.currentPage, size:this.page.pageSize, - ...this.query + ...params }).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total diff --git a/src/views/inboundOutboundManagement/materialIssuing.vue b/src/views/inboundOutboundManagement/materialIssuing.vue index 525e2aa..3b8dc95 100644 --- a/src/views/inboundOutboundManagement/materialIssuing.vue +++ b/src/views/inboundOutboundManagement/materialIssuing.vue @@ -517,10 +517,17 @@ export default { }, onLoad() { this.loading = true + console.log('query==============',this.query) + let params = { + ...this.query, + startCrDate:this.query && this.query.crDate && this.query.crDate.length > 0 && this.query.crDate[0], + endCrDate:this.query && this.query.crDate && this.query.crDate.length > 0 && this.query.crDate[1], + } + if(params.crDate) delete params.crDate getList({ current:this.page.currentPage, size:this.page.pageSize, - ...this.query + ...params }).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total diff --git a/src/views/loanManagement/loanHistory.vue b/src/views/loanManagement/loanHistory.vue index 9587e08..1badc08 100644 --- a/src/views/loanManagement/loanHistory.vue +++ b/src/views/loanManagement/loanHistory.vue @@ -511,11 +511,12 @@ export default { startLeDate:this.query.leDate && this.query.leDate.length != 0 && this.query.leDate[0], endLeDate:this.query.leDate && this.query.leDate.length != 0 && this.query.leDate[1], } - const {leDate,...searchParam} = param + // const {leDate,...searchParam} = param + if(param.leDate) delete param.leDate getList({ current:this.page.currentPage, size:this.page.pageSize, - ...searchParam + ...param }).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue index 6f23b1a..5399140 100644 --- a/src/views/orderManagement/components/exception/dataMissing.vue +++ b/src/views/orderManagement/components/exception/dataMissing.vue @@ -264,6 +264,23 @@ export default { }, ], }, + { + label: '生产订单', + prop: 'yoCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入生产订单', + trigger: 'blur', + }, + ], + }, { label: '零件号', prop: 'partCode1', @@ -346,12 +363,47 @@ export default { }, ], }, + { + label: '流程卡号', + prop: 'cardNo', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + rules: [ + { + required: false, + message: '请输入流程卡号', + trigger: 'blur', + }, + ], + }, + { + label: '批次号', + prop: 'batchNo', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + rules: [ + { + required: false, + message: '请输入批次号', + trigger: 'blur', + }, + ], + }, { label: '镀种', prop: 'plate', search: false, sortable: true, disabled: true, + width: 150, span: 12, headerAlign: 'center', align: 'center', diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue index 8bbfd16..f1f6a4b 100644 --- a/src/views/orderManagement/components/exception/deliveryDate.vue +++ b/src/views/orderManagement/components/exception/deliveryDate.vue @@ -145,6 +145,23 @@ export default { }, ], }, + { + label: '生产订单', + prop: 'yoCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入生产订单', + trigger: 'blur', + }, + ], + }, { label: '零件号', prop: 'partCode1', @@ -227,12 +244,47 @@ export default { }, ], }, + { + label: '流程卡号', + prop: 'cardNo', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + rules: [ + { + required: false, + message: '请输入流程卡号', + trigger: 'blur', + }, + ], + }, + { + label: '批次号', + prop: 'batchNo', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + rules: [ + { + required: false, + message: '请输入批次号', + trigger: 'blur', + }, + ], + }, { label: '镀种', prop: 'plate', search: false, sortable: true, disabled: true, + width: 150, span: 12, headerAlign: 'center', align: 'center', diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index 0dbd72a..e9655d0 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -28,6 +28,9 @@ +