From 52df5ea2e61a5f466f7b356bcfb3cf77b4d2e8cc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 24 三月 2026 15:56:01 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/productionManagement/productionReporting/index.vue | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f4137af..af06fe5 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -19,21 +19,6 @@
style="width: 200px;"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="宸ュ崟鐘舵��:">
- <el-select v-model="searchForm.workOrderStatus"
- placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
- style="width: 140px"
- clearable>
- <el-option label="寰呯‘璁�"
- :value="1"></el-option>
- <el-option label="寰呯敓浜�"
- :value="2"></el-option>
- <el-option label="鐢熶骇涓�"
- :value="3"></el-option>
- <el-option label="宸茬敓浜�"
- :value="4"></el-option>
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
@@ -178,13 +163,13 @@
width: 120,
},
{
- label: "宸ュ崟缂栧彿",
- prop: "workOrderNo",
+ label: "宸ュ簭",
+ prop: "process",
width: 120,
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
+ label: "宸ュ崟缂栧彿",
+ prop: "workOrderNo",
width: 120,
},
{
@@ -202,11 +187,11 @@
prop: "quantity",
width: 120,
},
- // {
- // label: "鎶ュ簾鏁伴噺",
- // prop: "scrapQuantity",
- // width: 120,
- // },
+ {
+ label: "鎶ュ簾鏁伴噺",
+ prop: "scrapQty",
+ width: 120,
+ },
{
label: "鍗曚綅",
prop: "unit",
@@ -416,7 +401,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/salesLedger/work/export", {}, "鐢熶骇鎶ュ伐.xlsx");
+ proxy.download("/productionProductMain/export", {}, "鐢熶骇鎶ュ伐.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3