From 758aa7ce0b70bf8bde616c5332e6af2eb205f199 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:55:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/productionOrder/index.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 761139e..1f4c3f0 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -83,10 +83,10 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="bindRouteDialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary"
:loading="bindRouteSaving"
@click="handleBindRouteConfirm">纭� 璁�</el-button>
+ <el-button @click="bindRouteDialogVisible = false">鍙� 娑�</el-button>
</span>
</template>
</el-dialog>
@@ -125,16 +125,6 @@
width: '120px',
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
- },
- {
label: "浜у搧鍚嶇О",
prop: "productCategory",
width: '120px',
@@ -150,8 +140,9 @@
width: '200px',
},
{
- label: "闇�姹傛暟閲�",
+ label: "棰勮鐢熶骇鏁伴噺",
prop: "quantity",
+ width: '140px',
},
{
label: "瀹屾垚鏁伴噺",
@@ -183,6 +174,16 @@
width: 120,
},
{
+ label: "棰勮鏃ョ▼锛堝ぉ锛�",
+ prop: "expectedSchedule",
+ width: 120,
+ },
+ {
+ label: "鍒堕�犵彮缁�",
+ prop: "manufacturingTeam",
+ width: 120,
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
--
Gitblit v1.9.3