safecheck-client 3.0.32-24 → 3.0.32-25

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

@@ -0,0 +1,368 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <div class="row">
+            <label class="form-group font_normal_body"><b>计划信息</b></label>
+            <div class="form-group col-sm-1" v-show="false">
+              <!--隐藏条件-->
+              <input type="text" class="input_search" v-model="model.f_plan_id"
+                     style="width: 95%" placeholder="计划id" condition=" i.f_plan_id='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                     style="width: 95%" placeholder="客户编号" condition="i.f_userinfo_code='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     style="width: 95%" placeholder="客户名称" condition="i.f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_address"
+                     style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
+            </div>
+            <!--<div class="form-group col-sm-1" >
+              <v-select :width="'95%'"
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_state"
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='安检状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>-->
+            <div class="form-group col-sm-3" >
+              <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+<!--              <button class="button_search" style="margin-right: 10px"  @click="clear()">清除</button>-->
+              <export-excel-safe :data="$parent.$parent.exportParameter"
+                                 :field="$parent.$parent.exportExcelField"
+                                 style="margin-left: 0px"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">
+              </export-excel-safe>
+            </div>
+            <div class="form-group col-sm-2 safe_p">
+              <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>
+            </div>
+            <div class="form-group col-sm-2" style="float: right">
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()">移出计划</button>
+            </div>
+            <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
+              <div slot="modal-header" class="modal-header">
+                <h4 class="modal-title">
+                  计划内用户查询条件
+                </h4>
+              </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_state"
+                      v-model="model.f_state"
+                      :options='$parent.$parent.checkState'
+                      @change="$parent.$parent.checkStateChange(model.f_state)"
+                      placeholder='请选择'
+                      condition="i.f_state='{}'"
+                      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_check_state"
+                      v-model="model.f_check_state"
+                      :options='$parent.$parent.checkResults'
+                      placeholder='请选择'
+                      condition="i.f_last_check_state='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检起始:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_startfile_time"
+                      v-model="model.f_startfile_time"
+                      condition="i.f_last_check_date >='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endfile_time"
+                      v-model="model.f_endfile_time"
+                      condition="i.f_last_check_date  <='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                </div>
+              </div>
+              <div slot="modal-footer" class="modal-footer" style="text-align: center">
+                <button class="button_search" style="margin-right: 15px" @click="search()">查询</button>
+                <button class="button_search" @click="$parent.$parent.cancel">取消</button>
+              </div>
+            </modal>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="table_sy">
+
+        <template partial='head'>
+          <tr>
+            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/> 全选</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>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.f_check_item_id)"  @change="$parent.$parent.$parent.setCheckes(row.f_check_item_id)" /></td>
+          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state==='已检'?row.f_last_check_state:'未检'}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showPlanModal" v-ref:modalp>
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          计划内用户调整
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <plan-chooser :f.sync="userlogin.orgid" v-ref:chooser></plan-chooser>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" style="margin-right: 15px" @click="dragtoOtherPlanIteem">确认</button>
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from "vue-client";
+  import Vue from "vue";
+
+  export default {
+    name: "PlanManage",
+    title: '计划管理',
+    data() {
+      return {
+        model:new PagedList('/rs/sql/planItem', 100, {}),
+        a:'1',
+        opt:[{label:"测试",value:"测试"}],
+        showCondtion:false,
+        checkAll:false,
+        checkes:[],
+        checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
+        checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
+        showPlanModal:false,
+        exportExcelField: {
+          'f_userinfo_code':'用户编号',
+          'f_user_name':'用户名称',
+          'f_user_type':'用户类型',
+          'f_residential_area':'小区名称',
+          'f_state':'安检状态',
+          'f_address':'地址',
+          'f_user_phone':'用户电话',
+          'f_newfile_date':'建档日期'
+        }
+      }
+    },
+    props:["selectplan","userlogin"],
+    ready(){
+
+    },
+    computed:{
+      exportParameter(){
+        // excel 导出条件拼接
+        return {
+          condition: this.$refs.paged.model.condition,
+          groupName: this.groupNameForSql
+        }
+      }
+    },
+    methods:{
+      clear(){
+        this.model.f_plan_id = '';
+        this.model.f_userinfo_code = '';
+        this.model.f_user_name = '';
+        this.model.f_address='';
+
+      },
+      //将某个计划下的一项拖到另一个计划
+      async dragtoOtherPlanIteem() {
+        //tag)
+
+        if (!this.$refs.modalp.$children[0].selectedRow.id) {
+          this.$showMessage("请选择需要调整到那个计划中！")
+          return
+        }
+        this.$parent.isSend=true
+        try{
+          let res=await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
+            data:{
+              f_operator:this.userlogin.name,
+              f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
+              condition:this.model.condition,
+              switchCheckAll:true,
+              checkAll:this.checkAll,
+              param:this.checkes,
+              columnName: "i.id"
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          this.$parent.isSend=false
+          if(res.data.code==200){
+            this.$showMessage("更换安检计划成功！")
+            this.$parent.refreshPlan()
+          }else{
+            this.$showMessage("更换安检计划失败！")
+          }
+        }catch (e) {
+          this.$parent.isSend=false
+          this.$showMessage("更换安检计划失败！")
+        }
+      },
+      showplanModal(){
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要调整的用户！")
+          return
+        }
+        this.showPlanModal=true
+      },
+      showUserCondition(){
+        this.showCondtion=true
+      },
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckAll() {
+        this.checkAll=this.checkAll?false:true;
+        // 全选改变后，清空选中数据
+        this.checkes = []
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
+      cancel(){
+        this.showCondtion=false
+        this.showPlanModal=false
+      },
+      selfSearch (args) {
+        if(!this.selectplan.id){
+          this.$showMessage("请先选择一个计划！")
+          return
+        }
+        this.cancel()
+        this.checkes=[]
+        this.checkAll=false
+        args.condition+= ` and i.f_state!= '作废'`
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      checkStateChange(val){
+        if(val=='未检'){
+          this.checkResults=[]
+          this.$refs.paged.$refs.criteria.model.f_check_state=''
+        }else{
+          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
+        }
+      },
+      //修改计划项状态为作废
+      async delPlanItem() {
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要作废的用户！")
+          return
+        }
+        this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
+          if(button=='confirm'){
+            let resu=new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
+              data: {
+                f_operator:this.userlogin.name,
+                condition:this.model.condition,
+                switchCheckAll:true,
+                checkAll:this.checkAll,
+                param:this.checkes,
+                columnName: "i.id"
+              }
+            }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
+
+              //tag)
+              if(resu.data.code==200){
+                this.$showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
+                //this.checkes=[]
+                //this.checkAll=false
+                this.$parent.refresh()
+              }else{
+                this.$showMessage("取消安检计划失败!")
+              }
+            })
+          }
+        })
+      }
+    },
+    watch:{
+      'selectplan.id' (){
+        //tag
+        if(this.selectplan.id){
+          this.$refs.paged.$refs.criteria.model.f_plan_id=this.selectplan.id
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .safe_p{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+</style>

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

@@ -27,7 +27,7 @@
                 :options='$parent.$parent.areaList'
                 :timeout="500"
                 @select-search="$parent.$parent.select_search"
-                placeholder='小区选择'
+                placeholder='安检册筛选'
                 condition="ua.f_residential_area = '{}'"
                 close-on-select
                 value-single
@@ -51,21 +51,6 @@
               </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
@@ -111,77 +96,6 @@
                     >
                     </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.meter_classify"
-                      v-model="model.meter_classify"
-                      :options='$parent.$parent.meter_classifys'
-                      placeholder='请选择'
-                      condition="uf.F_METER_CLASSIFY='{}'"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </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"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_residential_area = '{}'">
-                  </div>-->
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_building"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_building='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">单&ensp;元&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_unit"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">楼&ensp;层&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_floor"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">开户起始:</label>
-                    <datepicker
-                      placeholder='请选择'
-                      style="width:60%"
-                      :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-rest-button="reset"
-                      :value.sync="model.f_startfile_time"
-                      v-model="model.f_startfile_time"
-                      condition="ui.f_createfile_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">开户截止:</label>
-                    <datepicker
-                      placeholder='请选择'
-                      :disabled-days-of-week="[]"
-                      style="width:60%"
-                      :format="'yyyy-MM-dd'"
-                      :show-rest-button="reset"
-                      :value.sync="model.f_endfile_time"
-                      v-model="model.f_endfile_time"
-                      condition="ui.f_createfile_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_metertitles"
-                           style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">用户电话:</label>
-                    <input type="text" class="input_search" v-model="model.f_user_phone"
-                           style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">
-                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
                     <v-select
@@ -197,20 +111,6 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_meter_book_num"
-                      v-model="model.f_meter_book_num"
-                      :options='$parent.$parent.cbc'
-                      placeholder='请选择'
-                      condition="uf.f_meter_book_num='{}'"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -281,29 +181,29 @@
                     </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">通气起始:</label>
+                    <label class="font_normal_body">建档开始时间:</label>
                     <datepicker
-                      placeholder='通气开始时间'
+                      placeholder='建档开始时间'
                       style="width:60%"
                       :disabled-days-of-week="[]"
                       :format="'yyyy-MM-dd'"
                       :show-rest-button="reset"
                       :value.sync="model.f_startgas_time"
                       v-model="model.f_startgas_time"
-                      condition="ui.f_uservent_date >= '{} 00:00:00'">
+                      condition="ui.f_createfile_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">通气截止:</label>
+                    <label class="font_normal_body">建档结束时间:</label>
                     <datepicker
-                      placeholder='通气结束时间'
+                      placeholder='建档结束时间'
                       :disabled-days-of-week="[]"
                       style="width:60%"
                       :format="'yyyy-MM-dd'"
                       :show-rest-button="reset"
                       :value.sync="model.f_endgas_time"
                       v-model="model.f_endgas_time"
-                      condition="ui.f_uservent_date <= '{} 23:59:59'">
+                      condition="ui.f_createfile_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >

package/src/filiale/fugou/pc.js

@@ -4,11 +4,63 @@ 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) },
+  'paper-main': (resolve) => {
+    require(['./pc/PaperList'], resolve)
+  },
+  'check-user-list': (resolve) => {
+    require(['./pc/checkUserList'], resolve)
+  },
+  'check-plan-list': (resolve) => {
+    require(['./pc/checkPlanList'], resolve)
+  },
+  'plan-manage': (resolve) => {
+    require(['./pc/PlanManage.vue'], 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)
+  },
+  'check-book-all': (resolve) => {
+    require(['./pc/CheckBookAll'], resolve)
+  },
+  'check-book': (resolve) => {
+    require(['./pc/CheckBook'], resolve)
+  },
+  'check-book-list': (resolve) => {
+    require(['./pc/CheckBookList'], resolve)
+  },
+  'check-book-user': (resolve) => {
+    require(['./pc/CheckBookUser'], resolve)
+  },
+  'check-book-area': (resolve) => {
+    require(['./pc/CheckBookArea'], resolve)
+  },
+  'check-book-company': (resolve) => {
+    require(['./pc/CheckBookCompany'], resolve)
+  },
+  'check-book-entry': (resolve) => {
+    require(['./pc/CheckBookEntry'], resolve)
+  },
+  'add-to-check-book': (resolve) => {
+    require(['./pc/AddToCheckBook'], resolve)
+  },
+  'check-book-search-user': (resolve) => {
+    require(['./pc/CheckBookSearchUser'], resolve)
+  },
+  'check-book-search-area': (resolve) => {
+    require(['./pc/CheckBookSearchArea'], resolve)
+  },
+  'check-book-search-unit': (resolve) => {
+    require(['./pc/CheckBookSearchUnit'], resolve)
+  },
+  'check-book-search-user-list': (resolve) => {
+    require(['./pc/CheckBookSearchUserList'], resolve)
+  }
 }
 exports.specialComp = specialComp
 

package/src/filiale/qingjian/android/SafecheckOrderV.vue

@@ -1961,7 +1961,6 @@ export default {
       this.$set('data.f_residential_area' , this.item.f_residential_area)
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
-      this.$set('data.f_userinfo_comments', this.item.f_plan_meters[0].f_userinfo_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
       this.$set('data.f_client_evaluation', '满意')
       this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)

package/src/filiale/qingjian/android/SafecheckUserInfo.vue

@@ -45,10 +45,6 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>安检状态:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
-        <div class="col-xs-12" style="padding: 2px 0">
-          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>备注:</b></p>
-          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_userinfo_comments}}</p>
-        </div>
         <div class="col-xs-12">
           <button type="button" style="width: 45%;float: left" class="btn btn-primary" v-if="updateuserphone"
                   @click="updatePhone(userinfo.f_user_phone,userinfo.f_userinfoid)">电话修改

package/src/filiale/wensu/pc/CheckSearchUser.vue

@@ -201,7 +201,7 @@
                         :value.sync="model.f_outlets" v-model="model.f_outlets"
                         :options='$parent.$parent.userareas'
                         close-on-select clear-button
-                        condition="f_outlets = '{}'"
+                        condition=" f_khwd = '{}'"
                         :value-single="true">
               </v-select>
             </div>
@@ -364,6 +364,9 @@
             <th>
               <nobr>用气类型</nobr>
             </th>
+            <th>
+              <nobr>f_khwd</nobr>
+            </th>
 <!--            <th>-->
 <!--              <nobr>壁挂炉</nobr>-->
 <!--            </th>-->
@@ -403,7 +406,8 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_user_phone }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meternumber}}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meter_brand}}</td>-->
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_type }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gasproperties }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_khwd }}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_hasfurnace }}</td>-->
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_residential_area }}</td>
@@ -590,6 +594,7 @@ export default {
         'f_user_phone': '用户电话',
         'f_meternumber': '用户表号',
         'f_gasproperties': '用气类型',
+        'f_khwd': '开户网点',
         'f_checker_name': '安检员',
         'f_residential_area': '小区名称',
         'f_address': '地址',