From 1c89edaa77c10891e1cf757a5b73ea14bb60b24e Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 12 Apr 2024 14:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cost/csotSettlement/costApplyAdd.vue | 10 +- sgzb-ui/src/views/inventoryLogs/index.vue | 389 ++++++++++-------- sgzb-ui/src/views/store/tools/devices.vue | 1 + .../warehousing/accessoryWarehousing.vue | 56 ++- .../store/warehousing/repairWarehousing.vue | 138 +++++-- 5 files changed, 363 insertions(+), 231 deletions(-) diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue index 9d4fd352..4d6ab32d 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue @@ -652,12 +652,12 @@ countCost(list) { let arrCost = 0 list.forEach((item) => { - arrCost += parseInt(item.costs) + // arrCost += parseInt(item.costs) - // console.log(item) - // if (item.partType != 0 && item.scrapType != 0) { - // arrCost = arrCost + Number(item.costs) - // } + console.log(item) + if (item.partType != 0 && item.scrapType != 0) { + arrCost = arrCost + Number(item.costs) + } }) return arrCost.toFixed(2) }, diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue index f811a507..3cef2250 100644 --- a/sgzb-ui/src/views/inventoryLogs/index.vue +++ b/sgzb-ui/src/views/inventoryLogs/index.vue @@ -1,195 +1,218 @@ diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue index 1657d473..a510ab7f 100644 --- a/sgzb-ui/src/views/store/tools/devices.vue +++ b/sgzb-ui/src/views/store/tools/devices.vue @@ -219,6 +219,7 @@ type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" + v-hasPermi="['delete:user']" >删除 diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue index 0be92895..a950a1c2 100644 --- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue @@ -254,7 +254,7 @@ @keyup.enter.native="handleQuery" /> - + + + + { + this.equipmentTypeList = response.data + this.equipmentTypeList.forEach((item, index) => { + if (item.children && item.children.length > 0) { + item.children.forEach((item2, index2) => { + if ( + item2.children && + item2.children.length > 0 + ) { + item2.children.forEach((item3) => { + if ( + item3.children && + item3.children.length > 0 + ) { + item3.children.forEach((item4) => { + item4.machineTypeName = + item3.typeName + item4.specificationType = + item4.typeName + // this.$set(item4, 'purchasePrice', 0); + // this.$set(item4, 'purchaseNum', 1); + }) + } + }) + } + }) + } + }) + }) + }, }, } diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue index 17725aa5..7456122b 100644 --- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue @@ -228,51 +228,66 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - --> + + + + + + + + + + + + + + + - - + noChildrenText="没有数据了" + noOptionsText="没有数据" + noResultsText="没有搜索结果" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.equipmentTypeList = response.data + this.equipmentTypeList.forEach((item, index) => { + if (item.children && item.children.length > 0) { + item.children.forEach((item2, index2) => { + if ( + item2.children && + item2.children.length > 0 + ) { + item2.children.forEach((item3) => { + if ( + item3.children && + item3.children.length > 0 + ) { + item3.children.forEach((item4) => { + item4.machineTypeName = + item3.typeName + item4.specificationType = + item4.typeName + // this.$set(item4, 'purchasePrice', 0); + // this.$set(item4, 'purchaseNum', 1); + }) + } + }) + } + }) + } + }) + }) + }, }, }