From 3f60b6bcdc8cc6445e9324bc2ae0d03a4b45d64c Mon Sep 17 00:00:00 2001 From: bb_pan Date: Wed, 18 Jun 2025 15:23:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lease/apply.js | 7 ++++--- src/views/business/businessHandling/index.vue | 13 +++++++------ .../leasePublish/component/addToolsApply.vue | 2 +- src/views/material/purchase/goodsAccept/index.vue | 13 ++++--------- .../purchase/goodsArrived/component/addTools.vue | 4 ++-- .../material/purchase/goodsBind/component/home.vue | 3 ++- src/views/material/purchase/goodsEntry/index.vue | 13 ++++--------- .../repair/inventoryScrap/component/homeApply.vue | 11 ++++------- 8 files changed, 28 insertions(+), 38 deletions(-) diff --git a/src/api/lease/apply.js b/src/api/lease/apply.js index 622b7599..47736caa 100644 --- a/src/api/lease/apply.js +++ b/src/api/lease/apply.js @@ -63,10 +63,11 @@ export function getAgreement(data) { } // 领料申请-删除 -export function applyRemove(ids) { +export function applyRemove(data) { return request({ - url: '/material/lease_apply_info/' + ids, - method: 'delete', + url: '/material/scrap_apply_details/delete', + method: 'post', + data, }) } diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index 734c7b6e..b2cbb9f1 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -214,12 +214,12 @@ - - + + {{ isEdit ? '提交' : '发起申请' }} - + 新增条目 @@ -604,6 +604,7 @@ export default { console.log('isEdit', this.isEdit) this.getTaskInfo() } + console.log('🚀 ~ created ~ this.isDetail:', this.isDetail) console.log(this.$store, 'this.$store.getters') console.log(this.$route.query, 'this.$route.query') }, @@ -680,7 +681,6 @@ export default { // }, async getTypeList(row, typeIds, index) { console.log('🚀 ~ getTypeList ~ row:', row) - console.log('🚀 ~ getTypeList ~ typeId:', typeIds[typeIds.length - 1]) // 递归循环 获取类型名称 const filterData = data => { data.forEach(item => { @@ -765,7 +765,7 @@ export default { }, /** 转换菜单数据结构 */ normalizer(node) { - if (node.children && !node.children.length) { + if (!Array.isArray(node.children) || node.children.length === 0) { delete node.children } return { @@ -847,6 +847,7 @@ export default { /** 机具类型 */ equipmentType() { equipmentTypeTree().then(response => { + console.log('🚀 ~ equipmentTypeTree ~ response:', response) this.equipmentTypeList = response.data // 处理并扁平化所有类型数据 this.flattenTypeOptions = this.processTypeData(response.data) @@ -854,7 +855,7 @@ export default { this.filteredOptions = [...this.flattenTypeOptions] // 反显选中数据 - if (this.equipmentList.length > 0) { + if (this.equipmentList && this.equipmentList.length > 0) { this.deviceType = this.equipmentList.map(item => item.typeId) } }) diff --git a/src/views/business/leasePublish/component/addToolsApply.vue b/src/views/business/leasePublish/component/addToolsApply.vue index 03effcde..7c269494 100644 --- a/src/views/business/leasePublish/component/addToolsApply.vue +++ b/src/views/business/leasePublish/component/addToolsApply.vue @@ -63,7 +63,7 @@ :data="leaseList" @selection-change="handleSelectionChange" > - + @@ -309,13 +309,8 @@ /** 查询列表 */ getList() { this.loading = true; - if(this.dateRange.length>0){ - this.queryParams.startTime=this.dateRange[0] - this.queryParams.endTime=this.dateRange[1] - }else{ - this.queryParams.startTime=undefined - this.queryParams.endTime=undefined - } + this.queryParams.startTime= this.dateRange ? this.dateRange[0] : '' + this.queryParams.endTime= this.dateRange ? this.dateRange[1] : '' this.queryParams.taskStage= 2 getPurchaseList(this.queryParams).then(response => { this.tableList = response.data.rows; diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 239102be..e6516e02 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -54,7 +54,7 @@ @@ -245,6 +244,8 @@ export default { }, // 获取列表 async getList() { + this.queryParams.startTime = this.queryTime ? this.queryTime[0] : '' + this.queryParams.endTime = this.queryTime ? this.queryTime[1] : '' this.loading = true this.queryParams.taskStage = 3 const res = await getNewBuyBindListApi(this.queryParams) diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue index 2c4b43c3..4963b2ea 100644 --- a/src/views/material/purchase/goodsEntry/index.vue +++ b/src/views/material/purchase/goodsEntry/index.vue @@ -4,8 +4,8 @@ 0) { - this.queryParams.startTime = this.dateRange[0] - this.queryParams.endTime = this.dateRange[1] - } else { - this.queryParams.startTime = undefined - this.queryParams.endTime = undefined - } + this.queryParams.startTime= this.dateRange ? this.dateRange[0] : '' + this.queryParams.endTime= this.dateRange ? this.dateRange[1] : '' // this.queryParams.statusList=[3,13,4,14,19] this.queryParams.taskStage = 4 // this.queryParams.modelName="新购验收" diff --git a/src/views/material/repair/inventoryScrap/component/homeApply.vue b/src/views/material/repair/inventoryScrap/component/homeApply.vue index af3ac7ed..1c14abcd 100644 --- a/src/views/material/repair/inventoryScrap/component/homeApply.vue +++ b/src/views/material/repair/inventoryScrap/component/homeApply.vue @@ -116,10 +116,10 @@ @click="handleView(scope.row)" >查看 编辑 删除 @@ -307,14 +307,11 @@ export default { /** 删除按钮操作 */ handleDeletePurchase(row) { - // console.log(row) - let ids = []; - ids.push(row.id); - console.log("ids", ids); + console.log('🚀 ~ handleDeletePurchase ~ row:', row) this.$modal .confirm("是否确认删除所选择的数据项？") .then(function () { - return applyRemove(ids); + return applyRemove({ taskId: row.taskId }) }) .then(() => { this.getList(); From 50fb9df0856eaf2063c2f6f66c7910e60a55df59 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Wed, 18 Jun 2025 16:45:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventoryLogs/index.vue | 1 + .../lease/apply/component/addToolsApply.vue | 2 +- src/views/material/part/partAccept/detail.vue | 4 ++-- .../material/part/partAcceptTwo/detail.vue | 4 ++-- .../part/partArrived/component/addTools.vue | 6 ++--- .../part/partArrived/component/queryTools.vue | 4 ++-- .../material/purchase/goodsAccept/detail.vue | 4 ++-- .../material/purchase/goodsAccept/index.vue | 22 ++++++++--------- .../goodsArrived/component/addTools.vue | 6 ++--- .../purchase/goodsArrived/component/home.vue | 24 +++++++++---------- .../goodsArrived/component/queryTools.vue | 4 ++-- .../goodsBind/component/bindTools.vue | 4 ++-- .../material/purchase/goodsEntry/detail.vue | 4 ++-- .../material/purchase/goodsEntry/index.vue | 2 +- .../component/addToolsApply.vue | 2 +- 15 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/views/inventoryLogs/index.vue b/src/views/inventoryLogs/index.vue index d532b10e..c12887cd 100644 --- a/src/views/inventoryLogs/index.vue +++ b/src/views/inventoryLogs/index.vue @@ -14,6 +14,7 @@
-
+
到货验收单
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;max-width: 33%;"> 生产厂家（供应商）：{{printData.supplier}}
备注 - 采购数量 + 到货数量 验收结论 - 质保质量 + 质保资料 实收份数 @@ -194,7 +194,7 @@ {{ row.purchaseNum }} {{ row.checkResult }} {{ row.fileReceiveNum }} - {{ row.isQualified }} + {{ '符合' }} {{ row.remark }} @@ -202,8 +202,8 @@
-
供应科：
-
+
供应科：
+
@@ -211,16 +211,16 @@
-
生产技术科：
-
+
生产技术科：
+
-
库管班：
-
+
库管班：
+
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index e6516e02..bd247013 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -483,7 +483,7 @@ export default { {dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]}, - {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, + {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}, ], fileListInfo: [], @@ -1034,7 +1034,7 @@ export default { this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]}, - {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, + {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}] // console.log(this.rowData) // console.log(this.rowData.bmFileInfos) @@ -1057,7 +1057,7 @@ export default { this.fileDataList = [{dictLabel:"合格证",fileType:"0",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:"",fileList:[],fileListTemp:[]}, - {dictLabel:"第三方监测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, + {dictLabel:"第三方检测报告",fileType:"3",name:"",url:"",fileList:[],fileListTemp:[]}, {dictLabel:"其他",fileType:"4",name:"",url:"",fileList:[],fileListTemp:[]}] if (this.rowData.bmFileInfos == null) { diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue index d1111384..629eaaea 100644 --- a/src/views/material/purchase/goodsArrived/component/home.vue +++ b/src/views/material/purchase/goodsArrived/component/home.vue @@ -144,13 +144,13 @@
-
+
到货验收单
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;max-width: 33%;"> 生产厂家（供应商）：{{printData.supplier}}
备注 - 采购数量 + 到货数量 验收结论 - 质保质量 + 质保资料 实收份数 @@ -206,7 +206,7 @@ {{ row.purchaseNum }} {{ row.checkResult }} {{ row.fileReceiveNum }} - {{ row.isQualified }} + {{ '符合' }} {{ row.remark }} @@ -214,8 +214,8 @@
-
供应科：
-
+
供应科：
+
@@ -223,16 +223,16 @@
-
生产技术科：
-
+
生产技术科：
+
-
库管班：
-
+
库管班：
+
@@ -256,7 +256,7 @@
-
新购入库单
+
新购入库单