From b430f8f2759129e86034d13bb7f4582fbfe708a1 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 01 七月 2025 18:07:45 +0800
Subject: [PATCH] 修改文档管理 开发设备管理模块

---
 src/views/warehouseManagement/index.vue |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 8b73507..a110ae1 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -1,18 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :inline="true" :model="queryParams" class="search-form">
-      <el-form-item label="渚涘簲鍟嗗悕绉�">
+      <el-form-item label="鎼滅储">
         <el-input
-            v-model="queryParams.supplierName"
-            placeholder="璇疯緭鍏�"
-            clearable
-            :style="{ width: '100%' }"
-        />
-      </el-form-item>
-      <el-form-item label="鐓ょ">
-        <el-input
-            v-model="queryParams.coal"
-            placeholder="璇疯緭鍏�"
+            v-model="queryParams.searchAll"
+            placeholder="璇疯緭鍏ュ叧閿瓧"
             clearable
             :style="{ width: '100%' }"
         />
@@ -39,7 +31,7 @@
       <!-- 鎿嶄綔鎸夐挳鍖� -->
       <el-space>
 <!--        <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>-->
-        <el-button type="info" plain :icon="Download">瀵煎嚭</el-button>
+        <!-- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button>  -->
         <el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows('merge')">鍚堝苟</el-button>
       </el-space>
       <div>
@@ -134,8 +126,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="鐓よ川鏂规" prop="qualityPlan">
-              <el-select v-model="form.qualityPlan" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
+            <el-form-item label="鐓よ川鏂规" prop="coalPlanId">
+              <el-select v-model="form.coalPlanId" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
                 <el-option
                     v-for="dict in qualityPlanOption"
                     :key="dict.id"
@@ -217,6 +209,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="鐓よ川鏂规" prop="coalPlanId">
+              <el-select v-model="mergeForm.coalPlanId" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
+                <el-option
+                    v-for="dict in qualityPlanOption"
+                    :key="dict.id"
+                    :label="dict.plan"
+                    :value="dict.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12" v-for="item in filteredList" :key="item.id">
@@ -279,7 +285,7 @@
     totalPriceIncludingTax: '',
     priceExcludingTax: '',
     totalPriceExcludingTax: '',
-    qualityPlan: '',
+    coalPlanId: '',
     pId: '',
   },
   mergeForm: {
@@ -291,20 +297,20 @@
     totalPriceIncludingTax: '',
     priceExcludingTax: '',
     totalPriceExcludingTax: '',
-    qualityPlan: '',
+    coalPlanId: '',
     pId: '',
   },
   rules: {
     supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
-    qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
   },
   mergeRules: {
     supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
-    qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
   }
 })
 
@@ -319,8 +325,7 @@
 ]);
 // 鏌ヨ鍙傛暟
 const queryParams = reactive({
-  supplierName: "",
-  coal: "",
+  searchAll: "",
 })
 const columnTitle = ref([])
 const supplyList = ref([]);

--
Gitblit v1.9.3