safecheck-client 4.0.2-60 → 4.0.2-63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.2-60",
+  "version": "4.0.2-63",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/jinhong/android/AddPlanItem.vue

@@ -0,0 +1,481 @@
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="f_userinfo_code = '{}'" placeholder="请输入用户编号" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">表 &nbsp;&nbsp; &nbsp;&nbsp; 号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_meternumber condition="f_meternumber = '{}'" style="width: 70%" placeholder="请输入表号" />
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" v-model="model.f_username" placeholder="请输入用户名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户类型：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select :value.sync="$parent.$parent.model.f_user_type" class="input-font"
+                          :options='$parent.$parent.user_types' placeholder='请选择用户类型' :value-single="true"
+                          v-model="$parent.$parent.model.f_user_type" close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_districtname" placeholder="请输入用户小区（可模糊查询）">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_building" placeholder="请输入用户楼号">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_unit" placeholder="请输入用户单元">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户地址：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">表&nbsp;&nbsp;封&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_metertitles" placeholder="请输入表封号" condition="uf.f_metertitles='{}'">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">电&nbsp;&nbsp;话&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_user_phone" placeholder="请输入电话号" condition="ui.f_user_phone like '%{}%'">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input style="width: 100%" class="search_input input-font" v-model="model.f_card_id" placeholder="请输入卡号" condition="uf.f_card_id like '%{}%'">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">抄&nbsp;&nbsp;表&nbsp;&nbsp;册：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择抄表册'
+                          :value.sync="model.f_meter_book_num"
+                          v-model="model.f_meter_book_num"
+                          :options='$parent.$parent.cbc'
+                          condition="uf.f_meter_book_num='{}'"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">单位名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择单位名称'
+                          :value.sync="model.civill_name"
+                          v-model="model.civill_name"
+                          :options='$parent.$parent.civill_names'
+                          condition="ci.f_user_name = '{}'"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
+<!--            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">安检情况</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择安检情况'
+                          :value.sync="model.f_ischeck"
+                          v-model="model.f_ischeck"
+                          :options='$parent.$parent.ischecks'
+                          condition="{}"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">档案状态：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择档案状态'
+                          :value.sync="$parent.$parent.model.f_user_state"
+                          :options='$parent.$parent.f_user_states'
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>-->
+
+
+
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.inspect(row)" class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">表号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_meternumber }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户类型</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_type }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}</p>
+                </div>
+
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">小区名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_residential_area }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户地址</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_address }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">最后安检日期</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_date }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">最后安检状态</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <!--<back-page :need-back='true'   @flag="$back()"></back-page>-->
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import Vue from 'vue'
+  import * as Util from '../../Util'
+
+  export default {
+    title: '安检员B',
+    data () {
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+        f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
+      model.f_sign = ['']
+      model.f_user_type = ''
+      model.f_user_state =['']
+      model.f_check_type =['']
+      model.myCycle = 0
+      model.fyCycle = 0
+      model.f_filialeid = Vue.user.orgid
+      //model.f_filialeid = 287
+      return {
+        civill_names:[{label:"全部",value:""}],
+        model: model,
+        cbc:[],
+        showModal:false,
+        signs: [
+          {label:'请选择录入状态', value:''},
+          {label:'录入', value:'1'},
+          {label:'非录入', value:'0'},
+        ],
+        ischecks: [
+        ],
+        user_types: [
+          {label: '请选择用户类型', value: ''},
+          {label: '民用', value: '民用'},
+          {label: '非民用', value: '非民用'},
+        ],
+        f_user_states: [
+          {label:'请选择档案状态', value:''},
+          {label:'正常', value:'正常'},
+          {label:'点火', value:'点火'},
+        ],
+        f_check_types: [
+          {label:'请选择安检类型', value:''},
+          {label:'应检', value:'应检'},
+          {label:'超期', value:'超期'},
+        ],
+      }
+    },
+    ready () {
+      this.getCivillNames()
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      //   //tag)
+      //   if(res.data.code == 200){
+      //     this.model.myCycle = res.data.civil.value
+      //     this.model.fyCycle = res.data.civilian.value
+      //   }else{
+      //     //this.$showMessage(res.data.msg)
+      //   }
+      //
+      // })
+      // this.getCheckTime()
+      // this.Mreadibook()
+    },
+    computed: {
+      reload(){
+        this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+      },
+      selected () {
+        return this.$refs.paged.$refs.grid.selected
+      }
+    },
+    methods:{
+      getCivillNames(){
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
+          data: {
+            items: 'f_user_name',
+            tablename: 't_civill',
+            condition: `f_orgid = '${Vue.user.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          res.data.forEach(ress => {
+            this.civill_names.push({
+              label: ress.f_user_name,
+              value: ress.f_user_name
+            })
+          })
+        })
+      },
+      scan(){
+        HostApp.__this__=this,
+          HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+      },
+      getCode(){
+        let datapa = HostApp.getCode().data;
+        let indexnum = datapa.indexOf("]C1")
+        if(indexnum != -1){
+          datapa = datapa.substring(indexnum+3,datapa.length)
+        }
+        this.$refs.paged.$refs.cri.model.f_meternumber=datapa
+      },
+      getCheckTime(){
+        //tag
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{data: {
+            items: 'f_circle,f_start_time',
+            tablename: 't_safe_circle',
+            condition: `f_filialeid  = '${Vue.user.orgid}'`,
+            orderitem: 'id'
+          }}).then(res=>{
+          //tag)
+          let  nocheck=''
+          let  ischeck=''
+          if (res.data[0]){
+            if (res.data[0].f_circle=='1'){
+              nocheck=`(ua.f_last_check_date<'${res.data[0].f_start_time}' or ua.f_last_check_date is null)`
+              ischeck=`ua.f_last_check_date>'${res.data[0].f_start_time}'`
+
+            }else{
+              let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
+              //tag
+              let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
+              //tag
+              nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
+              ischeck=`ua.f_last_check_date>'${time}'`
+            }
+            //tag
+            this.ischecks=[
+              {label: '全部', value: ''},
+              {label: '已检', value: ischeck },
+              {label: '未检', value: nocheck},
+            ]
+            //tag
+          }else{
+            this.$showMessage("未配置安检周期")
+          }
+
+        })
+        //tag
+      },
+      inspect (info){
+        if(info.f_last_check_date){
+          this.$showMessage("该用户最后一次安检时间为 "+info.f_last_check_date+" 是否继续对该用户进行安检",['confirm', 'cancel']).then((butt)=>{
+            if(butt=="confirm"){
+              info.id = ''
+              info.f_state = '未检'
+              info.f_no_checkplan = '无计划安检'
+              //tag
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+                //tag)
+                info['f_plan_meters'] = response.data
+                var pardate = {
+                  _this:this,
+                  tittle:'安检详情',
+                  safe:true
+                }
+                this.$dispatch('gotoson',pardate)
+                this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
+
+              })
+            }
+          })
+        }else{
+          info.id = ''
+          info.f_state = '未检'
+          info.f_no_checkplan = '无计划安检'
+          //tag
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+            //tag)
+            info['f_plan_meters'] = response.data
+            var pardate = {
+              _this:this,
+              tittle:'安检详情',
+              safe:true
+            }
+            this.$dispatch('gotoson',pardate)
+            this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
+
+          })
+        }
+      },
+      Mreadibook(){
+        this.cbc=[]
+        let http = new HttpResetClass()
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
+          {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
+          {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
+          this.cbc = [{label: '全部', value: ''}]
+          //tag
+          //tag)
+          //tag
+          getMeterReadingBooks.data.meterbooks.forEach((res) => {
+            this.cbc.push({label: res.f_book_name, value: res.id})
+            /*if(res.f_book_slice_area){
+              if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
+                this.sliceArea.push(res.f_book_slice_area)
+              }
+            }*/
+          })
+        })
+
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+  .btn-font{
+    font:600 16px PingFang-SC-Bold;
+    color: #499EDF;
+  }
+  .btn-color{
+    background-color: #FFFFFF;
+    border-radius: 10px ;
+    border: 1px solid #499EDF;
+  }
+  .app-text {
+    font-size: 12px;
+  }
+  .panel-self{
+    border-radius: 10px;
+    border:1px solid #499EDF;
+    background-color: #F8F8F8;
+  }
+  .yybtn-color{
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
+  .qxbtn-color{
+    background-color: #FFFFFF;
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
+</style>

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -271,6 +271,15 @@
                         :options='$parent.$parent.user_types' placeholder='请选择用户类型' v-model="model.f_user_type"
                         condition="f_user_type='{}'" close-on-select clear-button></v-select>
             </div>
+            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_civill_name" class="font text-left">单位名称：</label>
+              </div>
+              <v-select id="f_civill_name" :value.sync="model.f_civill_name" class="input-font" :width="'60%'"
+                        :options='$parent.$parent.civill_names' placeholder='请选择单位名称' v-model="model.f_civill_name"
+                        condition="f_civill_name = '{}'" close-on-select clear-button></v-select>
+            </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-6">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -608,6 +617,7 @@ export default {
       f_filialeids: '(' + Vue.user.orgid + ')',
       //f_filialeids:'(305)',
       planparam: [],
+      civill_names:[{label:"全部",value:""}],
       check: '',
       plan: '',
       planid: '',
@@ -675,6 +685,7 @@ export default {
   },
   ready() {
     this.getCheckBook()
+    this.getCivillNames()
     this.getAllArea()
     this.getAllPlanName()
     this.selfSearch()
@@ -693,6 +704,21 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
+    getCivillNames(){
+      let criteria = {
+        items: 'f_civill_name',
+        tablename: 't_check_plan_item',
+        condition: `f_civill_name IS NOT NULL`,
+        groupitem: 'f_civill_name'
+      }
+      let result = HostApp._executeTask({
+        'type': 'sql',
+        'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria }
+      })
+      if (result.code == 200) {
+        result.data.rows.forEach(item => this.civill_names.push({ label: item.f_civill_name, value: item.f_civill_name }))
+      }
+    },
     async planNameChange(val){
       if (val.length > 0 && val[0]){
         this.checkBooks=[]
@@ -1062,10 +1088,6 @@ export default {
         if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0)
           condition += " and f_plan_name = '" + this.$refs.paged.$refs.cri.model.f_plan_name + "'"
       }
-      // if(this.$refs.paged.$refs.cri.model.f_plan_year)
-      //   condition += " and f_plan_year = '"+this.$refs.paged.$refs.cri.model.f_plan_year +"'"
-      // if(this.$refs.paged.$refs.cri.model.f_plan_month)
-      //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
       if (this.$refs.paged.$refs.cri.model.f_userinfo_code)
         condition += " and ti.f_userinfo_code like '%" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "%'"
       if (this.$refs.paged.$refs.cri.model.f_keyword)
@@ -1074,14 +1096,12 @@ export default {
         condition += " and ti.f_user_name like '%" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
       if (this.$refs.paged.$refs.cri.model.f_state[0])
         condition += " and ti.f_state='" + this.$refs.paged.$refs.cri.model.f_state[0] + "'"
-      // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
-      //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
       if (this.$refs.paged.$refs.cri.model.f_user_type[0])
         condition += " and ti.f_user_type='" + this.$refs.paged.$refs.cri.model.f_user_type[0] + "'"
+      if (this.$refs.paged.$refs.cri.model.f_civill_name[0])
+        condition += " and ti.f_civill_name='" + this.$refs.paged.$refs.cri.model.f_civill_name[0] + "'"
       if (this.$refs.paged.$refs.cri.model.f_meter_no)
         condition += " and tm.f_meter_no like '%" + this.$refs.paged.$refs.cri.model.f_meter_no + "%'"
-      // if(this.$refs.paged.$refs.cri.model.f_flow_direction[0])
-      //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
       if (this.$refs.paged.$refs.cri.model.f_user_phone) {
         condition += `and ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%'`
       }

package/src/filiale/jinhong/android.js

@@ -7,6 +7,7 @@ let specialComp = {
   'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
   'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal.vue'], resolve) },
   'android-notified-deal': (resolve) => { require(['./android/AndroidNotifiedDeal'], resolve) }
 }

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

@@ -290,6 +290,21 @@
                       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.civill_name"
+                      v-model="model.civill_name"
+                      :options='$parent.$parent.civill_names'
+                      placeholder='请选择'
+                      condition="ci.f_user_name = '{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                 </div>
               </div>
               <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -334,6 +349,7 @@
             <th title="最后一次安检日期"><nobr>安检日期</nobr></th>
             <th><nobr>首次通气时间</nobr></th>
             <th><nobr>详细地址</nobr></th>
+            <th><nobr>单位名称</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -351,6 +367,7 @@
           <td style="text-align: center"><nobr>{{row.f_last_check_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_uservent_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.civill_name}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -382,6 +399,7 @@
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+        civill_names:[{label:"全部",value:""}],
         yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
         entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
         sliceArea:[],
@@ -399,11 +417,29 @@
     props:["selectplan","userlogin"],
     ready(){
       this.getCheckBook()
+      this.getCivillNames()
       this.setConList()
       this.loadpage()
       document.addEventListener('keydown', this.handleEnter, true);
     },
     methods: {
+      getCivillNames(){
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
+          data: {
+            items: 'f_user_name',
+            tablename: 't_civill',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          res.data.forEach(ress => {
+            this.civill_names.push({
+              label: ress.f_user_name,
+              value: ress.f_user_name
+            })
+          })
+        })
+      },
       clearcon(){
         this.$refs.paged.$refs.criteria.model.f_userinfo_code = ''
         this.$refs.paged.$refs.criteria.model.f_meternumber = ''