safecheck-client 4.0.1-80 → 4.0.1-81

package/src/components/android/AndroidDefectDeal.vue

@@ -178,6 +178,17 @@
                         v-model="model.f_user_type" condition="f_user_type = '{}'" close-on-select
                         clear-button></v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_user_type" class="font text-left">隐患名称：</label>
+              </div>
+              <v-select id="f_user_type" :value.sync="model.f_item_name" class="input-font"
+                        :width="'60%'"
+                        :options='$parent.$parent.DefectConfigs' placeholder='请选择隐患名称'
+                        v-model="model.f_item_name" condition="f_item_name = '{}'" close-on-select
+                        clear-button></v-select>
+            </div>
             <div class="row text-center" style="margin-top: 20px;">
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
                       @click="$parent.$parent.selfSearch">查询
@@ -394,6 +405,7 @@ export default {
       showModal: false,
       showModal1: false,
       showimg: '',
+      DefectConfigs:[],
       deal: {
         result: {},
         f_deal_path: '',
@@ -426,8 +438,24 @@ export default {
   },
   ready() {
     this.selfSearch()
+    this.getDefectOption()
   },
   methods: {
+    async getDefectOption() {
+      let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
+        data: {
+          items: "di.f_item_name",
+          tablename: "t_paper_devices pd left join t_devices_items di on pd.id = di.f_device_id",
+          groupitem: "di.f_item_name",
+          condition: `di.f_is_defect = 'true' and di.f_is_repaired is null`
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      const DefectConfigs = [{label: '全部', value: ''}]
+      res.data.forEach((item) => {
+        DefectConfigs.push({label: item.f_item_name, value: item.f_item_name})
+      })
+      this.DefectConfigs = DefectConfigs
+    },
     showmateria(row){
       debugger
       this.selectdata = {
@@ -654,6 +682,11 @@ export default {
           condition += " and f_user_type = '" + this.$refs.paged.$refs.cri.model.f_user_type + "'"
         }
       }
+      if (this.$refs.paged.$refs.cri.model.f_item_name) {
+        if (this.$refs.paged.$refs.cri.model.f_item_name.toString().trim()) {
+          condition += " and f_item_name = '" + this.$refs.paged.$refs.cri.model.f_item_name + "'"
+        }
+      }
 
       //tag
       this.model.search(condition)