YaolongHan 4 years ago
parent
commit
36faff5688
2 changed files with 52 additions and 17 deletions
  1. 30 0
      src/views/equipment/table/rcwxTable.vue
  2. 22 17
      src/views/room/index.vue

+ 30 - 0
src/views/equipment/table/rcwxTable.vue

@@ -270,6 +270,9 @@ export default {
             if (this.source && this.source != '全部') {
                 getParams.data.bxfwlymc = this.source
             }
+             if (this.status && this.status != '全部') {
+                getParams.data.status = this.status
+            }
             //输入框搜索
             getParams.data.keyword = ''
             if (this.sbjc) {
@@ -379,6 +382,33 @@ export default {
                     })
                 })
             })
+                  // 2任务状态
+      let postParams2 = [
+        {
+          columnName: { status: "status" },
+          params: {
+            smsxt: this.smsxt
+          },
+          tableName: "sms_wxzy" //视图名称
+        }
+      ];
+      querySelect({ data, postParams: postParams2 }).then(res => {
+        let bxfwlymc =
+          res.data && res.data.data && res.data.data.sms_wxzy
+            ? res.data.data.sms_wxzy.status
+            : [];
+        this.statusOption = [];
+        this.statusOption.push({
+          name: "全部",
+          id: "全部"
+        });
+        bxfwlymc.forEach(el => {
+          this.statusOption.push({
+            name: el.value,
+            id: el.key
+          });
+        });
+      });
         },
   },
   watch: {

+ 22 - 17
src/views/room/index.vue

@@ -329,15 +329,15 @@
                 v-model="wonum2"
                 style="width:192px;margin-right:12px"
               ></el-input>
-                 <Select
-        @change="Index3"
-        style="margin-right:12px;"
-        v-model="statue"
-        width="180"
-        tipPlace="top"
-        caption="任务状态描述:"
-        :selectdata="statusOption"
-      ></Select>
+              <Select
+                @change="Index3"
+                style="margin-right:12px;"
+                v-model="statue"
+                width="180"
+                tipPlace="top"
+                caption="任务状态描述:"
+                :selectdata="statusOption"
+              ></Select>
               <Select
                 @change="Index3"
                 style="margin-right:12px;"
@@ -345,7 +345,7 @@
                 width="180"
                 tipPlace="top"
                 caption="报修来源:"
-                :selectdata="allArr"
+                :selectdata="sourceOption"
               ></Select>
               <el-input
                 placeholder="搜索执行人"
@@ -540,8 +540,8 @@ export default {
       },
       sjjssj: "",
       real: "",
-      statue:'全部',
-      statusOption:[]
+      statue: "全部",
+      statusOption: []
     };
   },
   components: {
@@ -567,6 +567,7 @@ export default {
       } else if (tab.label == "核心设备日常维修") {
         this.Index3();
         this.$refs.roomTable4.computedHeight();
+        this.changeSelect();
       } else if (tab.label == "核心设备日常维保") {
         this.Index4();
         this.changeSelect();
@@ -751,6 +752,10 @@ export default {
       if (this.source && this.source != "全部") {
         getParams.data.bxfwlymc = this.source;
       }
+      if (this.statue && this.statue != "全部") {
+        getParams.data.status = this.statue;
+      }
+
       //输入框搜索
       getParams.data.keyword = "";
       if (this.sbjc) {
@@ -869,20 +874,20 @@ export default {
     },
     // 下拉框数据
     changeSelect() {
-        // 1保修来源
+      // 1保修来源
       let postParams = [
         {
           columnName: { bxfwly: "bxfwlymc" },
           params: {
-            smsxt: this.smsxt
+            smsxt: this.smsxtArr.smsxt
           },
           tableName: "sms_wxzy" //视图名称
         }
       ];
       let data = {
-        plazaId: this.$store.state.plazaId
+        plazaId: this.plazaId
       };
-      if (this.smsxt != "1008") {
+      if (this.smsxtArr.smsxt != "1008") {
         data.onlyMainAsset = true;
       }
       querySelect({ data, postParams }).then(res => {
@@ -908,7 +913,7 @@ export default {
         {
           columnName: { status: "status" },
           params: {
-            smsxt: this.smsxt
+            smsxt: this.smsxtArr.smsxt
           },
           tableName: "sms_wxzy" //视图名称
         }