safecheck-client 3.0.33-gongyi → 3.0.35-gongyi-1

package/src/components/defect/DefectPaperWeiXiu.vue

@@ -10,7 +10,7 @@
                      @click="$parent.$parent.showChooser"
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style" v-show="false">
               <label class="font_normal_body">存在隐患</label>
               <v-select style="width:60% "
                         class="select select_list"
@@ -119,8 +119,78 @@
                 condition="f_offsite_time <= '{} 23:59:59'">
               </datepicker>
             </div>
-
-
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐&ensp;患&ensp;项</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectLeave"
+                        v-model="$parent.$parent.defectLeave"
+                        :options='$parent.$parent.defectLeaveList'
+                        placeholder='隐患项'
+                        value-single
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患内容</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectType"
+                        v-model="$parent.$parent.defectType"
+                        :options='$parent.$parent.getdefectType'
+                        placeholder='隐患内容'
+                        :multiple="true">
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用户类型</label>
+              <v-select id="f_usertype"
+                        placeholder='用户类型'
+                        class="select select_list"
+                        :value.sync="model.f_usertype"
+                        :value-single="true"
+                        :options='$parent.$parent.usertypes'
+                        v-model="model.f_usertype"
+                        condition="f_user_type='{}'"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">气表类型</label>
+              <v-select class="select_list select"
+                        placeholder='气表类型' style="width: 60%"
+                        :value.sync="model.meter_classify" v-model="model.meter_classify"
+                        :options='$parent.$parent.meter_classifys'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="F_METER_CLASSIFY='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">安装位置</label>
+              <v-select class="select_list select"
+                        placeholder='安装位置' style="width: 60%"
+                        :value.sync="model.f_position" v-model="model.f_position"
+                        :options='$parent.$parent.positions'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_position='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">房屋类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_house_type" v-model="model.f_house_type"
+                        :options='$parent.$parent.housetype'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_house_type='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
           <div class="row" v-if="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style">
@@ -129,7 +199,7 @@
                      @click="$parent.$parent.showChooser"
                      style="width: 60%" placeholder="安检计划" readonly="readonly">
             </div>
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style"  v-show="false">
               <label class="font_normal_body">存在隐患</label>
               <v-select style="width:60% "
                         class="select select_list"
@@ -244,7 +314,29 @@
                 condition="f_offsite_time <= '{} 23:59:59'">
               </datepicker>
             </div>
-
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐&ensp;患&ensp;项</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectLeave"
+                        v-model="$parent.$parent.defectLeave"
+                        :options='$parent.$parent.defectLeaveList'
+                        placeholder='隐患项'
+                        value-single
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患内容</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectType"
+                        v-model="$parent.$parent.defectType"
+                        :options='$parent.$parent.getdefectType'
+                        placeholder='隐患内容'
+                        :multiple="true">
+              </v-select>
+            </div>
 
           </div>
         </div>
@@ -261,8 +353,10 @@
             <th><nobr>安检时间</nobr></th>
             <th><nobr>安检员</nobr></th>
             <th><nobr>计划名</nobr></th>
-            <th><nobr>是否有隐患</nobr></th>
-            <th><nobr>隐患数</nobr></th>
+            <!--<th><nobr>是否有隐患</nobr></th>-->
+            <th><nobr>隐患总数</nobr></th>
+            <th><nobr>已处理数</nobr></th>
+            <th><nobr>未处理数</nobr></th>
 <!--            <th><nobr>整改数</nobr></th>-->
 
           </tr>
@@ -277,8 +371,10 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_offsite_time}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_checker_name}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_plan_name}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_has_defect}}</td>
+          <!--<td style="text-align: center;white-space:nowrap;">{{row.f_has_defect}}</td>-->
           <td style="text-align: center;white-space:nowrap;">{{row.f_defect_count}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.remainder}}</td>
 <!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>-->
 
         </template>
@@ -327,6 +423,10 @@
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
       model.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
       return {
+        housetype: [],//房屋类型
+        positions: [],//安装位置
+        meter_classifys:[],//气表类型
+        usertypes: this.usertypes(),//用户类型
         repaired:[{label: '未修', value: '未修'}, {label: '已修', value: '已修'}],
         hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {label: '无隐患', value: '无隐患'}],
         f: this.$login.f,
@@ -343,8 +443,11 @@
         cbc:[],
         cbcs:[],
         thead: '',
-        headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患情况'],
-        bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content']
+        defectLeave:'',
+        defectType:'',
+        defectLeaveList:[],
+        headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','隐患总数','已处理数','未处理数','隐患数','隐患情况'],
+        bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_defect_count','f_repair_count','remainder','f_defect_count','f_defect_content']
       }
     },
     props:{
@@ -361,6 +464,28 @@
     },
 
     methods: {
+      setConList(){
+
+        this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+
+        this.positions=this.$appdata.getParam('安装位置') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('安装位置')] : [{label: '全部', value: ''}]
+        this.housetype=this.$appdata.getParam('房屋类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('房屋类型')] : [{label: '全部', value: ''}]
+      },
+      usertypes () {
+        return this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+      },
       getmeterbook(val){
         this.cbc=[]
         this.cbc.push({
@@ -451,6 +576,22 @@
         this.criteriaShow = !this.criteriaShow
       },
       search(args) {
+        if(this.defectLeave && (this.defectType.length==0 || !this.defectType.length)){
+          this.$showMessage("选择隐患项后,必须选择隐患内容！")
+          return
+        }
+        if(this.defectType.length>0){
+          args.condition += ` and (`
+          for(let sqlstr=0;sqlstr<this.defectType.length;sqlstr++){
+            console.log(sqlstr)
+            console.log(this.defectType[sqlstr])
+            args.condition += ` f_defect_content like '%${this.defectType[sqlstr]}%'`
+            if(sqlstr<this.defectType.length-1){
+              args.condition +=' or'
+            }
+          }
+          args.condition += ` )`
+        }
         if (this.f_check_plan.f_plan_name) {
           args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
         }
@@ -476,12 +617,18 @@
       }
     },
     ready() {
+      this.setConList()
       this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
+      this.defectLeaveList=[{label:'全部',value:''}, ...this.$appdata.getParam('安检隐患项')]
       let gen = select(this)
       // this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
     },
     computed: {
+      getdefectType(){
+        this.defectType=[]
+        return [... this.$appdata.getParam(`安检项-${this.defectLeave}`)]
+      },
       selected() {
         return this.$refs.paged.$refs.grid.selected
       },