From cec42fd188b00a2f8fe8f6902ccfc58381d2a481 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 04 十二月 2025 14:45:29 +0800
Subject: [PATCH] 1.润泰生物、安佑农牧-生产管控:生产派工需要新增派工产线及生产人

---
 src/views/productionManagement/productionDispatching/components/formDia.vue |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/src/views/productionManagement/productionDispatching/components/formDia.vue b/src/views/productionManagement/productionDispatching/components/formDia.vue
index 1e23daf..da0c8c8 100644
--- a/src/views/productionManagement/productionDispatching/components/formDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -25,26 +25,24 @@
               <el-input v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable disabled/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="缁戝畾鏈哄櫒锛�" prop="speculativeTradingName">
-              <el-input v-model="form.speculativeTradingName" placeholder="鑷姩鑾峰彇" clearable disabled/>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="缁戝畾鏈哄櫒锛�" prop="speculativeTradingName">-->
+<!--              <el-input v-model="form.speculativeTradingName" placeholder="鑷姩鑾峰彇" clearable disabled/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+					<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="quantity">
-              <el-input v-model="form.quantity" placeholder="璇疯緭鍏�" clearable disabled/>
-            </el-form-item>
-          </el-col>
           <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-col :span="12">
 						<el-form-item label="鏈鎺掍骇鏁伴噺锛�" prop="schedulingNum">
 							<el-input-number
 								v-model="form.schedulingNum"
@@ -57,6 +55,46 @@
 								style="width: 100%"
 							/>
 						</el-form-item>
+					</el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="浜х嚎锛�" prop="lineId">
+              <el-select
+                v-model="form.lineId"
+                placeholder="閫夋嫨浜х嚎"
+                style="width: 100%;"
+                filterable
+                clearable
+              >
+                <el-option
+                  v-for="line in lineList"
+                  :key="line.id"
+                  :label="line.name"
+                  :value="line.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鐢熶骇浜猴細" prop="productionUserId">
+              <el-select
+                v-model="form.productionUserId"
+                placeholder="閫夋嫨鐢熶骇浜�"
+                style="width: 100%;"
+                filterable
+                default-first-option
+                :reserve-keyword="false"
+                clearable
+              >
+                <el-option
+                  v-for="user in userList"
+                  :key="user.userId"
+                  :label="user.nickName"
+                  :value="user.userId"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
@@ -109,6 +147,7 @@
 import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
 import {userListNoPageByTenantId} from "@/api/system/user.js";
 import {productionDispatch} from "@/api/productionManagement/productionOrder.js";
+import {getDeptPositionTree} from "@/api/lavorissce/issue.js";
 import useUserStore from "@/store/modules/user.js";
 import dayjs from "dayjs";
 const { proxy } = getCurrentInstance()
@@ -127,15 +166,20 @@
 		schedulingDate: "",
 		pendingQuantity: "",
 		speculativeTradingName: "", // 缁戝畾鏈哄櫒鍚嶇О
+		lineId: "", // 浜х嚎ID
+		productionUserId: "", // 鐢熶骇浜篒D
   },
   rules: {
 		schedulingNum: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
 		schedulingUserId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" },],
 		schedulingDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" },],
+		lineId: [{ required: true, message: "璇烽�夋嫨浜х嚎", trigger: "change" },],
+		productionUserId: [{ required: true, message: "璇烽�夋嫨鐢熶骇浜�", trigger: "change" },],
   },
 });
 const { form, rules } = toRefs(data);
 const userList = ref([])
+const lineList = ref([])
 const userStore = useUserStore()
 
 
@@ -146,6 +190,9 @@
 	userListNoPageByTenantId().then((res) => {
 		userList.value = res.data;
 	});
+	getDeptPositionTree().then((res) => {
+		lineList.value = res.data;
+	});
 	form.value = {...row}
 	form.value.schedulingNum = 0
 	form.value.schedulingUserId = userStore.id

--
Gitblit v1.9.3