safecheck-client 3.0.33-16 → 3.0.33-161

package/src/filiale/fugou/android.js

@@ -3,7 +3,8 @@ import Vue from "vue";
 
 // 手机特殊目录注册到该文件中
 let specialComp = {
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) }
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) }
 }
 
 exports.specialComp = specialComp

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

@@ -3,17 +3,17 @@
     <div class="auto select-overspread">
       <validator name='v'>
         <ul class="nav nav-tabs">
-          <p class="bg-info text-center" style="padding: 8px;">添加到目标抄表册</p>
+          <p class="bg-info text-center" style="padding: 8px;">添加到目标安检册</p>
         </ul>
         <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;">
           <div class="row" style="text-align: center">
             <p class="text-center" style="padding: 8px;">共{{usernum?usernum:0}}位用户</p>
-            <div class="col-sm-12 form-group" :class="[$v.f_meter_book_num.required ? 'has-error' : '']">
-              <label class="font_normal_body" style="width: 26%;">目标抄表册</label>
-              <input type="text" v-model="model.f_meter_book_num" v-show="false"
-                     v-validate:f_meter_book_num='{required: true }'>
-              <v-select :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='meterbook' placeholder='安检册'
+            <div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
+              <label class="font_normal_body" style="width: 26%;">目标安检册</label>
+              <input type="text" v-model="model.f_check_book_num" v-show="false"
+                     v-validate:f_check_book_num='{required: true }'>
+              <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
+                        :options='checkbook' placeholder='安检册'
                         :value-single="true" :search="true"
                         style="width:60%"
                         close-on-select></v-select>
@@ -48,7 +48,7 @@ export default {
   data () {
     return {
       model: {
-        f_meter_book_num: '',
+        f_check_book_num: '',
         f_userinfo_code: '',
         f_user_state: '',
         f_operator: this.$login.f.name,
@@ -59,7 +59,7 @@ export default {
         f_depname: this.$login.f.deps,
         f_state: '有效'
       },
-      meterbook: [],
+      checkbook: [],
       f_orgid: ''
     }
   },
@@ -68,17 +68,16 @@ export default {
   async ready () {
     // await this.$LoadParams.loadMeterBook(this.f_filialeid)
     this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
-    this.close()
+    // this.close()
   },
   methods: {
     selectbook(val){
       console.log("val",val)
-      this.meterbook=val
-      this.meterbook.push({label: '移出表册', value: '0'})
-      console.log(" this.meterbook.push(val)", this.meterbook)
+      this.checkbook=val
+      console.log(" this.checkbook.push(val)", this.checkbook)
     },
     close () {
-      this.model.f_meter_book_num = ''
+      this.model.f_check_book_num = ''
       this.$dispatch('add-tobook-refresh')
     },
     confirm () {

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

@@ -218,6 +218,8 @@ export default {
     showdetails (row) {
       console.log('showdetails',row)
       this.rowData = row
+      this.rowData.f_check_book_type='用户'
+      this.rowData.f_user_type=''
       this.showItem = false
       this.showItemUser = true
     },

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

@@ -53,23 +53,19 @@
         this.refresh()
       },
       'add-tobook-confirm' (model) {
-        model.userfilesids = []
         this.rowsdata = this.$refs.mbpeople_list.$refs.paged.$refs.grid.getRowData()
         let msg = '确认将选中的用户全部移入表册？'
-        var alluser=[]
         if (this.rowsdata === null || this.rowsdata.length == 0) {
           this.$showAlert('请勾选用户！！', 'warning', 3000)
         } else {
           let userfilesids = []
           this.rowsdata.forEach((row) => {
-            userfilesids.push(row.f_userfiles_id + '')
+            userfilesids.push(row.f_userinfo_id + '')
           })
-          model.userfilesids = userfilesids
-          alluser = this.rowsdata
           // 变成可以直接使用的格式
           this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-revenue/logic/saveBookuser', {model: model,rowsdata: alluser}, {
+              this.$resetpost('rs/logic/updateCheckBook', {f_check_book_id: model.f_check_book_num,rowsdata: userfilesids}, {
                 resolveMsg: '保存成功',
                 rejectMsg: '保存失败！'
               }).then(() => {

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

@@ -117,7 +117,7 @@
               <nobr>创建人</nobr>
             </th>
             <th>
-              <nobr>小区/单位数量</nobr>
+              <nobr>用户数量</nobr>
             </th>
             <th>
               <nobr>已下发</nobr>
@@ -143,7 +143,7 @@
           <td  style="text-align: center;">{{ row.f_user_type }}</td>
           <td  style="text-align: center;">{{ row.f_create_date }}</td>
           <td  style="text-align: center;">{{ row.f_create_person }}</td>
-          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.f_user_type==='民用'?row.num2:row.num3}}</b></button></td>
+          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num2}}</b></button></td>
           <td  style="text-align: center;">{{ row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.yijian }}</td>

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

@@ -7,12 +7,12 @@
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">用户编号</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
+                     condition="f_userinfo_code like '%{}%'" placeholder='用户编号'>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">用户姓名</label>
               <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
-                     condition="f_user_name = '{}'" placeholder='用户姓名'>
+                     condition="f_user_name like '%{}%'" placeholder='用户姓名'>
             </div>
 
             <div class="form-group button-range" style="float: right">
@@ -43,21 +43,23 @@
                       condition="f_user_phone like '%{}%'" v-next-el='yhxm' style="width: 60%"
               >
             </div>
-            <div class="col-sm-2 form-group" title="参数名称：【用气类型】">
+            <div class="form-group col-sm-3" title="参数名称：【用气类型】">
               <label class="font_normal_body" >用气类型</label>
               <v-select :value.sync="model.f_user_gas_type"
                         v-model="model.f_user_gas_type"
+                        :multiple="true"
                         :options='$parent.$parent.usergastype' placeholder='请选择'
                         condition="f_user_gas_type in {}"
-                        close-on-select></v-select>
+                        ></v-select>
             </div>
-            <div class="col-sm-2 form-group" title="参数名称：【用户标签】">
+            <div class="form-group col-sm-3" title="参数名称：【用户标签】">
               <label class="font_normal_body" >用户标签</label>
               <v-select :value.sync="model.f_user_tags"
                         v-model="model.f_user_tags"
+                        :multiple="true"
                         :options='$parent.$parent.usertags' placeholder='请选择'
                         condition="f_user_tags in {}"
-                        close-on-select></v-select>
+                        ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">客户类型</label>
@@ -73,10 +75,10 @@
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">所属表册</label>
-              <v-select :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
+              <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
                         :options='$parent.$parent.meterbooks' placeholder='安检册'
                         :value-single="true"
-                        condition="f_meter_book_num='{}'"
+                        condition="f_check_book_name='{}'"
                         style="width:60%"
                         close-on-select></v-select>
             </div>
@@ -150,7 +152,7 @@
               <v-select :options='$parent.$parent.whether_list'
                         :value.sync="model.f_book_name"
                         v-model="model.f_book_name"
-                        close-on-select condition="f_book_name {}"
+                        close-on-select condition="f_check_book_name {}"
                         placeholder='是否在册' ></v-select>
             </div>
             <div class="col-sm-3 form-group">
@@ -194,6 +196,18 @@
                         close-on-select>
               </v-select>
             </div>
+            <div  class="col-sm-3 form-group">
+              <label class="font_normal_body">开户时间</label>
+              <datepicker
+                :value.sync="model.f_open_date"
+                placeholder='开户时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :select-month="true"
+                v-model='model.f_open_date'
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -216,7 +230,7 @@
           <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>
@@ -238,8 +252,8 @@
           <td>{{row.f_address}}</td>
           <td>{{row.f_meternumber}}</td>
           <td>{{row.f_table_state}}</td>
-          <td>{{row.f_book_name}}</td>
-          <td>{{row.f_meter_book_sort}}</td>
+          <td>{{row.f_check_book_name}}</td>
+<!--          <td>{{row.f_meter_book_sort}}</td>-->
           <!--          <td>{{row.f_adjustable_id}}</td>-->
           <td style="text-align:center">{{row.f_metertitles}}</td>
           <td style="text-align:center"><nobr>{{row.f_book_no}}</nobr></td>
@@ -272,7 +286,6 @@ let loadParamGem = async function (self) {
   await self.$LoadParams.loadParam()
   self.getfield = self.config.excelHeaders
   // self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
-  self.$refs.paged.$refs.cri.model.f_book_name = ['is null']
   await self.initAdjustables()
   // await self.search()
 }
@@ -294,7 +307,7 @@ export default {
       f_filialeid: this.$login.f.orgid,
       f_orgid: '',
       invoiceuse: [{label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
-      model: new PagedList('api/af-revenue/sql/mb_peopleList', 20),
+      model: new PagedList('rs/sql/mb_peopleList', 20),
       f_orgstr: this.$login.f.orgid,
       // 要操作的用户
       rowsdata: [],
@@ -312,7 +325,7 @@ export default {
       table_state: this.$appdata.getParam('气表状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')] : [],
       f_small_areas: this.$appdata.getParam('小区域') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('小区域')] : [],
       user_state: [{label: '正常', value: '正常'}, {label: '预备', value: '预备'}, {label: '销户', value: '销户'}],
-      whether_list: [{label: '已在册内', value: 'is not null'}, {label: '不在册内', value: 'is null'}],
+      whether_list: [{label: '全部', value: ''},{label: '已在册内', value: 'is not null'}, {label: '不在册内', value: 'is null'}],
       meterbrands: [],
       condition: '',
       adjustables: [],
@@ -335,6 +348,7 @@ export default {
   ready () {
     getAreaConfig(this)
     loadParamGem(this)
+    this.getmeterbook()
   },
   methods: {
     async meterbook(){
@@ -342,11 +356,11 @@ export default {
       if(this.f_orgid==''){
         this.f_orgid=this.$login.f.orgid
       }
-      let res=await this.$resetpost('api/af-revenue/sql/saleSingleTable',{data:{tablename:'t_meter_book',condition:` 1=1 and f_orgid=${this.f_orgid} and f_book_state='有效'`}},{resolveMsg:null,rejectMsg:null})
+      let res=await this.$resetpost('rs/sql/tel_singleTable_OrderBy',{data:{items:' * ',tablename:'t_check_book',condition:` 1=1 `,orderitem:' id desc'}},{resolveMsg:null,rejectMsg:null})
       for(let i=0;i<res.data.length;i++){
         console.log("res",res.data[i])
         let temp=[]
-        temp.label=res.data[i].f_book_name
+        temp.label=res.data[i].f_check_book_name
         temp.value=res.data[i].id
         this.meterbooks.push(temp)
       }
@@ -406,7 +420,7 @@ export default {
       })
       this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       //
-      // // 加载抄表册
+      // // 加载安检册
       // console.log("------------------this.$GetSaleParam.getMeterBooks()",this.$GetSaleParam.getMeterBooks())
       // this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
     },
@@ -418,6 +432,9 @@ export default {
       let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
       args.condition = `${args.condition} ` + f_orgstr
       // args.condition += ` and f_orgid = ${this.f_orgstr}`
+      if(args.model.f_open_date){
+        args.condition += ` and  f_open_date <='${args.model.f_open_date}' `
+      }
       this.condition = args.condition
       this.$parent.condition = this.condition
       this.model.search(args.condition, args.model)

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

@@ -4,36 +4,59 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="form-group col-sm-3" >
+            <div class="form-group col-sm-3">
               <label class="font_normal_body">客户编号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='客户编号'
                      condition="f_userinfo_code = '{}'" @keyup.enter="search()">
             </div>
-            <div class="form-group col-sm-2 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
+
+            </div>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search" style="margin-right: 10px" @click="$parent.$parent.delOfCheckBook()" v-el:cba>移出</button>
 
             </div>
           </div>
         </div>
       </criteria>
-      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
-        <template partial='head' >
+      <data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
           <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>用户编号</nobr></th>
-            <th><nobr>用户姓名</nobr></th>
-            <th><nobr>用户电话</nobr></th>
-            <th><nobr>用户地址</nobr></th>
+            <th>
+              <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
+            </th>
+            <th>
+              <nobr>序号</nobr>
+            </th>
+            <th>
+              <nobr>用户编号</nobr>
+            </th>
+            <th>
+              <nobr>用户姓名</nobr>
+            </th>
+            <th>
+              <nobr>用户电话</nobr>
+            </th>
+            <th>
+              <nobr>用户地址</nobr>
+            </th>
 
           </tr>
         </template>
-        <template partial='body' >
-          <tr >
-            <td style="text-align:center;">{{$index+1}}</td>
-             <td style="text-align:center">{{row.f_userinfo_code}}</td>
-            <td style="text-align:center">{{row.f_user_name}}</td>
-            <td style="text-align:center">{{row.f_user_phone}}</td>
-            <td style="text-align:center">{{row.f_address}}</td>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center">
+              <nobr><input type="checkbox" :checked="$parent.$parent.$parent.checkModel(row)"
+                           @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
+              </nobr>
+            </td>
+            <td style="text-align:center;">{{ $index + 1 }}</td>
+            <td style="text-align:center">{{ row.f_userinfo_code }}</td>
+            <td style="text-align:center">{{ row.f_user_name }}</td>
+            <td style="text-align:center">{{ row.f_user_phone }}</td>
+            <td style="text-align:center">{{ row.f_address }}</td>
           </tr>
         </template>
         <template partial='foot'></template>
@@ -43,58 +66,92 @@
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
 
 export default {
   title: '安检记录列表',
   props: ['row'],
-  data () {
+  data() {
     return {
       rowdata: this.row,
-      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+      bookAll: false,
+      bookList:[],
+      model: new PagedList('rs/sql/safe_singleTable_OrderBy', 50,
+        {
+          items: '"tua.f_address,tui.f_userinfo_code,tui.f_user_name,tui.f_user_phone,tui.f_userinfo_id"',
+          tablename: '"t_user_address tua left join t_userinfo tui on tua.f_userinfo_id = tui.f_userinfo_id"',
+          orderitem: '"tua.id desc"'
+        }
+      )
     }
   },
-  ready(){
-    if(this.row){
-      let condition=''
-      if(this.row.f_check_book_type1=='小区'){
-        this.model.url = 'rs/sql/getUserByCheckBook'
-        condition  = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
-      }else{
-        this.model.url = 'rs/sql/getUserByCheckBookCompany'
-        condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
-      }
+  ready() {
+    if (this.row) {
+      let condition = ''
+      condition = `tua.f_check_book_id =${this.row.id}`
       this.model.search(condition)
       //只显示用户页面
-      this.row.f_check_book_type='用户'
+      this.row.f_check_book_type = '用户'
     }
   },
   watch: {
-    'row' (val) {
+    'row'(val) {
       if (val) {
         this.rowdata = val
-        let condition=''
-        if(this.row.f_check_book_type1=='小区'){
-          condition  = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
-        }else{
-          condition  = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
-        }
+        let condition = ''
+        condition = `tua.f_check_book_id =${val.id} `
         this.model.search(condition)
       }
     }
   },
   methods: {
-    selfSearch (args) {
+    selfSearch(args) {
       if (this.rowdata.id) {
-        if(this.rowdata.f_check_book_type1=='小区'){
-          args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
-        }else{
-          args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
-        }
+        args.condition += `and tua.f_check_book_id =${this.rowdata.id}`
         this.model.search(args.condition)
       } else {
         this.$showMessage('请选择片区')
       }
+    },
+    checkModel (row) {
+      if (this.bookAll) {
+        return true
+      } else {
+        return this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1;
+      }
+    },
+    checkChange (row, e) {
+      if (e.target.checked) {
+        this.bookList.push(row.f_userinfo_id)
+      } else {
+        this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
+      }
+    },
+    delOfCheckBook(){
+      try {
+        let upAddress = `update t_user_address set f_check_book_id = null where 1 = 2 `
+        if (this.bookAll){
+          upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${this.row.id}'`
+        }else if (this.bookList.length > 0){
+          let codes = this.bookList.map( item => { return `'${item}'` } ).join()
+          upAddress = `update t_user_address set f_check_book_id = null where f_userinfo_id in (${codes})`
+        }
+        this.$showMessage('确认移出安检册', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let http = new HttpResetClass()
+            http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+              {resolveMsg: null, rejectMsg: '移出安检册失败'}).then(resp=>{
+              this.$showMessage('移出成功')
+              this.$refs.paged.$refs.criteria.search()
+            }).catch(error=>{
+              this.$showMessage('移出失败',error)
+
+            })
+          }
+        })
+      }catch (e) {
+        this.$showMessage('移出失败',e)
+      }
     }
   }
 }

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

@@ -199,9 +199,9 @@
                         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">
+                        :multiple="true"
+                        condition="f_user_tags in {}"
+                       >
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
@@ -212,9 +212,9 @@
                         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">
+                        :multiple="true"
+                        condition="f_user_gas_type in {}"
+                       >
               </v-select>
             </div>
           </div>
@@ -414,6 +414,8 @@
             <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>
@@ -436,6 +438,8 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_user_phone}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_residential_area}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_address}}</td>
+          <td style="text-align: center">{{ row.f_user_tags }}</td>
+          <td style="text-align: center">{{ row.f_user_gas_type }}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_gas_date}}</td>
           <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>

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

@@ -193,9 +193,8 @@
                           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">
+                          condition="f_user_tags in {}"
+                          :multiple="true">
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
@@ -206,9 +205,8 @@
                           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">
+                          condition="f_user_gas_type in {}"
+                          :multiple="true">
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
@@ -267,6 +265,12 @@
               <th>
                 <nobr>客户小区</nobr>
               </th>
+              <th>
+                <nobr>用户标签</nobr>
+              </th>
+              <th>
+                <nobr>用气类型</nobr>
+              </th>
               <th>
                 <data-order field="f_address" name="客户地址"></data-order>
               </th>
@@ -312,6 +316,8 @@
             <td style="text-align: center">{{row.f_user_name}}</td>
             <td style="text-align: center">{{row.f_user_phone}}</td>
             <td style="text-align: center">{{row.f_residential_area}}</td>
+            <td style="text-align: center">{{ row.f_user_tags }}</td>
+            <td style="text-align: center">{{ row.f_user_gas_type }}</td>
             <td style="text-align: center">{{row.f_address}}</td>
             <td style="text-align: center">{{row.f_offsite_time}}</td>
             <td style="text-align: center">{{row.f_checker_name}}</td>

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

@@ -295,9 +295,9 @@
                           :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">
+                          :multiple="true"
+                          condition="f_user_tags in {}"
+                          >
                 </v-select>
               </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
@@ -307,9 +307,9 @@
                           :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">
+                          :multiple="true"
+                          condition="f_user_gas_type in {}"
+                          >
                 </v-select>
               </div>
             </div>
@@ -362,6 +362,12 @@
               <th>
                 <nobr>用气状态</nobr>
               </th>
+              <th>
+                <nobr>用户标签</nobr>
+              </th>
+              <th>
+                <nobr>用气类型</nobr>
+              </th>
               <th>
                 <data-order field="f_offsite_time" name="安检时间"></data-order>
               </th>
@@ -407,6 +413,8 @@
             <td style="text-align: center">{{ row.f_entry_status }}</td>
             <td style="text-align: center">{{ row.f_plan_name }}</td>
             <td style="text-align: center">{{ row.f_usegas }}</td>
+            <td style="text-align: center">{{ row.f_user_tags }}</td>
+            <td style="text-align: center">{{ row.f_user_gas_type }}</td>
             <td style="text-align: center">{{ row.f_offsite_time }}</td>
             <td style="text-align: center">{{ row.f_checker_name }}</td>
             <td style="text-align: center">{{ row.f_repair_approved_note }}</td>