safecheck-client 3.0.33-15 → 3.0.33-152

package/src/filiale/yangchunboneng/android/SafecheckDevices.vue

@@ -35,7 +35,7 @@
                     <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                       <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
                         <div class="col-sm-4" v-show="row.f_path">
-                          <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                          <img-self-android  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self-android>
                         </div>
                         <div class="col-sm-4" v-show="!row.f_path" @click="takePic(idxs, row.f_item_name)">
                           <img src="../../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
@@ -147,7 +147,7 @@
                       <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                         <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
                           <div class="col-sm-4" v-show="row.f_path">
-                            <img-self  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                            <img-self-android  :src="row.f_path" :alt="row.f_item_name"  width="140" height="140"></img-self-android>
                           </div>
                           <div class="col-sm-4" v-show="!row.f_path" @click="takePic(idxs, row.f_item_name)">
                             <img src="../../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
@@ -163,7 +163,7 @@
                       <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                         <div class="col-xs-6"  style="height: 160px;width:160px;overflow: scroll;top: 1px">
                           <div class="col-sm-4" v-show="row['f_p' + (itemIndex+1) + '_path']">
-                            <img-self  :src="row['f_p' + (itemIndex+1) + '_path']" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                            <img-self-android  :src="row['f_p' + (itemIndex+1) + '_path']" :alt="row.f_item_name"  width="140" height="140"></img-self-android>
                           </div>
                           <div class="col-sm-4" v-show="!row['f_p' + (itemIndex+1) + '_path']" @click="takePic(idxs, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">
                             <img src="../../../assets/tackpic.png" :alt="点击拍摄照片"  width="140" height="140"></img>
@@ -180,7 +180,7 @@
                         <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
                           <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
                             <div class="col-sm-4" v-show="row.f_repair_path">
-                              <img-self  :src="row.f_repair_path" :alt="row.f_item_name"  width="140" height="140"></img-self>
+                              <img-self-android  :src="row.f_repair_path" :alt="row.f_item_name"  width="140" height="140"></img-self-android>
                             </div>
                             <div class="col-sm-4" v-show="!row.f_repair_path" @click="takePic(idxs, row.f_item_name,'f_repair_path',row.f_defect_level)">
                               <img src="../../../assets/tackpic.png" alt="点击拍摄照片"  width="140" height="140"></img>
@@ -900,7 +900,7 @@ export default {
       this.f_items[this.f_measurement_error.index].f_item_value = this.f_items[this.f_mechanical_reading.index].f_item_value - this.f_items[this.f_electronic_reading.index].f_item_value
       this.f_items[this.f_measurement_error.index].f_item_value = this.f_items[this.f_measurement_error.index].f_item_value.toFixed(3)
       if (isNaN(this.f_items[this.f_measurement_error.index].f_item_value)) {
-        this.f_items[this.f_meter_aberrant_number1.index].f_item_value = null
+        this.f_items[this.f_measurement_error.index].f_item_value = null
       }
       // 计算差值是否在范围内
       //tag)

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

@@ -89,12 +89,12 @@
           <div class="row" style="margin-top: 10px" v-if="row.f_repair_data.dispatchType == '派发给维修员'">
             <label class="font_normal_body">维&ensp;修&ensp;员</label>
             <v-select :value.sync="row.f_repair_data.f_repairman" :value-single="true" :options='repairers'
-                      placeholder='请选择维修员' close-on-select></v-select>
+                      placeholder='请选择' close-on-select></v-select>
           </div>
           <div class="row" style="margin-top: 10px" v-if="row.f_repair_data.dispatchType == '派发给站点'">
             <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
             <v-select :value-single="true" :value.sync="row.f_repair_data.selectedStation" @change="selectclick(row)"
-                      :options='childrenOptions' placeholder='请选择维修员' close-on-select></v-select>
+                      :options='childrenOptions' placeholder='请选择' close-on-select></v-select>
           </div>
           <div class="row" style="margin-top: 10px">
             <label class="font_normal_body">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
@@ -252,7 +252,7 @@ export default {
             "累购金额": { "index": 8, "type": "number", "readonly": true },
             "已用气量": { "index": 9, "type": "number", "checkmust": false },//基表数
             "已用金额": { "index": 9, "type": "number", "checkmust": false },
-            "机械读数": { "index": 10, "type": "number", "checkmust": false },
+            "机械读数": { "index": 10, "type": "number", "checkmust": true },
             "电子读数": { "index": 12, "type": "number", "checkmust": false },
             "剩余气量": { "index": 11, "type": "number", "checkmust": false },//累购-已用
             //显示屏数  --实际剩余气量
@@ -1973,6 +1973,7 @@ export default {
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_rent_phone', this.item.f_rent_phone)
+      this.$set('data.f_zuhu_phone', this.item.f_zuhu_phone)
       this.$set('data.f_user_phone', this.item.f_user_phone)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
       this.$set('data.f_address', this.item.f_address)
@@ -1986,8 +1987,10 @@ export default {
       this.$set('data.f_unit', this.item.f_unit)
       this.$set('data.f_ins_stop_date', this.item.f_plan_meters[0].f_ins_stop_date)
       this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_zhongdian)
-      this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_audit_comments)
+      this.$set('data.f_zhongdian_f_remark', this.item.f_plan_meters[0].f_zhongdian_f_remark)
+      this.$set('data.f_audit_comments', this.item.f_plan_meters[0].f_audit_comments)
       this.$set('data.f_gas_date', this.item.f_plan_meters[0].f_gas_date)
+      this.$set('data.f_uservent_date', this.item.f_plan_meters[0].f_uservent_date)
       this.$set('data.f_gas_pointsnumber', this.item.f_plan_meters[0].f_gas_pointsnumber)
       //tag
       this.$set('data.f_floor', this.item.f_floor)
@@ -2562,6 +2565,16 @@ export default {
             }
             //tag)
           }
+          if (this.item.f_plan_meters && this.item.f_plan_meters[0]){
+            this.$set('data.f_ins_stop_date', this.item.f_plan_meters[0].f_ins_stop_date)
+            this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_zhongdian)
+            this.$set('data.f_audit_comments', this.item.f_plan_meters[0].f_audit_comments)
+            this.$set('data.f_gas_date', this.item.f_plan_meters[0].f_gas_date)
+            this.$set('data.f_gas_pointsnumber', this.item.f_plan_meters[0].f_gas_pointsnumber)
+            this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)
+            this.$set('data.f_valve_state', this.item.f_plan_meters[0].f_valve_state)
+            this.$set('data.f_off_valve_reason', this.item.f_plan_meters[0].f_off_valve_reason)
+          }
         } else {
           //tag
           this.init()

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

@@ -32,6 +32,16 @@
                  v-model="userinfo.f_user_phone"/>
 
         </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_rent_phone }}
+          </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_zuhu_phone }}
+          </p>
+        </div>
         <!--        <div class="col-xs-12" style="padding: 2px 0" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')">-->
         <!--          <p class="panel-title text-left font" style="width: 23%;float: left"><b>机表表号:</b></p>-->
         <!--          <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_meter_no }}" v-model="userinfo.f_meter_no"/>-->
@@ -53,6 +63,10 @@
           <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_gas_date }}</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_uservent_date }}</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_gas_pointsnumber }}</p>
@@ -65,9 +79,13 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left;color: red;"><b>是重点用户</b></p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0" v-if="userinfo.f_zhongdian">
-          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>移入的原因:</b></p>
+          <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_zhongdian }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0" v-if="userinfo.f_zhongdian">
+          <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_zhongdian_f_remark }}</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)">电话修改
@@ -124,7 +142,7 @@
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
                        v-for="(index,img) in f_noanswers_path">
-                    <img-self :src="img.f_noanswer_path" alt="到访不遇照片" :width="130" :height="160"></img-self>
+                    <img-self-android :src="img.f_noanswer_path" alt="到访不遇照片" :width="130" :height="160"></img-self-android>
                     <img src="../../../assets/删除.png" @click="delfile('f_noanswers_path', img.f_noanswer_path,index)"
                          style="width: 15px;margin-top: -80px" alt="">
                   </div>
@@ -150,7 +168,7 @@
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
                        v-for="(index,img) in f_rejectchecks_path">
-                    <img-self :src="img.f_rejectcheck_path" alt="拒检照片" :width="130" :height="160"></img-self>
+                    <img-self-android :src="img.f_rejectcheck_path" alt="拒检照片" :width="130" :height="160"></img-self-android>
                     <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
                          style="width: 15px;margin-top: -80px" alt="">
                   </div>
@@ -173,7 +191,7 @@
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
                        v-for="(index,img) in f_rejectchecks_path">
-                    <img-self :src="img.f_rejectcheck_path" alt="拆除照片" :width="130" :height="160"></img-self>
+                    <img-self-android :src="img.f_rejectcheck_path" alt="拆除照片" :width="130" :height="160"></img-self-android>
                     <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
                          style="width: 15px;margin-top: -80px" alt="">
                   </div>
@@ -196,7 +214,7 @@
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
                        v-for="(index,img) in f_rejectchecks_path">
-                    <img-self :src="img.f_rejectcheck_path" alt="未通气照片" :width="130" :height="160"></img-self>
+                    <img-self-android :src="img.f_rejectcheck_path" alt="未通气照片" :width="130" :height="160"></img-self-android>
                     <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
                          style="width: 15px;margin-top: -80px" alt="">
                   </div>
@@ -219,7 +237,7 @@
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
                        v-for="(index,img) in f_rejectchecks_path">
-                    <img-self :src="img.f_rejectcheck_path" alt="停用照片" :width="130" :height="160"></img-self>
+                    <img-self-android :src="img.f_rejectcheck_path" alt="停用照片" :width="130" :height="160"></img-self-android>
                     <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
                          style="width: 15px;margin-top: -80px" alt="">
                   </div>
@@ -606,12 +624,6 @@ export default {
       if( this.$parent.$parent.item.f_offsite_time){
         this.$set('last_check_date', this.$parent.$parent.item.f_offsite_time)
         this.$set('last_check_state', this.$parent.$parent.item.f_entry_status)
-        if(this.$parent.$parent.item.f_plan_meters.length>0){
-          this.$set('f_meters[0].f_meter_no', this.$parent.$parent.item.f_plan_meters[0].f_meter_no)
-          this.$set('userinfo.f_gas_date', this.$parent.$parent.item.f_plan_meters[0].f_gas_date)
-          this.$set('userinfo.f_gas_pointsnumber', this.$parent.$parent.item.f_plan_meters[0].f_gas_pointsnumber)
-          this.$set('userinfo.f_ins_stop_date', this.$parent.$parent.item.f_plan_meters[0].f_ins_stop_date)
-        }
         if (this.$parent.$parent.item.f_defect_content) {
           let checkResult = JSON.parse(this.$parent.$parent.item.f_defect_content)
           this.$set('last_check_result', checkResult.result)
@@ -621,6 +633,12 @@ export default {
           this.$set('last_check_data.data', [])
         }
       }
+      if(this.$parent.$parent.item.f_plan_meters && this.$parent.$parent.item.f_plan_meters.length>0){
+        this.$set('f_meters[0].f_meter_no', this.$parent.$parent.item.f_plan_meters[0].f_meter_no)
+        this.$set('userinfo.f_gas_date', this.$parent.$parent.item.f_plan_meters[0].f_gas_date)
+        this.$set('userinfo.f_gas_pointsnumber', this.$parent.$parent.item.f_plan_meters[0].f_gas_pointsnumber)
+        this.$set('userinfo.f_ins_stop_date', this.$parent.$parent.item.f_plan_meters[0].f_ins_stop_date)
+      }
       this.$set('upUserinfoSta', '否')
       this.upUserinfoSta = this.$appdata.getSingleValue('安检修改档案信息')
 

package/src/filiale/yangchunboneng/android/safeHistoryLook.vue

@@ -137,8 +137,9 @@
                         :options='$parent.$parent.check_states'
                         placeholder='安检结果'
                         style="width:60%"
+                        :multiple="true"
                         v-model="model.f_state"
-                        condition="f_state='{}'"
+                        condition="f_state in {}"
                         close-on-select clear-button>
               </v-select>
             </div>

package/src/filiale/yangchunboneng/android.js

@@ -14,6 +14,7 @@ let specialComp = {
   'DailyworkloadQueryNew': (resolve) => { require(['./android/DailyworkloadQueryNew'], resolve) },
   'new-check-paper-android': (resolve) => { require(['./android/NewCheckpaperAndroid'], resolve) },
   'safe-history-look': (resolve) => { require(['./android/safeHistoryLook'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
 }
 
 exports.specialComp = specialComp

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

@@ -109,10 +109,10 @@
 <!--              <nobr>未下发</nobr>-->
 <!--            </th>-->
             <th>
-              <nobr>已检</nobr>
+              <nobr>已入户</nobr>
             </th>
             <th>
-              <nobr>未检</nobr>
+              <nobr>未入户</nobr>
             </th>
           </tr>
         </template>
@@ -127,8 +127,8 @@
           <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num}}</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>
-          <td  style="text-align: center;">{{ row.weijian }}</td>
+          <td  style="text-align: center;">{{ row.num3 }}</td>
+          <td  style="text-align: center;">{{ row.num4 }}</td>
         </template>
       </data-grid>
     </criteria-paged>

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

@@ -5,22 +5,17 @@
         <criteria partial='criteria' class="search_area" @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-4">
                 <label class="font_normal_body">客户编号</label>
                 <input type="text" class="input_search" v-model="model.f_userinfo_code"
                        style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <label class="font_normal_body">客户名称</label>
                 <input type="text" class="input_search" v-model="model.f_user_name"
                        style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
               </div>
-              <div class="form-group col-sm-3" >
-                <label class="font_normal_body">地址</label>
-                <input type="text" class="input_search" v-model="model.f_address"
-                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <button class="button_spacing button_search" @click="search()">查询</button>
                 <div style="float: right" class="button_spacing"
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -28,17 +23,17 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">地&emsp;&emsp;址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">小区名称</label>
                 <input type="text" class="input_search" v-model="model.f_residential_area"
                        style="width: 60%" placeholder="小区名称" condition="f_residential_area like '%{}%'">
               </div>
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">地址</label>
-                <input type="text" class="input_search" v-model="model.f_address"
-                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">客户类型</label>
                 <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
                           :value-single="true" style="width: 60%"
@@ -47,23 +42,20 @@
                           close-on-select
                           condition="f_user_type ='{}'"></v-select>
               </div>
-              <div class="col-sm-3 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-4 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="ui.f_orgid in {}"></right-tree-safe>
               </div>
-            </div>
-            <div class="row">
-              <div class="form-group col-sm-3"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">安检册名称</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安&ensp;检&ensp;册</label>
                 <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                           :value-single="true" style="width: 60%"
                           class="select_list select"
                           :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                           close-on-select
                           condition="f_check_book_id ='{}'"></v-select>
-
               </div>
-              <div class="form-group col-sm-3"  v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">是否在册</label>
                 <v-select :value.sync="model.f_is_checkbook" v-model='model.f_is_checkbook'
                           :value-single="true" style="width: 60%"
@@ -74,6 +66,54 @@
                           condition="{}"></v-select>
               </div>
             </div>
+            <div class="row">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">通气开始</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_str"
+                  style="width: 60%"
+                  :format="'yyyy-MM-dd 00:00:00'"
+                  v-model="model.f_gas_date_str"
+                  condition="f_uservent_date > '{}'"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">通气结束</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_end"
+                  style="width: 60%"
+                  :format="'yyyy-MM-dd 23:59:59'"
+                  v-model="model.f_gas_date_end"
+                  condition="f_uservent_date < '{}'"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">开始时间</label>
+                <datepicker
+                  :value.sync="model.f_check_start"
+                  placeholder='首次通气时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_start"
+                  condition="f_uservent_date > ='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">结束时间</label>
+                <datepicker
+                  :value.sync="model.f_check_end"
+                  placeholder='首次通气时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_end"
+                  condition="f_uservent_date <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+            </div>
           </div>
         </criteria>
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
@@ -100,6 +140,9 @@
               <th>
                 <nobr>客户地址</nobr>
               </th>
+              <th>
+                <nobr>首次通气时间</nobr>
+              </th>
               <th>
                 <nobr>所属安检册</nobr>
               </th>
@@ -117,6 +160,7 @@
             <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_address }}</td>
+            <td style="text-align: center">{{ row.f_uservent_date }}</td>
             <td style="text-align: center">{{ row.f_check_book_name }}</td>
           </template>
         </data-grid>
@@ -582,16 +626,16 @@ export default {
     bus.$off('fresh-user')
   },
   ready () {
-    bus.$on('fresh-user',()=>{
-      console.log("进入方法")
-      this.bookAll = false
-      this.bookList = []
-      this.$refs.paged.$refs.criteria.search()
-    })
-    this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
-    //tag
-    // this.init=true
-    this.freshCheckBook()
+    // bus.$on('fresh-user',()=>{
+    //   console.log("进入方法")
+    //   this.bookAll = false
+    //   this.bookList = []
+    //   this.$refs.paged.$refs.criteria.search()
+    // })
+    // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
+    // //tag
+    // // this.init=true
+    // this.freshCheckBook()
   }
 }
 </script>

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

@@ -7,9 +7,65 @@
             <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='客户编号'
-                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+                     condition="tui.f_userinfo_code = '{}'" @keyup.enter="search()">
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">客户名称</label>
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     style="width: 60%" placeholder="客户名称" condition="tui.f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">地址</label>
+              <input type="text" class="input_search" v-model="model.f_address"
+                     style="width: 60%" placeholder="地址" condition="tua.f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">小区名称</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区名称" condition="tua.f_residential_area like '%{}%'">
+            </div>
+          </div>
+          <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.userTypes' placeholder='客户类型'
+                        close-on-select
+                        condition="tuf.f_user_type ='{}'"></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">通气开始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='开始时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_gas_date > ='{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">通气结束</label>
+              <datepicker
+                :value.sync="model.f_gas_end"
+                placeholder='结束时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_end"
+                condition="f_gas_date <=  '{} 23:59:59'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row">
             <div class="form-group col-sm-2 button-range" >
+              <export-excel-safe :data="$parent.$parent.searchData"
+                                 :field="$parent.$parent.excelHeaders"
+                                 :choose-col="true"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="getUserByCheckBook" template-name='安检册明细'></export-excel-safe>
               <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
               <button class="button_spacing button_search-1" @click='$parent.$parent.removes()' v-if="$parent.$parent.bookList.length>0" >移出安检册</button>
             </div>
@@ -27,6 +83,7 @@
             <th><nobr>用户姓名</nobr></th>
             <th><nobr>用户电话</nobr></th>
             <th><nobr>用户地址</nobr></th>
+            <th><nobr>通气日期</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
         </template>
@@ -42,6 +99,7 @@
             <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>
+            <td style="text-align:center">{{row.f_gas_date}}</td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.remove(row)'>移出安检册</button>
             </td>
@@ -65,6 +123,17 @@ export default {
       checkAll:false,
       rowdata: this.row,
       bookList: [],
+      searchData: {
+        condition: "1=1"
+      },
+      excelHeaders: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_user_phone':'客户电话',
+        'f_address': '客户地址',
+        'f_gas_date': '通气日期'
+      },
+      userTypes: [{label: '全部', value: ''},{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
       model: new PagedList('rs/sql/getUserByCheckBook', 50)
     }
   },
@@ -86,6 +155,7 @@ export default {
       //   condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
       // }
       this.model.search(condition)
+      this.searchData.condition = condition
       //只显示用户页面
       this.row.f_check_book_type='用户'
     }
@@ -189,6 +259,7 @@ export default {
         //   args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
         // }
         this.model.search(args.condition)
+        this.searchData.condition = args.condition
       } else {
         this.$showMessage('请选择片区')
       }