From 45ec177b921c02223db7a851fd6937c67bb04726 Mon Sep 17 00:00:00 2001 From: jinna Date: Fri, 6 Mar 2026 17:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A8=A1=E5=9D=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basicData/warehouseMaintenance.vue | 26 +++++++------- .../otherIssuing/index.vue | 1 + .../otherIssuing/otherIssuingDailog.vue | 2 +- .../returnReceiving.vue | 14 ++++++++ .../warehouseAnalysis/inventorySummary.vue | 34 +++++++++---------- .../materialMaintenance.vue | 3 ++ 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue index d9396e3..5530095 100644 --- a/src/views/basicData/warehouseMaintenance.vue +++ b/src/views/basicData/warehouseMaintenance.vue @@ -271,18 +271,19 @@ export default { remoteMethod(query){ if (query !== '') { this.selectLoading = true; - getAllUser({ - current:1,size:9999,realName:query + getUserByRoleAlias({ + current:1,size:9999,realName:query, + roleAlias:'保管员' }).then(res =>{ - this.keepList = res.data.data.records + this.keepList = res.data.data this.selectLoading = false; }) } else { // this.options = []; - getAllUser({ - current:1,size:9999 + getUserByRoleAlias({ + current:1,size:9999,roleAlias:'保管员' }).then(res =>{ - this.keepList = res.data.data.records + this.keepList = res.data.data }) } }, @@ -292,11 +293,12 @@ export default { this.checkUser = '' this.chooseWare = [] this.noChooseWare = [] - getAllUser({ + getUserByRoleAlias({ current:1, - size:999999 + size:999999, + roleAlias:"保管员" }).then(res =>{ - this.keepList = res.data.data.records + this.keepList = res.data.data }) }else{ this.checkWare = "" @@ -478,12 +480,12 @@ export default { this.getLocation() }else if(this.tabPosition == "inventorySetup"){ this.checkUser = '' - getAllUser({ - // roleAlias:"保管员" + getUserByRoleAlias({ + roleAlias:"保管员", current:1, size:99999 }).then(res =>{ - this.keepList = res.data.data.records + this.keepList = res.data.data }) } }, diff --git a/src/views/inboundOutboundManagement/otherIssuing/index.vue b/src/views/inboundOutboundManagement/otherIssuing/index.vue index ba8d16b..34ad271 100644 --- a/src/views/inboundOutboundManagement/otherIssuing/index.vue +++ b/src/views/inboundOutboundManagement/otherIssuing/index.vue @@ -339,6 +339,7 @@ export default { // public static final Short BF_TYPE_GLASS_CAKE = 3; dicData:[ { label: "到期维护报废", value: 1 }, + { label: "未报废", value: 0 }, { label: "归还报废", value: 2 }, { label: "玻璃饼报废", value: 3 } ], diff --git a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue index d49b880..98caaed 100644 --- a/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue +++ b/src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue @@ -39,7 +39,7 @@ + :label="`${item.realName}(${item.workNo})`" :value="item.id" /> diff --git a/src/views/inboundOutboundManagement/returnReceiving.vue b/src/views/inboundOutboundManagement/returnReceiving.vue index 3aa1d9c..0f82896 100644 --- a/src/views/inboundOutboundManagement/returnReceiving.vue +++ b/src/views/inboundOutboundManagement/returnReceiving.vue @@ -278,6 +278,20 @@ export default { }, ], }, + { + label: "单价", + prop: "invadjMoney", + span: 24, + overflow: true, + search: false, + // rules: [ + // { + // required: true, + // message: "请输入单位", + // trigger: "blur", + // }, + // ], + }, { label: "单位", prop: "prtum", diff --git a/src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue b/src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue index 71287b3..2d709c2 100644 --- a/src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue +++ b/src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue @@ -386,7 +386,7 @@ export default { }, { label: '生产标识', - prop: 'inQuantityLevel', + prop: 'quantityLevel', width: 200, search: false, sortable: true, @@ -489,7 +489,7 @@ export default { }, { label: '入库时间', - prop: 'inOutDate', + prop: 'createTime', width: 200, search: true, sortable: true, @@ -508,18 +508,18 @@ export default { }, ], }, - { - label: '入库数量', - prop: 'inQuantity', - width: 200, - rules: [ - { - required: true, - message: '请输入入库日期', - trigger: 'blur', - }, - ], - }, + // { + // label: '入库数量', + // prop: 'inQuantity', + // width: 200, + // rules: [ + // { + // required: true, + // message: '请输入入库日期', + // trigger: 'blur', + // }, + // ], + // }, // { // label: '入库时间', // prop: 'inOutDate', @@ -666,10 +666,10 @@ export default { this.loading = true let params = { ...this.query, - startInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0], - endInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0] + startInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0], + endInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1] } - const {inOutDate,...invalideParams} = params + const {createTime,...invalideParams} = params getList({ current:this.page.currentPage, size:this.page.pageSize, diff --git a/src/views/warehouseManagement/materialMaintenance.vue b/src/views/warehouseManagement/materialMaintenance.vue index 87bbc47..88dd1a1 100644 --- a/src/views/warehouseManagement/materialMaintenance.vue +++ b/src/views/warehouseManagement/materialMaintenance.vue @@ -528,6 +528,9 @@ export default { res.data.data.records.forEach(item =>{ item.minWarning = item.minWarning == 1 ? true : false }) + // res.data.data.records.map(item =>{ + // item.gcId = item.gcId == 0 ? null :item.gcId + // }) this.data = res.data.data.records this.page.total = res.data.data.total; })