From 8f62babc53ba4ba1f72fd3d35d5a5bb26f30700f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 02 九月 2026 19:38:03 +0800
Subject: [PATCH] 天津-潜宇塑胶 1.一键报工功能

---
 src/views/productionManagement/workOrderManagement/index.vue |  236 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 195 insertions(+), 41 deletions(-)

diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 95fb703..06b1dd9 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="search_form">
+    <div class="search_form mb20">
       <div class="search-row">
         <div class="search-item">
           <span class="search_title">宸ュ崟缂栧彿锛�</span>
@@ -13,7 +13,7 @@
         </div>
         <div class="search-item">
           <span class="search_title">鐢熶骇璁㈠崟鍙凤細</span>
-          <el-input v-model="searchForm.productOrderNpsNo"
+          <el-input v-model="searchForm.npsNo"
                     style="width: 240px"
                     placeholder="璇疯緭鍏�"
                     @change="handleQuery"
@@ -27,10 +27,17 @@
       </div>
     </div>
     <div class="table_list">
+      <div style="margin-bottom: 10px; text-align: left;">
+        <el-button type="primary"
+                   v-hasPermi="['production:workOrder:batchReport']"
+                   @click="handleBatchReport">涓�閿姤宸�</el-button>
+      </div>
       <PIMTable rowKey="id"
                 :column="tableColumn"
                 :tableData="tableData"
                 :page="page"
+                :isSelection="true"
+                @selection-change="handleSelectionChange"
                 :tableLoading="tableLoading"
                 @pagination="pagination">
         <template #completionStatus="{ row }">
@@ -57,7 +64,7 @@
               <span class="info-value">{{ transferCardRowData.productName }}</span>
             </div>
             <div class="info-item">
-              <span class="info-label">浜у搧瑙勬牸</span>
+              <span class="info-label">瑙勬牸鍨嬪彿</span>
               <span class="info-value">{{ transferCardRowData.model }}</span>
             </div>
             <div class="info-item">
@@ -128,14 +135,14 @@
                     readonly
                     style="width: 300px" />
         </el-form-item>
-        <el-form-item label="鏈鐢熶骇鏁伴噺"
+        <el-form-item label="鐢熶骇鍚堟牸鏁伴噺"
                       prop="quantity">
           <el-input v-model.number="reportForm.quantity"
                     type="number"
-                    min="1"
+                    min="0"
                     step="1"
                     style="width: 300px"
-                    placeholder="璇疯緭鍏ユ湰娆$敓浜ф暟閲�"
+                    placeholder="璇疯緭鍏ョ敓浜у悎鏍兼暟閲�"
                     @input="handleQuantityInput" />
         </el-form-item>
         <el-form-item label="鎶ュ簾鏁伴噺"
@@ -160,6 +167,17 @@
                        :label="user.nickName"
                        :value="user.userId" />
           </el-select>
+        </el-form-item>
+        <!-- 宸ユ椂 -->
+        <el-form-item label="宸ユ椂"
+                      v-if="currentReportRowData?.type == 0"
+                      prop="workHour">
+          <el-input v-model.number="reportForm.workHour"
+                    type="number"
+                    min="0"
+                    style="width: 280px"
+                    placeholder="璇疯緭鍏ュ伐鏃�" /><span style="margin-left:10px"
+                class="param-unit">h</span>
         </el-form-item>
         <div v-if="params.length > 0"
              class="param-grid"
@@ -242,7 +260,11 @@
     <MaterialDialog v-model="materialDialogVisible"
                     :row-data="currentMaterialOrderRow"
                     @refresh="getList" />
-    <FilesDia ref="workOrderFilesRef" />
+    <FileList v-if="fileDialogVisible"
+              v-model:visible="fileDialogVisible"
+              :editable="!currentWorkOrderRow?.endOrder"
+              :record-type="'production_operation_task'"
+              :record-id="currentWorkOrderId" />
   </div>
 </template>
 
@@ -255,14 +277,20 @@
     addProductMain,
     downProductWorkOrder,
   } from "@/api/productionManagement/workOrder.js";
+  import { listMaterialPickingDetail } from "@/api/productionManagement/productionOrder.js";
   import { findProcessParamListOrder } from "@/api/productionManagement/productProcessRoute.js";
   import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
   import { getDicts } from "@/api/system/dict/data";
   import QRCode from "qrcode";
   import { getCurrentInstance, reactive, toRefs } from "vue";
-  import FilesDia from "./components/filesDia.vue";
   import MaterialDialog from "./components/MaterialDialog.vue";
+  const FileList = defineAsyncComponent(() =>
+    import("@/components/Dialog/FileList.vue")
+  );
+
+  import useUserStore from "@/store/modules/user";
   const { proxy } = getCurrentInstance();
+  const userStore = useUserStore();
 
   const tableColumn = ref([
     {
@@ -365,20 +393,37 @@
           clickFun: row => {
             showReportDialog(row);
           },
-          disabled: row => row.planQuantity <= 0,
+          showHide: row => !row.endOrder,
+          disabled: row => {
+            if (row.planQuantity <= 0) return true;
+            if (!row.userIds) return false;
+            try {
+              const userIds =
+                typeof row.userIds === "string"
+                  ? JSON.parse(row.userIds)
+                  : row.userIds;
+              if (Array.isArray(userIds)) {
+                return !userIds.some(id => String(id) === String(userStore.id));
+              }
+              return true;
+            } catch (e) {
+              return true;
+            }
+          },
         },
       ],
     },
   ]);
-
   const tableData = ref([]);
   const tableLoading = ref(false);
+  const selectedRows = ref([]);
   const transferCardVisible = ref(false);
   const transferCardData = ref([]);
   const transferCardQrUrl = ref("");
   const transferCardRowData = ref(null);
   const reportDialogVisible = ref(false);
-  const workOrderFilesRef = ref(null);
+  const fileDialogVisible = ref(false);
+  const currentWorkOrderId = ref(null);
   const reportFormRef = ref(null);
   const userOptions = ref([]);
   const reportForm = reactive({
@@ -393,6 +438,7 @@
     productMainId: null,
     productionOrderRoutingOperationId: "",
     productionOrderId: "",
+    workHour: 0,
     paramGroups: {},
   });
 
@@ -400,16 +446,16 @@
   const dictOptions = ref({});
   const paramLoading = ref(false);
 
-  // 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
+  // 鐢熶骇鍚堟牸鏁伴噺楠岃瘉瑙勫垯
   const validateQuantity = (rule, value, callback) => {
     if (value === null || value === undefined || value === "") {
-      callback(new Error("璇疯緭鍏ユ湰娆$敓浜ф暟閲�"));
+      callback(new Error("璇疯緭鍏ョ敓浜у悎鏍兼暟閲�"));
       return;
     }
     const num = Number(value);
     // 鏁存暟涓斿ぇ浜庣瓑浜�1
-    if (isNaN(num) || !Number.isInteger(num) || num < 1) {
-      callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
+    if (isNaN(num) || !Number.isInteger(num) || num < 0) {
+      callback(new Error("鐢熶骇鍚堟牸鏁伴噺蹇呴』澶т簬绛変簬0"));
       return;
     }
     callback();
@@ -436,7 +482,7 @@
     scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
   };
 
-  // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
+  // 澶勭悊鐢熶骇鍚堟牸鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�0
   const handleQuantityInput = value => {
     if (value === "" || value === null || value === undefined) {
       reportForm.quantity = null;
@@ -447,7 +493,7 @@
       return;
     }
     // 濡傛灉灏忎簬1锛屾竻闄�
-    if (num < 1) {
+    if (num < 0) {
       reportForm.quantity = null;
       return;
     }
@@ -455,7 +501,7 @@
     if (!Number.isInteger(num)) {
       const intValue = Math.floor(num);
       // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
-      if (intValue < 1) {
+      if (intValue < 0) {
         reportForm.quantity = null;
         return;
       }
@@ -502,16 +548,22 @@
   const data = reactive({
     searchForm: {
       workOrderNo: "",
-      productOrderNpsNo: "",
+      npsNo: "",
     },
   });
   const { searchForm } = toRefs(data);
+  // 鏁伴噺杩愮畻淇濈暀6浣嶅皬鏁帮紝閬垮厤娴偣鍑忔硶鍑虹幇 7.199999999999999 杩欑被绮惧害璇樊
+  const toQuantity = val => {
+    const n = Number(val);
+    if (!Number.isFinite(n)) return 0;
+    return parseFloat(n.toFixed(6));
+  };
   const toProgressPercentage = val => {
     const n = Number(val);
     if (!Number.isFinite(n)) return 0;
     if (n <= 0) return 0;
     if (n >= 100) return 100;
-    return Math.round(n);
+    return parseFloat(n.toFixed(2));
   };
   const progressColor = percentage => {
     const p = toProgressPercentage(percentage);
@@ -611,16 +663,38 @@
   const printTransferCard = () => {
     window.print();
   };
+  const currentWorkOrderRow = ref(null);
 
   const openWorkOrderFiles = row => {
-    workOrderFilesRef.value?.openDialog(row);
+    currentWorkOrderId.value = row.id;
+    currentWorkOrderRow.value = row;
+    fileDialogVisible.value = true;
   };
 
-  const showReportDialog = row => {
+  const showReportDialog = async row => {
+    if (row.productionOrderId) {
+      try {
+        const res = await listMaterialPickingDetail(row.productionOrderId);
+        const records = Array.isArray(res.data)
+          ? res.data
+          : res.data?.records || [];
+        if (res.code === 200 && records.length === 0) {
+          proxy.$modal.msgError("鏈鏂欐棤娉曟姤宸�");
+          return;
+        }
+      } catch (error) {
+        console.error("鏌ヨ棰嗘枡璇︽儏澶辫触:", error);
+      }
+    }
     currentReportRowData.value = row;
-    reportForm.planQuantity = row.planQuantity;
-    reportForm.quantity =
-      row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
+    const planQuantity = Number(row.planQuantity || 0);
+    const completeQuantity = Number(row.completeQuantity || 0);
+    const remainingQuantity = Math.max(
+      0,
+      toQuantity(planQuantity - completeQuantity)
+    );
+    reportForm.planQuantity = remainingQuantity;
+    reportForm.quantity = remainingQuantity;
     reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
     reportForm.workOrderId = row.id;
     reportForm.reportWork = row.reportWork;
@@ -630,6 +704,11 @@
     reportForm.productionOrderRoutingOperationId =
       row.productionOrderRoutingOperationId;
     reportForm.productionOrderId = row.productionOrderId;
+    if (row.type == 0) {
+      reportForm.workHour = row.workHour || 0;
+    } else {
+      reportForm.workHour = 0;
+    }
     nextTick(() => {
       reportFormRef.value?.clearValidate();
       if (row.productionOrderRoutingOperationId && row.productionOrderId) {
@@ -668,13 +747,13 @@
         return;
       }
 
-      // 楠岃瘉鏈鐢熶骇鏁伴噺
+      // 楠岃瘉鐢熶骇鍚堟牸鏁伴噺
       if (
         reportForm.quantity === null ||
         reportForm.quantity === undefined ||
         reportForm.quantity === ""
       ) {
-        ElMessageBox.alert("璇疯緭鍏ユ湰娆$敓浜ф暟閲�", "鎻愮ず", {
+        ElMessageBox.alert("璇疯緭鍏ョ敓浜у悎鏍兼暟閲�", "鎻愮ず", {
           confirmButtonText: "纭畾",
         });
         return;
@@ -682,19 +761,19 @@
 
       const quantity = Number(reportForm.quantity);
 
-      if (isNaN(quantity) || quantity <= 0) {
-        ElMessageBox.alert("鏈鐢熶骇鏁伴噺蹇呴』澶т簬0", "鎻愮ず", {
+      if (isNaN(quantity) || quantity < 0) {
+        ElMessageBox.alert("鐢熶骇鍚堟牸鏁伴噺蹇呴』澶т簬绛変簬0", "鎻愮ず", {
           confirmButtonText: "纭畾",
         });
         return;
       }
 
-      if (quantity > reportForm.planQuantity) {
-        ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
-          confirmButtonText: "纭畾",
-        });
-        return;
-      }
+      // if (quantity > reportForm.planQuantity) {
+      //   ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+      //     confirmButtonText: "纭畾",
+      //   });
+      //   return;
+      // }
 
       // 楠岃瘉鎶ュ簾鏁伴噺
       const scrapQty = Number(reportForm.scrapQty);
@@ -705,12 +784,12 @@
         return;
       }
 
-      if (!isNaN(scrapQty) && scrapQty > quantity) {
-        ElMessageBox.alert("鎶ュ簾鏁伴噺涓嶈兘澶т簬鏈鐢熶骇鏁伴噺", "鎻愮ず", {
-          confirmButtonText: "纭畾",
-        });
-        return;
-      }
+      // if (!isNaN(scrapQty) && scrapQty > quantity) {
+      //   ElMessageBox.alert("鎶ュ簾鏁伴噺涓嶈兘澶т簬鏈鐢熶骇鏁伴噺", "鎻愮ず", {
+      //     confirmButtonText: "纭畾",
+      //   });
+      //   return;
+      // }
 
       const productionOperationParamList = params.value.map(param => ({
         ...param,
@@ -729,6 +808,7 @@
         productionOrderRoutingOperationId:
           reportForm.productionOrderRoutingOperationId,
         productionOrderId: reportForm.productionOrderId,
+        workHour: reportForm.workHour,
         productionOperationParamList: productionOperationParamList,
       };
 
@@ -749,6 +829,79 @@
   const handleUserChange = val => {
     const user = userOptions.value.find(item => item.userId === val);
     reportForm.userName = user ? user.nickName : "";
+  };
+
+  // 琛ㄦ牸閫夋嫨鍙樺寲
+  const handleSelectionChange = selection => {
+    selectedRows.value = selection;
+  };
+
+  // 涓�閿姤宸ワ細鍕鹃�夋暟鎹悗锛岀敓浜у悎鏍兼暟閲忛粯璁ょ瓑浜庡緟鐢熶骇鏁伴噺锛岀洿鎺ユ彁浜�
+  const handleBatchReport = async () => {
+    if (selectedRows.value.length === 0) {
+      proxy.$modal.msgWarning("璇峰厛鍕鹃�夎鎶ュ伐鐨勫伐鍗�");
+      return;
+    }
+
+    // 杩囨护鍑哄彲鎶ュ伐鐨勫伐鍗曪細鏈畬宸ヤ笖寰呯敓浜ф暟閲� > 0
+    const validRows = selectedRows.value.filter(row => {
+      if (row.endOrder) return false;
+      const planQuantity = Number(row.planQuantity || 0);
+      const completeQuantity = Number(row.completeQuantity || 0);
+      return toQuantity(planQuantity - completeQuantity) > 0;
+    });
+
+    if (validRows.length === 0) {
+      proxy.$modal.msgWarning("鎵�閫夊伐鍗曞潎鏃犲緟鐢熶骇鏁伴噺锛屾棤娉曟姤宸�");
+      return;
+    }
+
+    const buildSubmitParams = (row, quantity) => ({
+      quantity,
+      scrapQty: 0,
+      userId: 329,
+      userName: "瀛欑珛鏉�",
+      productionOperationTaskId: row.id,
+      productProcessRouteItemId: row.productProcessRouteItemId,
+      reportWork: row.reportWork,
+      productMainId: row.productMainId,
+      productionOrderRoutingOperationId: row.productionOrderRoutingOperationId,
+      productionOrderId: row.productionOrderId,
+      workHour: row.type == 0 ? row.workHour || 0 : 0,
+      productionOperationParamList: [],
+    });
+
+    // 寰呯敓浜ф暟閲忚秴杩囦竴涓囨椂锛屾瘡娆″彧鎶� 5000锛屾媶鍒嗘垚澶氱瑪鎻愪氦
+    const tasks = [];
+    validRows.forEach(row => {
+      const planQuantity = Number(row.planQuantity || 0);
+      const completeQuantity = Number(row.completeQuantity || 0);
+      let remaining = Math.max(0, toQuantity(planQuantity - completeQuantity));
+      while (remaining > 10000) {
+        tasks.push(buildSubmitParams(row, 5000));
+        remaining = toQuantity(remaining - 5000);
+      }
+      if (remaining > 0) {
+        tasks.push(buildSubmitParams(row, remaining));
+      }
+    });
+
+    const results = await Promise.allSettled(
+      tasks.map(params => addProductMain(params))
+    );
+
+    const successCount = results.filter(r => r.status === "fulfilled").length;
+    const failCount = results.filter(r => r.status === "rejected").length;
+
+    if (failCount === 0) {
+      proxy.$modal.msgSuccess(`涓�閿姤宸ユ垚鍔燂紝鍏� ${successCount} 绗擿);
+    } else {
+      proxy.$modal.msgWarning(
+        `涓�閿姤宸ュ畬鎴愶細鎴愬姛 ${successCount} 绗旓紝澶辫触 ${failCount} 绗擿
+      );
+    }
+    selectedRows.value = [];
+    getList();
   };
 
   const getDictOptions = async dictType => {
@@ -797,6 +950,7 @@
   };
 
   onMounted(() => {
+    userStore.getInfo();
     getList();
     // 鑾峰彇鐢ㄦ埛鍒楄〃
     userListNoPageByTenantId().then(res => {

--
Gitblit v1.9.3