From 0a5df5ab2cc2f564ccebb54ec28e0a0b159797bf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 一月 2026 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide

---
 src/views/productionManagement/productionDispatching/components/formDia.vue |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/productionManagement/productionDispatching/components/formDia.vue b/src/views/productionManagement/productionDispatching/components/formDia.vue
index 9d9ec9e..de04e07 100644
--- a/src/views/productionManagement/productionDispatching/components/formDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -3,35 +3,29 @@
     <el-dialog
         v-model="dialogFormVisible"
         title="鐢熶骇娲惧伐"
-        width="70%"
+        width="50%"
         @close="closeDia"
     >
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
           <el-col :span="12">
-            <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
               <el-input v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable disabled/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鎬绘暟閲忥細" prop="quantity">
               <el-input v-model="form.quantity" placeholder="璇疯緭鍏�" clearable disabled/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          
           <el-col :span="12">
 						<el-form-item label="寰呮帓浜ф暟閲忥細" prop="pendingQuantity">
 							<el-input v-model="form.pendingQuantity" placeholder="璇疯緭鍏�" clearable disabled/>
 						</el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="30">
           <el-col :span="12">
 						<el-form-item label="鏈鎺掍骇鏁伴噺锛�" prop="schedulingNum">
 							<el-input-number
@@ -103,13 +97,13 @@
 const operationType = ref('')
 const data = reactive({
   form: {
-		projectName: "",
 		productCategory: "",
 		quantity: "",
 		schedulingNum: "",
 		schedulingUserId: "",
 		schedulingDate: "",
 		pendingQuantity: "",
+		salesLedgerProductId: "",
   },
   rules: {
 		schedulingNum: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -129,6 +123,10 @@
 		userList.value = res.data;
 	});
 	form.value = {...row}
+	// 缁戝畾澶栧眰浼犲叆鐨勪骇鍝両D鍒板悗绔渶瑕佺殑 salesLedgerProductId 瀛楁
+	form.value.salesLedgerProductId = row.id;
+	// 纭繚涓嶄細鎶婂師濮� id 褰撲綔鎺掍骇璁板綍涓婚敭浼犵粰鍚庣
+	delete form.value.id;
 	form.value.schedulingNum = 0
 	form.value.schedulingUserId = userStore.id
 	form.value.schedulingDate = dayjs().format("YYYY-MM-DD");

--
Gitblit v1.9.3