safecheck-client 3.0.30-81 → 3.0.30-83

package/src/filiale/fugou/pc/PaperList.vue

@@ -288,6 +288,30 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户标签</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_user_tags" v-model="model.f_user_tags"
+                          :options='$parent.$parent.userTags'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_user_tags='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用气类型</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_user_gas_type" v-model="model.f_user_gas_type"
+                          :options='$parent.$parent.userGasType'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_user_gas_type='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -519,6 +543,8 @@ export default {
       },
       fun: this.$login.f,
       pcds: [],
+      userTags:[{label: '全部', value: ''},...this.$appdata.getParam('安检用户标签')],
+      userGasType:[{label: '全部', value: ''},...this.$appdata.getParam('安检用户用气类型')],
       checkersid: [],
       approveds: this.$appdata.getParam('安检审核状态') ? [{
         label: '全部',

package/src/filiale/fugou/pc/checkUserList.vue

@@ -51,6 +51,51 @@
               </div>
               <div slot="modal-body" class="modal-body">
                 <div class="row">
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">用户类型:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_user_type"
+                      v-model="model.f_user_type"
+                      :options='$parent.$parent.userTypes'
+                      placeholder='请选择'
+                      condition="uf.f_user_type='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">用户标签:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_user_tags"
+                      v-model="model.f_user_tags"
+                      :options='$parent.$parent.userTags'
+                      placeholder='请选择'
+                      condition="ui.f_user_tags='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">用气类型:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_user_gas_type"
+                      v-model="model.f_user_gas_type"
+                      :options='$parent.$parent.userGasType'
+                      placeholder='请选择'
+                      condition="ui.f_user_gas_type='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">用户类型:</label>
                     <v-select
@@ -111,7 +156,6 @@
                     >
                     </v-select>
                   </div>
-
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -292,51 +336,6 @@
                       condition="ui.f_uservent_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">行政村/片区:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_community_name"
-                      v-model="model.f_community_name"
-                      :options='$parent.$parent.community'
-                      placeholder='请选择'
-                      condition="area.f_community='{}'"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">用户标签:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_user_tags"
-                      v-model="model.f_user_tags"
-                      :options='$parent.$parent.user_tags'
-                      placeholder='请选择'
-                      condition="ui.f_user_tags='{}'"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">用气类型:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_user_gas_type"
-                      v-model="model.f_user_gas_type"
-                      :options='$parent.$parent.user_gas_types'
-                      placeholder='请选择'
-                      condition="ui.f_user_gas_type='{}'"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">入户情况:</label>
                     <v-select
@@ -427,6 +426,7 @@
 
 <script>
   import {HttpResetClass, PagedList} from "vue-client";
+  import * as Util from "../../Util";
   import Vue from "vue";
 
   export default {
@@ -446,10 +446,9 @@
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,
         userTypes:[],//用户类型
-        community:[],
-        user_tags:this.$appdata.getParam('用户标签')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户标签')]:[{label: '全部', value: ''}],
-        user_gas_types:this.$appdata.getParam('用气类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]:[{label: '全部', value: ''}],
+        userTags:[],
         userStates:[],//用户状态
+        userGasType:[],//用气类型
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
@@ -474,32 +473,11 @@
       // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
       //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
       this.getCheckBook()
-      this.getCommunity()
-
       this.setConList()
       this.loadpage()
 
     },
     methods: {
-      getCommunity(){
-        this.community=[]
-        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: '*',
-            tablename: 't_community',
-            condition: `f_filialeid  = '${this.userlogin.orgid}'`,
-            orderitem: 'id desc'
-          }
-        }, {resolveMsg: null, rejectMsg: null}).then(res => {
-          this.community.push({label: '全部', value: ''})
-          res.data.forEach(ress => {
-            this.community.push({
-              label: ress.f_community_name,
-              value: ress.f_community_name
-            })
-          })
-        })
-      },
       getCheckBook(){
         this.checkBooks=[]
         new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
@@ -591,7 +569,8 @@
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
-
+        this.userTags=this.$appdata.getParam('安检用户标签') ? [...this.$appdata.getParam('安检用户标签')] : []
+        this.userGasType=this.$appdata.getParam('安检用户用气类型') ? [...this.$appdata.getParam('安检用户用气类型')] : []
         this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',

package/src/filiale/fugou/pc.js

@@ -5,7 +5,10 @@ import Vue from "vue";
 let specialComp = {
   // 安检汇总-列表
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) }
+  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'safe-defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
+  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
+  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
 }
 exports.specialComp = specialComp