From f5aade426b74f8cdf506ee928061d97b62e3034d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 8 May 2024 11:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=83=E9=A9=B0pc=E3=80=91=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=BC=80=E5=A7=8B=E8=AE=A1=E5=88=92=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9+=E6=8A=A5=E6=A3=80?= =?UTF-8?q?=E5=8D=95=E6=A3=80=E9=AA=8C=E6=8C=89=E9=92=AE=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/umyTable/index.vue | 3 ++ fe/PC/src/utils/tableColumns/index.js | 2 +- fe/PC/src/utils/tabsDesTions/index.js | 2 +- .../inventoryManage/Count/CountPlan-ms.vue | 3 +- .../quality/InspectRequest.vue | 34 +++++++++++-------- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue index 5de0e0b68..131987d53 100644 --- a/fe/PC/src/components/umyTable/index.vue +++ b/fe/PC/src/components/umyTable/index.vue @@ -812,6 +812,9 @@ export default { if(!item.isJson){ return scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }else{ + if(scope.row[item.prop] == '' || scope.row[item.prop] == 'null' || scope.row[item.prop] == '[]'){ + return "" + } if(scope.row[item.prop]){ let _arr = JSON.parse(scope.row[item.prop]) return _arr.join(",") diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 587b7c8e9..ae8eaadc6 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3620,7 +3620,7 @@ export const CountPlan = [ { label: "开始时间", prop: "beginTime",type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, { label: "计划时间", prop: 'planTime', type: "dateTime"}, - { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" }, + // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" }, { label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" }, { label: "盘点次数", prop: "inventoryStage" }, { label: "盘点库位", prop: 'jsonLocationCodes',type:"showDetail",isJson:true,showProp:true }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 44930e6dc..0f09b1216 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2811,7 +2811,7 @@ export const CountPlan = [ { label: "开始时间", prop: "beginTime",type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, { label: "计划时间", prop: 'planTime', type: "dateTime" }, - { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" }, + // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" }, { label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" }, { label: "盘点次数", prop: "inventoryStage" }, { label: "库位JSON", prop: 'jsonLocationCodes',type:"json" }, diff --git a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue b/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue index cc021e6b7..9ed29a9dc 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue @@ -98,7 +98,8 @@ export default { return function (val) { let data = true val.forEach(key => { - if (this.propsData.requestStatus == key && this.propsData.requestType == 2) { + // && this.propsData.requestType == 2 + if (this.propsData.requestStatus == key) { data = false } }) diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 9602654b0..06d21f46b 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -431,8 +431,8 @@ export default { type: "number", trigger: ["blur"], validator: (rule, value, callback) => { - if(Number(value) > Number(this.rowReceiveQty)){ - return callback(new Error(`数量不能大于收货数量${this.rowReceiveQty}`)) + if(Number(value) > Number(this.rowReceiveQty) || Number(value) <= 0){ + return callback(new Error(`数量必须大于0且不能大于收货数量${this.rowReceiveQty}`)) }else{ callback() } @@ -810,20 +810,21 @@ export default { inspectButtonClick(row, index, label) { this.inspectFormData.details.splice(row.$index, 1) }, - resetInspectForm() { - this.inspectFormData.inspectQty = null - this.$refs.inspectForm_Ref.resetCurrenForm() + resetInspectForm(row) { + // this.inspectFormData.inspectQty = null + // this.$refs.inspectForm_Ref.resetCurrenForm() + console.log(816,row) + let _detailTable = '[]' + if(row.otherPropertyJson && row.otherPropertyJson != '' && row.otherPropertyJson != 'null'){ + _detailTable = JSON.parse(JSON.stringify(row.otherPropertyJson)) + } + this.inspectFormData = row + this.inspectFormData.details = JSON.parse(_detailTable) }, // 质检详情-检验按钮 table中按钮 inspectDetailsButtonClick(row, index, label) { // console.log('质检详情-检验按钮 table中按钮', row) this.masterID = this.propsData.id - this.inspectFormData.appearance = '' - this.inspectFormData.volume = '' - this.inspectFormData.weight = '' - this.inspectFormData.inspectQty = '' - this.inspectFormData.details = [] - this.$listAssign(this.inspectFormData, row) // console.log('质检详情-检验按钮 label', label) if(label == '拆箱'){ this.devanCurrentRow = row @@ -865,12 +866,11 @@ export default { if(document.getElementById("uploadPictureCardGuideBook"))document.getElementById("uploadPictureCardGuideBook").innerHTML = '' } this.inspectShow = true - console.log(6666,this.$refs.inspectForm_Ref) - this.resetInspectForm() + this.resetInspectForm(row) }).catch(err => { console.log(err) this.inspectShow = true - this.resetInspectForm() + this.resetInspectForm(row) }) this.rowId = row.id } else if (label == '清除检验') { @@ -906,6 +906,12 @@ export default { this.propsData = res }) this.paging() + this.inspectFormData.appearance = '' + this.inspectFormData.volume = '' + this.inspectFormData.weight = '' + this.inspectFormData.inspectQty = '' + this.inspectFormData.otherPropertyJson = '[]' + console.log(913,this.inspectFormData) this.loading = false this.inspectNoticeDetailsTableLoading = false }).catch(err => {