From 7b5f96258385a8755d5399ae86df94b5af1f7311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 19 Sep 2024 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=910919=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/filters/status.js | 16 ++++++++-------- .../views/inventoryManage/Count/CountPlan-ms.vue | 2 +- .../rawMaterialManage/quality/InspectRequest.vue | 16 ++++++++++++++-- .../quality/unqualifiedToQualified.vue | 2 +- .../quality/unqualifiedToQualifiedNote.vue | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 16195f590..ba0108ec2 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -733,18 +733,18 @@ export function checkType(index, prop) { */ export function CountPanCompleteType(index, prop){ let type={ - 1:{ - label:"未盘点到的明细直接作废", - value:1 - }, + // 1:{ + // label:"未盘点到的明细直接作废", + // value:1 + // }, 2:{ label:"未盘点到的按照盘点数量为0处理", value:2 }, - 3:{ - label:"未盘点到的按照盘平计算", - value:3 - }, + // 3:{ + // label:"未盘点到的按照盘平计算", + // value:3 + // }, } return Enum(type, index, prop) } diff --git a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue b/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue index 79f37dd49..1a236820f 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue @@ -209,7 +209,7 @@ export default { ], //完成 completeData:{ - type:1 + type:2 }, completeForm:[ { type: "select", label: "类型", prop: "type", options: "CountPanCompleteType", colSpan: 24 }, diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 0f4460bd4..b25e45fc9 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -553,7 +553,8 @@ export default { // 质检详情页面-form字段 inspectNoticeDetailsForm: [ { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 8 }, - { type: "input", label: _Names.itemName, prop: "itemName", disabled: true, colSpan: 8 }, + // { type: "input", label: _Names.itemName, prop: "itemName", disabled: true, colSpan: 8 }, + { type: "input", label: _Names.itemDesc2, prop: "itemDesc2", disabled: true, colSpan: 8 }, { type: "input", label: "单位", prop: "stdPackUom", disabled: true, colSpan: 8 }, // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true, colSpan: 8 }, { type: "input", label: "生产批次", prop: "lot", disabled: true, colSpan: 8 }, @@ -583,7 +584,8 @@ export default { inspectNoticeDetailsTableColumns: [ { label: "箱码", prop: "packingCode", width:'100%' }, { label: _Names.itemCode, prop: "itemCode", width:'100%' }, - { label: _Names.itemName, prop: "itemName", width:'100%' }, + // { label: _Names.itemName, prop: "itemName", width:'100%' }, + { label: _Names.itemDesc2, prop: "itemDesc2", width:'100%' }, { label: _Names.itemDesc1, prop: "itemDesc1", width:'100%' }, // { label: "单位", prop: "receiveUom", width:'100%' }, { label: "收货数量", prop: "receiveQty", width:'100%' }, @@ -1246,6 +1248,16 @@ export default { // if(!this.fileBase64List || this.fileBase64List.length <= 0){ // return this.$errorMsg("请提供供应商自检报告") // } + // todo: + // this.$confirm('您确定完成质检吗, 是否继续?', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.screenData.filters.splice(val, 1) + // }).catch(() => { + + // }); let that = this that.masterID = that.propsData.id // 取消质检报告上传必填项 diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue index 29c1abbd4..a4ba4a7b9 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue @@ -11,7 +11,6 @@ :multipleSelection="multipleSelection" :tableSelection="true" :MaxResultCount="PageListParams.MaxResultCount" - :isShowIndex="true" @topbutton="topbutton" @inlineDialog="inlineDialog" @sortChange="sortChange" @@ -26,6 +25,7 @@ @overallSearchFormClick="overallSearchFormClick" :httpOverallSearchData="httpOverallSearchData" > + +