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/New.vue |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 4a9bb60..59c04bd 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -24,17 +24,29 @@
         </el-form-item>
 
         <el-form-item
+            label="鎵瑰彿"
+            prop="batchNo"
+            :rules="[
+                {
+                required: true,
+                }
+            ]"
+        >
+          <el-input v-model="formState.batchNo"/>
+        </el-form-item>
+
+        <el-form-item
             label="瑙勬牸"
             prop="productModelName"
         >
-          <el-input v-model="formState.productModelName"  disabled />
+          <el-input v-model="formState.productModelName" disabled/>
         </el-form-item>
 
         <el-form-item
             label="鍗曚綅"
             prop="unit"
         >
-          <el-input v-model="formState.unit"  disabled />
+          <el-input v-model="formState.unit" disabled/>
         </el-form-item>
 
         <el-form-item label="宸ヨ壓璺嚎">
@@ -45,7 +57,7 @@
             <el-option v-for="item in routeOptions"
                        :key="item.id"
                        :label="`${item.processRouteCode || ''}`"
-                       :value="item.id" />
+                       :value="item.id"/>
           </el-select>
         </el-form-item>
 
@@ -53,7 +65,21 @@
             label="棰勮鐢熶骇鏁伴噺"
             prop="quantity"
         >
-          <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
+          <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%"/>
+        </el-form-item>
+
+        <el-form-item
+            label="棰勮鏃ョ▼锛堝ぉ锛�"
+            prop="expectedSchedule"
+        >
+          <el-input-number v-model="formState.expectedSchedule" :step="0.01" :min="0" style="width: 100%" />
+        </el-form-item>
+
+        <el-form-item
+            label="鍒堕�犵彮缁�"
+            prop="manufacturingTeam"
+        >
+          <el-input v-model="formState.manufacturingTeam"  disabled />
         </el-form-item>
       </el-form>
 
@@ -101,7 +127,10 @@
   productName: "",
   productModelName: "",
   unit: "",
+  batchNo: "",
   quantity: 0,
+  expectedSchedule: undefined,
+  manufacturingTeam: undefined,
 });
 
 const isShow = computed({
@@ -115,7 +144,7 @@
 
 const showProductSelectDialog = ref(false);
 
-let { proxy } = getCurrentInstance()
+let {proxy} = getCurrentInstance()
 
 const closeModal = () => {
   // 閲嶇疆琛ㄥ崟鏁版嵁
@@ -126,6 +155,7 @@
     productName: "",
     productModelName: "",
     quantity: '',
+    batchNo: "",
   };
   isShow.value = false;
 };
@@ -136,11 +166,16 @@
     const product = products[0];
     formState.value.productId = product.productId;
     formState.value.productName = product.productName;
+    const productNameArr = product.productName.split('-');
+    if (productNameArr.length === 3 && productNameArr[0] && productNameArr[1] !== '') {
+      formState.value.manufacturingTeam = productNameArr[1].charAt(0) + '绫昏溅闂�';
+    }
+
     formState.value.productModelName = product.model;
     formState.value.productModelId = product.id;
     formState.value.unit = product.unit;
     showProductSelectDialog.value = false;
-    fetchRouteOptions( product.id);
+    fetchRouteOptions(product.id);
     // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
     proxy.$refs["formRef"]?.validateField('productModelId');
   }
@@ -152,7 +187,7 @@
   formState.value.routeId = undefined;
   routeOptions.value = []
   bindRouteLoading.value = true;
-  listProcessRoute({ productModelId: productModelId }).then(res => {
+  listProcessRoute({productModelId: productModelId}).then(res => {
     routeOptions.value = res.data || [];
   }).finally(() => {
     bindRouteLoading.value = false;

--
Gitblit v1.9.3