From 9f9e2afa3a8ad8fccb9bc804516e07b5c7772039 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 20 五月 2026 18:40:11 +0800
Subject: [PATCH] feat 调整信息

---
 src/views/productionManagement/workOrder/index.vue |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 7fcdab2..151a515 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -263,24 +263,24 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="瀹℃牳浜�" prop="auditUserId">
-              <el-select
-                  v-model="reportForm.auditUserId"
-                  placeholder="璇烽�夋嫨瀹℃牳浜�"
-                  clearable
-                  filterable
-                  @change="handleReviewerIdChange"
-              >
-                <el-option
-                    v-for="user in userOptions"
-                    :key="user.userId"
-                    :label="user.nickName"
-                    :value="user.userId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="瀹℃牳浜�" prop="auditUserId">-->
+<!--              <el-select-->
+<!--                  v-model="reportForm.auditUserId"-->
+<!--                  placeholder="璇烽�夋嫨瀹℃牳浜�"-->
+<!--                  clearable-->
+<!--                  filterable-->
+<!--                  @change="handleReviewerIdChange"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                    v-for="user in userOptions"-->
+<!--                    :key="user.userId"-->
+<!--                    :label="user.nickName"-->
+<!--                    :value="user.userId"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
         </el-row>
       </el-form>
@@ -936,8 +936,9 @@
     }
 
     proxy.$modal.msgSuccess("鎺掍骇宸蹭繚瀛�");
+    scheduleDialogVisible.value = false;
     resetCreateScheduleRows();
-    getList();
+    await getList();
   } catch (error) {
     console.error("淇濆瓨鎺掍骇澶辫触", error);
     ElMessage.error("淇濆瓨鎺掍骇澶辫触锛岃閲嶈瘯");
@@ -961,18 +962,25 @@
     label: "鐢熶骇璁㈠崟鍙�",
     prop: "productOrderNpsNo",
     width: "140",
+    formatData: val => (val && val.length > 4 ? val.slice(0, -4) : val || ""),
   },
   {
-    label: "浜у搧鍚嶇О",
+    label: "鎴愬搧鍚嶇О",
+    prop: "finalProductModel",
+    minWidth: 200,
+    overHidden: false
+  },
+  {
+    label: "鍔犲伐鍝佸悕绉�",
     prop: "productName",
     width: "140",
   },
   {
-    label: "瑙勬牸",
+    label: "鍔犲伐鍝佽鏍�",
     prop: "model",
   },
   {
-    label: "鍗曚綅",
+    label: "鍔犲伐鍝佸崟浣�",
     prop: "unit",
   },
   {
@@ -1048,7 +1056,7 @@
         },
         // 鐢ㄦ埛褰撳墠id
         disabled: row => row.completeQuantity >= row.planQuantity ||
-            !isCurrentUserInUserIds(row)
+            !isCurrentUserInUserIds(row) || row.hasUnreportedMachine
       },
       {
         name: "鐢熶骇鎺掍骇",
@@ -1124,7 +1132,10 @@
   teamList: [],
   deviceId: null,
 });
-
+function removeLastFour(str) {
+  if (!str) return ''; // 绌哄�间繚鎶�
+  return str.toString().slice(0, -4); // 鏍稿績锛氭埅鍙� 0 鍒� 鍊掓暟绗�4浣�
+}
 // 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
 const validateQuantity = (rule, value, callback) => {
   if (value === null || value === undefined || value === "") {
@@ -1196,7 +1207,7 @@
     await Promise.all(updates);
     ElMessage.success("瀹℃牳鎴愬姛");
     auditDialogVisible.value = false;
-    getList();
+    await getList();
   } finally {
     auditLoading.value = false;
   }
@@ -1217,7 +1228,7 @@
   scrapQty: [{validator: validateScrapQty, trigger: "blur"}],
   startTime: [{required: true, message: "璇烽�夋嫨寮�濮嬫椂闂�", trigger: "change"}],
   endTime: [{required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change"}],
-  auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
+  // auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
   teamList: [{required: true, message: "璇烽�夋嫨鐝粍", trigger: "change"}],
   deviceId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
 };
@@ -1314,7 +1325,7 @@
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
   page.current = 1;
-  getList();
+   getList();
 };
 const pagination = obj => {
   page.current = obj.page;
@@ -1790,4 +1801,8 @@
     height: 140px !important;
   }
 }
+.el-table .cell {
+  white-space: normal !important;
+  word-break: break-all;
+}
 </style>

--
Gitblit v1.9.3