safecheck-client 3.0.30-84 → 3.0.30-86

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

@@ -336,6 +336,51 @@
                       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
@@ -446,6 +491,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:[],//用气类型
@@ -475,9 +523,28 @@
       this.getCheckBook()
       this.setConList()
       this.loadpage()
-
+      this.getCommunity()
     },
     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`, {

package/src/filiale/fugou/pc.js

@@ -1,17 +1,17 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  // 安检汇总-列表
-  'paper-main': (resolve) => { require(['./pc/PaperList'], 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
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  // 安检汇总-列表
+  'paper-main': (resolve) => { require(['./pc/PaperList'], 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
+
+
+
+