From c9eedafa547edcfc3f488c6ac10363a549d24229 Mon Sep 17 00:00:00 2001
From: lynn <lynnlinyong@qq.com>
Date: Wed, 30 Apr 2025 14:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BF=90=E7=BB=B4=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/maintenance/maintenance_rules.vue | 43 +++++++++++++++------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/views/maintenance/maintenance_rules.vue b/src/views/maintenance/maintenance_rules.vue
index 65d6f5b..6f1fd52 100644
--- a/src/views/maintenance/maintenance_rules.vue
+++ b/src/views/maintenance/maintenance_rules.vue
@@ -116,10 +116,10 @@
             <Option v-for="item in warehouseTypes" :key="item.id" :value="item.id">{{ item.name }}</Option>
           </Select>
           <Select v-model="select.area" @on-change="getWarehouseNames" style="width: 120px; margin-right: 10px;" clearable placeholder="所在区域">
-            <Option v-for="item in warehouseAreas" :key="item.id" :value="item.id">{{ item.value }}</Option>
+            <Option v-for="item in warehouseAreas" :key="item.id" :value="item.value">{{ item.value }}</Option>
           </Select>
           <Select v-model="associateWarehouseName" style="width: 120px; margin-right: 10px;" clearable placeholder="仓库名称">
-            <Option v-for="warehouse in warehouseNames" :key="warehouse.value" :value="warehouse.value">{{ warehouse.label }}</Option>
+            <Option v-for="warehouse in warehouseNames" :key="warehouse.value" :value="warehouse.label">{{ warehouse.label }}</Option>
           </Select>
           <Button type="primary" @click="searchMaterialsPost">搜索</Button>
           <Button style="margin-left: 8px;" @click="resetAssociateSearch">重置</Button>
@@ -471,18 +471,19 @@ export default {
           page: this.associateCurrentPage,
           'show_relation[0]': 'equipmentMaintainConfig',
           'show_relation[1]': 'materialInfo.materialstorage',
-          'filter[0][key]': 'xianwuzimingcheng',
+          
+          'materialstorages_cangkumingcheng': this.associateWarehouseName ? this.associateWarehouseName : '',
+          'materialstorages_suozaiquyu': this.select.area ? this.select.area : '',
+          'storehouses_id': this.select.storehouses_id ? this.select.storehouses_id : '',
+
+          'filter[0][key]': 'zichanmingcheng',
           'filter[0][op]': 'like',
           'filter[0][value]': this.associateSearch ? this.associateSearch : '',
-          'filter[1][key]': 'guanliancangku',
+
+
+          'filter[1][key]': 'wuzileixing',
           'filter[1][op]': 'eq',
-          'filter[1][value]': this.associateWarehouseName ? this.associateWarehouseName : '',
-          'filter[2][key]': 'quyu_id',
-          'filter[2][op]': 'eq',
-          'filter[2][value]': this.select.area ? this.select.area : '',
-          'filter[3][key]': 'wuzileixing',
-          'filter[3][op]': 'eq',
-          'filter[3][value]': '一类一码'
+          'filter[1][value]': '一类一码'
         };
         const res = await request({
           url: '/api/admin/stocks-item/index',
@@ -560,6 +561,7 @@ export default {
       this.associateSearch = '';
       this.select.storehouses_id = '';
       this.select.area = '';
+      this.associateWarehouseName = '';
       this.associateCurrentPage = 1;
       this.searchMaterialsPost();
     },
@@ -759,4 +761,23 @@ export default {
   align-items: center;
   margin-top: 15px;
 }
+/* 确保加载提示显示在模态框之上 */
+.ivu-message {
+  z-index: 9999 !important;
+}
+.ivu-loading-mask {
+  z-index: 9999 !important;
+}
+.ivu-message-notice {
+  z-index: 9999 !important;
+}
+.ivu-message-notice-content {
+  z-index: 9999 !important;
+}
+.ivu-modal-mask {
+  z-index: 1000 !important;
+}
+.ivu-modal-wrap {
+  z-index: 1000 !important;
+}
 </style>