From 4ed595a37748dbab43e8217e0003be2aeaaef38e Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 28 Nov 2024 16:01:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/goodsArrived/component/addTools.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 598c772f..5ccad195 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -459,12 +459,12 @@ export default { // 含税单价 purchaseTaxPriceChange(row,val){ // this.equipmentList[val].purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2) - row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2) + row.purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(3) }, // 不含税单价 purchasePriceChange(row,val){ // this.equipmentList[val].purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2) - row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2) + row.purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(3) }, /** 物资厂家-下拉选 */ supplierInfoList() { From 1732b2a5de191d06390b0ee425f55e65826482f4 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 28 Nov 2024 16:03:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/material/repair/repairManage/component/edit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue index fb7bfda0..b5a1093b 100644 --- a/src/views/material/repair/repairManage/component/edit.vue +++ b/src/views/material/repair/repairManage/component/edit.vue @@ -1841,7 +1841,7 @@ export default { //数量管理左侧 addPartItem() { - this.partItems.push({ partType: "", num: "", isCharge: "" }); + this.partItems.push({ partType: "", partNum: "", isCharge: "" }); this.dividerHeight += 200; // 每次增加配件时，竖线高度增加 }, removePartItem(index) { @@ -1853,7 +1853,7 @@ export default { //数量管理中间 addPartItemMiddle() { - this.partItemsMiddle.push({ partTypeName: "", num: "", isCharge: "" }); + this.partItemsMiddle.push({ partTypeName: "", partNum: "", isCharge: "" }); this.dividerHeight += 200; // 每次增加配件时，竖线高度增加 }, removePartItemMiddle(index) { From 663800aadde39b560e1974a4e713615cd781c49a Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Fri, 29 Nov 2024 11:23:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/material/lease/protocol/index.vue | 7 +++--- src/views/material/ma/type/index.vue | 23 +++++++++++-------- .../material/purchase/goodsAccept/index.vue | 10 ++++---- .../goodsArrived/component/addTools.vue | 3 +-- .../material/purchase/goodsEntry/detail.vue | 20 ++++++++++++++-- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue index 2e117f94..c4e69904 100644 --- a/src/views/material/lease/protocol/index.vue +++ b/src/views/material/lease/protocol/index.vue @@ -390,7 +390,7 @@ list-type="picture-card" accept=".png, .jpg, .jpeg, .pdf" :on-change="handleChangeBusinessList" - :class="{ disabled: uploadDisabled }" + :class="{ disabled: true }" :on-preview="picturePreview" :on-remove="handleRemoveElectricianImgList" :disabled="isEdits" @@ -425,7 +425,7 @@ - + - diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue index f03e9261..4496a00f 100644 --- a/src/views/material/ma/type/index.vue +++ b/src/views/material/ma/type/index.vue @@ -806,15 +806,20 @@ export default { getTreeData() { getMaTypeList().then((response) => { this.treeOptions = response.data; - if ( - this.treeOptions.length > 0 && - this.treeOptions[0].children.length > 0 - ) { - const firstNode = this.treeOptions[0].children[0]; - this.queryParams.typeId = firstNode.id; - this.queryParams.level = 1; - this.queryParams.houseId = firstNode.houseId; - this.getList(); + console.log(this.treeOptions) + if (this.treeOptions.length > 0 ){ + if(this.treeOptions[0].children&&this.treeOptions[0].children.length > 0) { + const firstNode = this.treeOptions[0].children[0]; + this.queryParams.typeId = firstNode.id; + this.queryParams.level = 1; + this.queryParams.houseId = firstNode.houseId; + this.getList(); + }else{ + this.queryParams.typeId = this.treeOptions[0].id; + this.queryParams.level = 0; + this.queryParams.houseId = this.treeOptions[0].id; + this.getList(); + } } }); }, diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue index ad4bd623..dfa2cf5c 100644 --- a/src/views/material/purchase/goodsAccept/index.vue +++ b/src/views/material/purchase/goodsAccept/index.vue @@ -428,12 +428,12 @@ print() { this.$refs.remarksPrintRef.print() }, - - handleExport() { - // this.download('/material/ma_machine/export', { - // ...this.queryParams - // }, `仓库管理_${new Date().getTime()}.xlsx`) + this.download( + "/material/purchase_check_info/export", + { ...this.queryParams }, + `新购到货验收_${new Date().getTime()}.xlsx` + ); }, diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 5ccad195..9c312965 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -40,7 +40,6 @@ v-model="maForm.productionTime" style="width: 240px" value-format="yyyy-MM-dd" - :picker-options="pickerOptions" type="date" placeholder="请选择出厂日期" @change="productionTimeChange" @@ -261,7 +260,7 @@