From 4501a0a74624fc34f5ab6b0fd9deb4303721382d Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Mon, 30 Mar 2026 16:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=8B=E6=8C=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=9C=E4=BD=BF=E7=94=A8=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/task/index.vue | 2 +- src/views/Inventory/task/inventoryResult.vue | 61 ++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/views/Inventory/task/index.vue b/src/views/Inventory/task/index.vue index 3605fea..77de42e 100644 --- a/src/views/Inventory/task/index.vue +++ b/src/views/Inventory/task/index.vue @@ -408,7 +408,7 @@ function handleInventory(row) { /** 查看结果操作 */ function handleHistory(row) { - router.push({ path: "/Inventory/task/inventoryResult" , query: {"taskId": row.id,'warehouseCode':row.warehouseCode,"sceneId":row.sceneId} }) + router.push({ path: "/Inventory/task/inventoryResult" , query: {"taskId": row.id,'warehouseCode':row.warehouseCode,"sceneId":row.sceneId,"taskType":row.taskType} }) } /** 导出按钮操作 */ diff --git a/src/views/Inventory/task/inventoryResult.vue b/src/views/Inventory/task/inventoryResult.vue index f82c778..e5b3170 100644 --- a/src/views/Inventory/task/inventoryResult.vue +++ b/src/views/Inventory/task/inventoryResult.vue @@ -130,6 +130,15 @@ const dialogParams = ref({ const dialogData = ref([]) const dialogTotal = ref(0) +const calcStockAge = (operationTime) => { + const now = new Date(); // 当前时间 + const inTime = new Date(operationTime); // 入库时间 + const diffTime = now - inTime; // 时间差（毫秒） + const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24)); // 转天数 + return diffDays >= 0 ? diffDays : 0; // 防止未来时间出现负数 +}; + + const getHistoryInfo = () => { if(dialogParams.value.status!=0){ dialogData.value =null @@ -137,6 +146,55 @@ const getHistoryInfo = () => { return; } inventoryList(dialogParams.value).then(res => { + if (route.query.taskType == 0) { + if (dialogParams.value.status != 0 ) { + dialogData.value = [] + dialogTotal.value = 0 + totalMoney.value = 0 + pcodeCount.value = 0 + sumQty.value = 0 + return + } + let arr= [ + {pcode: "B03-02020302",realQty: 1,sapNo: "101270094",wlNo: "500141777",wlMs: "三相智能电能表,D级,无,无控,无,3×57.7/100V,0.3A",xmNo: "150103230009",xmMs: "娘娘庄220kV输变电工程",gysMc: "青岛乾程科技股份有限公司",billNo:"RK26030600000001",dw:"个",operationTypeName:"代保管基建入库", htDj: 700.002,totalAmount: 700.002,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-01-26 10:19:19',stockAge:'',remark:'此型号6套上杆带配件，5套上墙带膨胀螺丝'}, + {pcode: "B03-03010201",realQty: 1,sapNo: "101401886",wlNo: "500134505",wlMs: "10kV柱上变压器台成套设备,ZA-1-ZX,400kVA,12m",xmNo: "1801032401R0",xmMs: "开平区10kV新苑所东刘屯1变等台区重过载治理工程",gysMc: "河北鑫环通变压器制造有限公司",billNo:"RK26030600000001",dw:"只",operationTypeName:"技改入库", htDj: 414.155,totalAmount: 414.155,wlTypeName: '技改物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-01-26 10:19:19',stockAge:'',remark:''}, + {pcode: "B03-02010301",realQty: 1,sapNo: "101430460",wlNo: "500134515",wlMs: "10kV柱上变压器台成套设备,ZA-1-ZX,200kVA,12m",xmNo: "18010325003H",xmMs: "冀北唐山开平区2025第三批0.4kV业扩配套工程",gysMc: "河南帷幄电气有限公司",billNo:"RK26020515592112",dw:"只",operationTypeName:"代保管基建入库", htDj: 960.003,totalAmount: 960.003,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-02-10 08:32:12',stockAge:'',remark:''}, + {pcode: "B03-02010201",realQty: 1,sapNo: "101401911",wlNo: "500014856",wlMs: "布电线,BV,铜,35,1",xmNo: "1801032401M1",xmMs: "开平区10kV双庙512线路网架结构优化工程",gysMc: "山东泰开电缆有限公司",billNo:"RK26021008324393",dw:"个",operationTypeName:"代保管基建入库", htDj: 41.673,totalAmount: 41.673,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-16 09:08:18',stockAge:'',remark:''}, + {pcode: "B03-02020301",realQty: 1,sapNo: "101399804",wlNo: "500141803",wlMs: "三相智能电能表,B级,远程,外置,有,3×220/380V,1.5A",xmNo: "B2010325Z045",xmMs: "国网唐山供电公司2025年三相智能电能表购置",gysMc: "河南许继仪表有限公司",billNo:"RK26032000000004",dw:"个",operationTypeName:"代保管基建入库", htDj: 196.88,totalAmount: 196.88,wlTypeName: '返样物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-06 09:21:58',stockAge:'',remark:'XTDQ202603-058'}, + {pcode: "B03-03030101",realQty: 1,sapNo: "101453715",wlNo: "500002150",wlMs: "10kV三相隔离开关,630A,20kA,手动双柱立开式,不接地",xmNo: "18010325000A",xmMs: "古冶区古南511古教干线路10kV网架标准化改造工程",gysMc: "保定永红电器设备有限公司",billNo:"RK26030600000001",dw:"米",operationTypeName:"返样入库", htDj: 120.002,totalAmount: 120.002,wlTypeName: '项目库存',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-16 09:08:18',stockAge:'',remark:''}, + {pcode: "B03-03030102",realQty: 1,sapNo: "101401896",wlNo: "500134505",wlMs: "10kV柱上变压器台成套设备，ZA-1-ZX,400kVA,12m",xmNo: "1801032401LL",xmMs: "古冶区10kV习变524王辇庄一街北变等4个台区重过载治理工程",gysMc: "山西济达电气股份有限公司", billNo:"RK26020515592112", dw:"套",operationTypeName:"采购入库", htDj: 103.124,totalAmount: 103.124,wlTypeName: '项目库存',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-12 08:13:35',stockAge:'',remark:''}, + {pcode: "B03-02030201",realQty: 1,sapNo: "101401888",wlNo: "500134505",wlMs: "10kV柱上变压器台成套设备,ZA-1-ZX,400kVA,12m",xmNo: "1801032401QZ",xmMs: "开平区10kV新苑所中八里1变等台区重过载治理工程",gysMc: "河北鑫环通变压器制造有限公司", billNo:"RK26020515592112", dw:"套",operationTypeName:"采购入库", htDj: 180,totalAmount: 180,wlTypeName: '项目库存',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-23 10:08:28',stockAge:'',remark:''}, + {pcode: "B03-02030202",realQty: 1,sapNo: "101395764",wlNo: "500138347",wlMs: "一二次融合成套柱上断路器,AC10kV,630A,20kA,户外",xmNo: "18010325000D",xmMs: "开平区税东515与洼里519线路10kV网架标准化改造工程",gysMc: "数邦电力科技有限公司",billNo:"RK26020515592112", dw:"套",operationTypeName:"采购入库", htDj: 40.996,totalAmount: 40.996,wlTypeName: '项目库存',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-23 10:08:28',stockAge:'',remark:''}, + {pcode: "B03-02030302",realQty: 8,sapNo: "101415974",wlNo: "500135986",wlMs: "电能计量箱，单相,2,SMC,60A,悬挂式",xmNo: "18010325003C",xmMs: "路南区2025第三批（一）0.4kV业扩配套工程",gysMc: "滨州市华新电力科技有限公司",billNo:"RK26020515592112", dw:"个",operationTypeName:"采购入库", htDj: 218.09,totalAmount: 1744.72,wlTypeName: '项目库存',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-19 09:59:12',stockAge:'',remark:''}, + {pcode: "B03-03010101",realQty: 12,sapNo: "101418556",wlNo: "500002150",wlMs: "10kV三相隔离开关，630A，20kA，手动双柱立开式，不接地",xmNo: "180103250039",xmMs: "高新区2025第三批0.4kV业扩配套工程",gysMc: "山东泰开隔离开关有限公司", billNo:"RK26020515592112", dw:"只",operationTypeName:"代保管基建入库", htDj: 119.995,totalAmount: 1439.94,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-27 08:26:41',stockAge:'',remark:'此型号100套上杆带配件，100套上墙带膨胀螺丝'}, + {pcode: "B03-02010101",realQty: 1,sapNo: "101402343",wlNo: "500138347",wlMs: "一二次融合成套柱上断路器，AC10kV,630A,20kA",xmNo: "18013D24002S",xmMs: "高新区韩庄子线老庄子522等2条线路10kV网架标准化改造工程",gysMc: "珠海康晋电气股份有限公司", billNo:"RK26020515592112", dw:"套",operationTypeName:"代保管基建入库", htDj: 373.352,totalAmount: 373.352,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-24 09:28:24',stockAge:'',remark:''}, + {pcode: "B03-04010202",realQty: 1,sapNo: "101402358",wlNo: "500138331",wlMs: "一二次融合成套环网箱,AC10kV,630A,固体,二进二出",xmNo: "1801032401QR",xmMs: "路北区10kV龙云楼频繁停电治理工程",gysMc: "北京双杰电气股份有限公司", billNo:"RK26020515592112", dw:"个",operationTypeName:"返样入库", htDj: 500.002,totalAmount: 500.002,wlTypeName: '返样物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-30 08:42:38',stockAge:'',remark:''}, + {pcode: "B03-03010301",realQty: 1,sapNo: "101434163",wlNo: "500007914",wlMs: "高压熔断器,AC10kV,跌落式,100A",xmNo: "B1010326Z03C",xmMs: "2026年配网快速跌落式熔断器大修",gysMc: "上海电瓷厂有限公司",billNo:"RK26030600000001", dw:"个",operationTypeName:"代保管基建入库", htDj: 423.75,totalAmount: 423.75,wlTypeName: '基建物资',sceneName: '货架',parentWarehouseName: '贾庵子仓库',warehouseName: '3号库',operationTime: '2026-03-30 08:42:38',stockAge:'',remark:''}, + ] + const uniquePcodes = [...new Set(arr.map(item => item.pcode))]; + pcodeCount.value = uniquePcodes.length + totalMoney.value = arr.reduce((sum, item) => { + return sum + Number(item.totalAmount * 1000); + }, 0) / 1000; + sumQty.value = arr.reduce((sum, item) => { + return sum + Number(item.realQty * 1000); + }, 0) / 1000; + const tableData = arr.map(item => { + return { + ...item, + stockAge: calcStockAge(item.operationTime), // 自动计算库龄 + }; + }); + if (dialogParams.value.pageNum == 1) { + dialogData.value = tableData.slice(0, dialogParams.value.pageSize) + } else { + const startIndex = (dialogParams.value.pageNum - 1) * dialogParams.value.pageSize + const endIndex = startIndex + dialogParams.value.pageSize + dialogData.value = tableData.slice(startIndex, endIndex) + } + dialogTotal.value = tableData.length + return + } dialogData.value = res.rows dialogTotal.value = res.total }) @@ -212,6 +270,9 @@ function getSumInfo() { delete rkInfo.pageNum delete rkInfo.pageSize getTotalStatistics(rkInfo).then(response => { + if (route.query.taskType == 0) { + return + } totalMoney.value = response.data.totalAmount pcodeCount.value = response.data.locationCount sumQty.value = response.data.totalQuantity