From 0365c235877b5d09b3f02423681417da0a4a8b81 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 16 四月 2026 17:54:53 +0800
Subject: [PATCH] Merge branch 'dev_天津_君歌化工' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_君歌化工

---
 src/views/productionManagement/productionProcess/index.vue |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index ebc50a4..a6c9c2f 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -3,13 +3,33 @@
     <div class="search_form">
       <el-form :model="searchForm"
                :inline="true">
-        <el-form-item label="閮ㄤ欢:">
+        <el-form-item label="浜у搧鍚嶇О:">
           <el-input v-model="searchForm.name"
-                    placeholder="璇疯緭鍏�"
+                    placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
                     clearable
                     prefix-icon="Search"
                     style="width: 200px;"
                     @change="handleQuery" />
+        </el-form-item>
+        <el-form-item label="閮ㄤ欢绫诲瀷:">
+          <el-select v-model="searchForm.type"
+                     placeholder="璇烽�夋嫨"
+                     clearable
+                     style="width: 200px;"
+                     @change="handleQuery">
+            <el-option label="鍔犲伐"
+                       :value="1" />
+            <el-option label="鍒澘鍐疯姱鍒朵綔"
+                       :value="2" />
+            <el-option label="绠¤矾缁勫"
+                       :value="3" />
+            <el-option label="缃愪綋杩炴帴鍙婅皟璇�"
+                       :value="4" />
+            <el-option label="娴嬭瘯鎵撳帇"
+                       :value="5" />
+            <el-option label="鍏朵粬"
+                       :value="6" />
+          </el-select>
         </el-form-item>
         <el-form-item label="閮ㄤ欢缂栧彿:">
           <el-input v-model="searchForm.no"
@@ -60,7 +80,10 @@
                   title="瀵煎叆閮ㄤ欢"
                   :action="importAction"
                   :headers="importHeaders"
+                  :loading="importLoading"
+                  :disabled="importLoading"
                   :auto-upload="false"
+                  :on-progress="handleImportProgress"
                   :on-success="handleImportSuccess"
                   :on-error="handleImportError"
                   @confirm="handleImportConfirm"
@@ -85,26 +108,36 @@
   const data = reactive({
     searchForm: {
       name: "",
+      type: undefined,
       no: "",
     },
   });
   const { searchForm } = toRefs(data);
   const tableColumn = ref([
+
+    {
+      label: "浜у搧鍚嶇О",
+      prop: "name",
+    },
+    {
+      label: "浜у搧瑙勬牸",
+      prop: "productModel",
+    },
     {
       label: "閮ㄤ欢缂栧彿",
       prop: "no",
-    },
-    {
-      label: "閮ㄤ欢",
-      prop: "name",
     },
     {
       label: "閮ㄤ欢绫诲瀷",
       prop: "typeText",
     },
     {
-      label: "宸ヨ祫瀹氶",
+      label: "璁″垝宸ユ椂(灏忔椂)",
       prop: "salaryQuota",
+    },
+    {
+      label: "璁″垝浜哄憳",
+      prop: "plannerName",
     },
     {
       label: "鏄惁璐ㄦ",
@@ -145,6 +178,7 @@
   const isShowEditModal = ref(false);
   const record = ref({});
   const importDialogVisible = ref(false);
+  const importLoading = ref(false);
   const importDialogRef = ref(null);
   const page = reactive({
     current: 1,
@@ -152,6 +186,7 @@
     total: 0,
   });
   const { proxy } = getCurrentInstance();
+
 
   // 瀵煎叆鐩稿叧閰嶇疆
   const importAction =
@@ -251,8 +286,14 @@
     }
   };
 
+  // 瀵煎叆涓�
+  const handleImportProgress = () => {
+    importLoading.value = true;
+  };
+
   // 瀵煎叆鎴愬姛
   const handleImportSuccess = response => {
+    importLoading.value = false;
     if (response.code === 200) {
       proxy.$modal.msgSuccess("瀵煎叆鎴愬姛");
       importDialogVisible.value = false;
@@ -267,11 +308,13 @@
 
   // 瀵煎叆澶辫触
   const handleImportError = error => {
+    importLoading.value = false;
     proxy.$modal.msgError("瀵煎叆澶辫触锛�" + (error.message || "鏈煡閿欒"));
   };
 
   // 鍏抽棴瀵煎叆寮圭獥
   const handleImportClose = () => {
+    importLoading.value = false;
     if (importDialogRef.value) {
       importDialogRef.value.clearFiles();
     }

--
Gitblit v1.9.3