YaolongHan 4 роки тому
батько
коміт
1cf9e8a734
2 змінених файлів з 40 додано та 7 видалено
  1. 19 2
      src/views/equipment/table/rcwxTable.vue
  2. 21 5
      src/views/room/index.vue

+ 19 - 2
src/views/equipment/table/rcwxTable.vue

@@ -3,7 +3,7 @@
   <div class="rcwx-list">
     <div class="eq-list-top">
       <el-input
-        placeholder="搜索设备名称编号"
+        placeholder="搜索设备名称或内码"
         size="small"
         @keyup.enter.native="getList"
         @blur="getList"
@@ -12,6 +12,16 @@
         v-model="sbjc"
         style="width:192px;margin-right:12px"
       ></el-input>
+       <el-input
+        placeholder="搜索位置名称或内码"
+        size="small"
+        @keyup.enter.native="getList"
+        @blur="getList"
+        clearable
+        prefix-icon="el-icon-search"
+        v-model="wzjc"
+        style="width:192px;margin-right:12px"
+      ></el-input>
       <el-input
         placeholder="搜索描述"
         size="small"
@@ -194,6 +204,7 @@ export default {
       reportdate: "",
       sjjssj: "",
       sbjc: "",
+      wzjc:"",
       matters: "",
       wonum2: "",
       wonum: "",
@@ -268,16 +279,22 @@ export default {
                 getParams.data.wotjyssjEndDate = this.real[1] + '000000'
             }
             if (this.source && this.source != '全部') {
-                getParams.data.bxfwlymc = this.source
+                getParams.data.bxfwlymc = this.source;
+                 getParams.data.bxfwly = this.source
+
             }
              if (this.status && this.status != '全部') {
                 getParams.data.status = this.status
             }
             //输入框搜索
             getParams.data.keyword = ''
+
             if (this.sbjc) {
                 getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
             }
+            if (this.wzjc) {
+                getParams.data.keyword += `${this.wzjc}:wzjc,location;`
+            }
             if (this.matters) {
                 getParams.data.keyword += `${this.matters}:description;`
             }

+ 21 - 5
src/views/room/index.vue

@@ -300,7 +300,7 @@
           <el-tab-pane label="核心设备日常维修" name="4">
             <div class="compute-center">
               <el-input
-                placeholder="搜索设备名称编号"
+                placeholder="搜索设备名称或内码"
                 size="small"
                 @keyup.enter.native="Index3"
                 @blur="Index3"
@@ -309,6 +309,17 @@
                 v-model="sbjc"
                 style="width:192px;margin-right:12px"
               ></el-input>
+                <el-input
+                placeholder="搜索位置名称或内码"
+                size="small"
+                @keyup.enter.native="Index3"
+                @blur="Index3"
+                clearable
+                prefix-icon="el-icon-search"
+                v-model="wzjc"
+                style="width:192px;margin-right:12px"
+              ></el-input>
+
               <el-input
                 placeholder="搜索描述"
                 size="small"
@@ -541,6 +552,7 @@ export default {
       sjjssj: "",
       real: "",
       statue: "全部",
+      wzjc:'',
       statusOption: []
     };
   },
@@ -750,7 +762,8 @@ export default {
         getParams.data.wotjyssjEndDate = this.real[1] + "000000";
       }
       if (this.source && this.source != "全部") {
-        getParams.data.bxfwlymc = this.source;
+        // getParams.data.bxfwlymc = this.source;
+        getParams.data.bxfwly = this.source
       }
       if (this.statue && this.statue != "全部") {
         getParams.data.status = this.statue;
@@ -758,9 +771,12 @@ export default {
 
       //输入框搜索
       getParams.data.keyword = "";
-      if (this.sbjc) {
-        getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`;
-      }
+        if (this.sbjc) {
+                getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
+            }
+            if (this.wzjc) {
+                getParams.data.keyword += `${this.wzjc}:wzjc,location;`
+            }
       if (this.matters) {
         getParams.data.keyword += `${this.matters}:description;`;
       }