safecheck-client 3.0.33-15 → 3.0.33-150

package/src/filiale/wenxi/android/PhoneUpUserinfo.vue

@@ -396,7 +396,7 @@
         wid: "60%",
         devices_types: [],
         pipe_types: this.$appdata.getParam('管道类型'),
-        pipetypes: [{label: '有', value: '有'}, {label: '无', value: '无'}],
+        pipetypes:Vue.$appdata.getParam('管道类型'),
         wz_types: [],
         cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
         aroundmeters: this.$appdata.getParam('左右表'),

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

@@ -7,8 +7,10 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
           <!--<a class="panel-title col-xs-7 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</a>-->
           <p class="panel-title col-xs-7 text-left input-font">
-            <label style="text-decoration:underline;color: #00b3ee; font-size: 15px;" @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</label>
-            <label style="color: #00b3ee;text-decoration:none; margin-left:5%; font-size: 15px;" @click="upuserinfo(userinfo)">档案维护</label>
+            <label style="text-decoration:underline;color: #00b3ee; font-size: 15px;"
+                   @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</label>
+            <label style="color: #00b3ee;text-decoration:none; margin-left:5%; font-size: 15px;"
+                   @click="upuserinfo(userinfo)">档案维护</label>
           </p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
@@ -32,6 +34,14 @@
           <p class="panel-title col-xs-7 text-left input-font"
           >{{ userinfo.f_table_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">{{ f_instruct_title ? f_instruct_title : '' }}</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">{{ f_info }}</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_user_phone }}</p>
@@ -71,16 +81,16 @@
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
         <div class="col-xs-12">
-          <button type="button" style="width: 45%;float: left" class="btn btn-primary" v-if="updateuserphone"
+          <button v-if="updateuserphone" class="btn btn-primary" style="width: 45%;float: left" type="button"
                   @click="updatePhone(userinfo.f_user_phone,userinfo.f_userinfoid)">电话修改
           </button>
-          <button type="button" style="width: 45%;float: right" class="btn btn-primary" v-if="updateuserphone"
+          <button v-if="updateuserphone" class="btn btn-primary" style="width: 45%;float: right" type="button"
                   @click="showbiaoxinghao()">表型号修改
           </button>
         </div>
         <div class="col-xs-12">
-          <button type="button" style="width: 45%;float: left" class="btn btn-primary"
-                  v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')"
+          <button v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')" class="btn btn-primary" style="width: 45%;float: left"
+                  type="button"
                   @click="updatebiaohao(userinfo.f_meter_no,userinfo.f_userinfoid)">表号修改
           </button>
           <!--          <button  type="button"  style="width: 45%;float: right" class="btn btn-primary" v-if="updateuserphone"  @click="showbiaoxinghao()">表型号修改</button>-->
@@ -94,7 +104,7 @@
             </label>
             <span>{{ f_onsite_time }}</span>
           </div>
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group" v-if="data.f_date_leave">
+          <div v-if="data.f_date_leave" class="col-xs-12 col-sm-12 col-md-12 form-input-group">
             <label class="control-label">
               <nobr>离开时间：</nobr>
             </label>
@@ -103,19 +113,19 @@
         </div>
 
 
-        <div class="form-group" :class="style__">
-          <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../../assets/housestyle.png"
-                                                                   style="width: 20px;margin-bottom: 5px;text-align: left"
-                                                                   alt="">入户状态:</span>
+        <div :class="style__" class="form-group">
+          <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img alt=""
+                                                                   src="../../../assets/housestyle.png"
+                                                                   style="width: 20px;margin-bottom: 5px;text-align: left">入户状态:</span>
           <div :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
-            <input type="radio" name="enterstatus" v-model="f_entry_status" id="blockchec" value="封堵">封堵
-            <input type="radio" name="enterstatus" v-model="f_entry_status" id="nopeople" value="到访不遇">到访不遇
-            <input type="radio" name="enterstatus" v-model="f_entry_status" id="rejectchecck" value="拒检">拒检
-            <input type="radio" name="enterstatus" v-model="f_entry_status" id="enterhouse" value="入户">入户
-            <input v-if='userinfo.f_check_type == "非民用"' type="radio" name="enterstatus" v-model="f_entry_status"
-                   id="enterhouse" value="不营业"><span v-if='userinfo.f_check_type == "非民用"'>不营业</span>
+            <input id="blockchec" v-model="f_entry_status" name="enterstatus" type="radio" value="封堵">封堵
+            <input id="nopeople" v-model="f_entry_status" name="enterstatus" type="radio" value="到访不遇">到访不遇
+            <input id="rejectchecck" v-model="f_entry_status" name="enterstatus" type="radio" value="拒检">拒检
+            <input id="enterhouse" v-model="f_entry_status" name="enterstatus" type="radio" value="入户">入户
+            <input v-if='userinfo.f_check_type == "非民用"' id="enterhouse" v-model="f_entry_status" name="enterstatus"
+                   type="radio" value="不营业"><span v-if='userinfo.f_check_type == "非民用"'>不营业</span>
           </div>
-          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='封堵'">
+          <div v-show="f_entry_status=='封堵'" :class="style__" class="form-group col-sm-12 col-xs-12">
             <label class="text-left font">封堵照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -123,22 +133,22 @@
                      style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
                   <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                     <div class="col-sm-4">
-                      <img-self :src="f_blockcheck_path" alt="封堵照片" width="150" height="200"></img-self>
+                      <img-self :src="f_blockcheck_path" alt="封堵照片" height="200" width="150"></img-self>
                     </div>
                   </div>
-                  <div class="row text-right div-photo" :class="style__">
-                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                  <div :class="style__" class="row text-right div-photo">
+                    <button class="btn btn-primary btn-photo" name="button" type="button"
                             @click="takePic('f_blockcheck_path', '封堵照片')">拍照
                     </button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"
-                                                 @click="delfile('f_blockcheck_path', this.f_blockcheck_path)"
-                                                 style="width: 25%;"/>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img :class="style__" src="../../../assets/remove.png"
+                                                 style="width: 25%;"
+                                                 @click="delfile('f_blockcheck_path', this.f_blockcheck_path)"/>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
+          <div v-show="f_entry_status=='到访不遇'" :class="style__" class="form-group col-sm-12 col-xs-12">
             <label class="text-left font">到访不遇照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -146,22 +156,22 @@
                      style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
                   <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                     <div class="col-sm-4">
-                      <img-self :src="f_noanswer_path" alt="到访不遇照片" width="150" height="200"></img-self>
+                      <img-self :src="f_noanswer_path" alt="到访不遇照片" height="200" width="150"></img-self>
                     </div>
                   </div>
-                  <div class="row text-right div-photo" :class="style__">
-                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                  <div :class="style__" class="row text-right div-photo">
+                    <button class="btn btn-primary btn-photo" name="button" type="button"
                             @click="takePic('f_noanswer_path', '到访不遇照片')">拍照
                     </button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"
-                                                 @click="delfile('f_noanswer_path', this.f_noanswer_path)"
-                                                 style="width: 25%;"/>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img :class="style__" src="../../../assets/remove.png"
+                                                 style="width: 25%;"
+                                                 @click="delfile('f_noanswer_path', this.f_noanswer_path)"/>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='拒检'">
+          <div v-show="f_entry_status=='拒检'" :class="style__" class="form-group col-sm-12 col-xs-12">
             <label class="text-left font">拒检照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -169,55 +179,55 @@
                      style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
                   <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                     <div class="col-sm-4">
-                      <img-self :src="f_rejectcheck_path" alt="拒检照片" width="150" height="200"></img-self>
+                      <img-self :src="f_rejectcheck_path" alt="拒检照片" height="200" width="150"></img-self>
                     </div>
                   </div>
                   <div class="row text-right div-photo">
-                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                    <button class="btn btn-primary btn-photo" name="button" type="button"
                             @click="takePic('f_rejectcheck_path', '拒检照片')">拍照
                     </button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"
-                                                 @click="delfile('f_rejectcheck_path', this.f_rejectcheck_path)"
-                                                 style="width: 25%;"/>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img :class="style__" src="../../../assets/remove.png"
+                                                 style="width: 25%;"
+                                                 @click="delfile('f_rejectcheck_path', this.f_rejectcheck_path)"/>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">
+        <div v-show="f_usegas == '未使用'" :class="style__" class="form-group">
           <sapn class="text-left col-md-12 col-sm-12 col-xs-12">处置方式：</sapn>
           <div class="col-xs-12 col-sm-12 col-md-12">
-            <input type="checkbox" v-model="f_no_gas_device">无燃气具
-            <input type="checkbox" v-model="f_close_valve">关闭表前阀
-            <input type="checkbox" v-model="f_unload_battery">取下表内电池
+            <input v-model="f_no_gas_device" type="checkbox">无燃气具
+            <input v-model="f_close_valve" type="checkbox">关闭表前阀
+            <input v-model="f_unload_battery" type="checkbox">取下表内电池
           </div>
         </div>
-        <div class="auto app-text" style="margin-top: 5px;" v-if="this.$parent.$parent.role != 'view'">
+        <div v-if="this.$parent.$parent.role != 'view'" class="auto app-text" style="margin-top: 5px;">
           <div class="panel" style="padding: 60px 7px 10px 0px;">
             <div class="panel-body panel-self">
               <div v-show="false" class="row">
                 <p class="panel-title col-xs-4 text-left font">建档时间</p>
                 <p class="panel-title col-xs-8 text-left input-font">{{ newfile_date }}</p>
               </div>
-              <div class="row" v-if="last_check_state">
+              <div v-if="last_check_state" class="row">
                 <p class="panel-title col-xs-4 text-left font">上次入户状态</p>
                 <p class="panel-title col-xs-8 text-left input-font">{{ last_check_state }}</p>
               </div>
-              <div class="row" v-if="last_check_date != null && last_check_date != ''">
+              <div v-if="last_check_date != null && last_check_date != ''" class="row">
                 <p class="panel-title col-xs-4 text-left font">上次安检时间</p>
                 <p class="panel-title col-xs-8 text-left input-font">{{ 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"
-                   v-if="last_check_date != null && last_check_date != ''">安检完成</p>
-                <p class="panel-title col-xs-8 text-left input-font"
-                   v-if="last_check_date == null || last_check_date == ''">未安检</p>
+                <p v-if="last_check_date != null && last_check_date != ''"
+                   class="panel-title col-xs-8 text-left input-font">安检完成</p>
+                <p v-if="last_check_date == null || last_check_date == ''"
+                   class="panel-title col-xs-8 text-left input-font">未安检</p>
               </div>
-              <div class="row" v-if="last_check_date != null && last_check_date != ''">
+              <div v-if="last_check_date != null && last_check_date != ''" class="row">
                 <p class="panel-title col-xs-4 text-left font">上次安检结果</p>
-                <p class="panel-title col-xs-8 text-left input-font" :class="last_check_result=='正常'?'':'color-red'">
+                <p :class="last_check_result=='正常'?'':'color-red'" class="panel-title col-xs-8 text-left input-font">
                   {{ last_check_result }}</p>
                 <div v-for="data in last_check_data.data"
                      class="panel-title col-xs-offset-4 col-xs-8 text-left input-font">
@@ -232,7 +242,7 @@
       </div>
     </div>
     <div v-if="showbModal">
-      <modal :show.sync="showbModal" v-ref:modal backdrop="false">
+      <modal v-ref:modal :show.sync="showbModal" backdrop="false">
         <div slot="modal-header" class="modal-header">
           <h4 class="modal-title">
             选择表型号
@@ -241,11 +251,11 @@
         <div slot="modal-body" class="modal-body">
           <div class="col-xs-12">
 
-            <v-select :value.sync="biaoxinghao" v-model='biaoxinghao'
+            <v-select v-model='biaoxinghao' :options='gmlist'
                       :value-single="true"
-                      class="select_list select"
-                      :options='gmlist' placeholder='请选择表型号'
-                      close-on-select width="100%"></v-select>
+                      :value.sync="biaoxinghao"
+                      class="select_list select" close-on-select
+                      placeholder='请选择表型号' width="100%"></v-select>
           </div>
           <div class="col-xs-12" style="height: 10px">
 
@@ -279,7 +289,7 @@ export default {
     //tag
     this.$set('biaoxinghao', '')
   },
-  ready() {
+  async ready() {
     // this.$set('userinfo.f_meter_no',this.userinfo.planmeterss.f_meter_no)
     this.$set('beforephone', this.userinfo.f_user_phone)
     this.$set('gmlist', [])
@@ -291,10 +301,22 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      //tag + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
+    if (!this.userinfo.f_userfiles_id){
+      return
+    }
+    let result = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      data: {
+        items: '*',
+        tablename: 't_instruct',
+        condition: `f_userfiles_id  = '${this.userinfo.f_userfiles_id}' and f_instruct_state='执行成功' and f_instruct_title in ('手动关阀','手动开阀')`,
+        orderitem: 'f_instruct_date desc'
+      }
+    }, {resolveMsg: null, rejectMsg: null})
+    if (result.data.length > 0){
+      this.$set('f_info', result.data[0].f_info)
+      this.$set('f_instruct_title', result.data[0].f_instruct_title)
+    }
   },
   methods: {
     upuserinfo(userinfo) {
@@ -308,7 +330,7 @@ export default {
         f_userinfo_id: userinfo.f_userinfoid,
         f_source: '安检',
         f_check_type: userinfo.f_check_type
-      },'self',function () {
+      }, 'self', function () {
         _this.updateUserCallBack()
       })
     },
@@ -441,9 +463,9 @@ export default {
       })
     },
     delfile(prop, fileName) {
-      if (fileName == Vue.nopic)
-        return
-      else {
+      if (fileName == Vue.nopic){
+
+      } else {
         HostApp.delfile(fileName)
         this[prop] = Vue.nopic
       }

package/src/filiale/wenxi/pc/NewCheckpaper.vue

@@ -328,7 +328,7 @@
               </tbody>
             </table>
             <table class="table table-striped table-bordered"
-                   v-show="paperdata.f_entry_status=='入户'||paperdata.f_entry_status=='到访不遇' || paperdata.f_entry_status=='封堵'">
+                   v-show="paperdata.f_entry_status=='入户'||paperdata.f_entry_status=='到访不遇' || paperdata.f_entry_status=='封堵' || paperdata.f_entry_status=='不营业' ">
               <thead>
               <tr>
                 <th style="text-align: center">总体安检照片</th>

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

@@ -114,6 +114,40 @@
                           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>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="ui.f_subscribe_date > '{}'"
+              >
+              </datepicker>
+            </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>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="ui.f_subscribe_date < '{}'"
+              >
+              </datepicker>
+            </div>
 <!--            <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -178,7 +212,14 @@
                   <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_rent_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_zuhu_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>
@@ -195,6 +236,10 @@
                   <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 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_uservent_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" :style="$parent.$parent.$parent.compare(row.f_expiration_date)?'color:black':'color: red'">{{ row.f_expiration_date}}</p>

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

@@ -204,13 +204,13 @@
               </div>
               <v-select id="f_state"
                         :value.sync="model.f_last_check_state"
+                        :multiple="true"
                         class="input-font"
                         :options='$parent.$parent.last_check_states'
                         placeholder='入户状态'
                         :width="'60%'"
                         v-model="model.f_last_check_state"
-                        condition="f_last_check_state='{}'"
-                        close-on-select clear-button>
+                        condition="f_last_check_state in {}">
               </v-select>
             </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
@@ -260,7 +260,40 @@
               >
               </datepicker>
             </div>
-
+            <div class="row app-row"  v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="f_subscribe_date > '{}'"
+              >
+              </datepicker>
+            </div>
+            <div class="row app-row"  v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">首次通气时间：</label>
+              </div>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date1"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date1"
+                          class="input-font"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset"
+                          condition="f_subscribe_date < '{}'"
+              >
+              </datepicker>
+            </div>
 
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
@@ -414,6 +447,10 @@
                   <p class="panel-title col-xs-5 text-left font"><b>到访不遇次数:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_check_version }}</p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>首次通气时间:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font ">{{ row.f_subscribe_date}}</p>
+                </div>
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font"><b>保费到期时间:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font " :style="$parent.$parent.$parent.compare(row.f_expiration_date)?'color:black':'color: red'">{{ row.f_expiration_date}}</p>
@@ -961,6 +998,10 @@
           condition += " and ti.f_prearranged_date > '"+this.$refs.paged.$refs.cri.model.f_start_date + "'"
         if(this.$refs.paged.$refs.cri.model.f_end_date)
           condition += " and ti.f_prearranged_date < '"+this.$refs.paged.$refs.cri.model.f_end_date + "'"
+        if(this.$refs.paged.$refs.cri.model.f_start_date1)
+          condition += " and f_subscribe_date > '"+this.$refs.paged.$refs.cri.model.f_start_date1 + "'"
+        if(this.$refs.paged.$refs.cri.model.f_end_date1)
+          condition += " and f_subscribe_date < '"+this.$refs.paged.$refs.cri.model.f_end_date1 + "'"
         if(this.$refs.paged.$refs.cri.model.f_check_version1)
           condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version1
 
@@ -1089,7 +1130,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})

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

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