safecheck-client 3.0.33-16 → 3.0.33-160

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>
 

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

@@ -218,8 +218,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 550px;background: #FFFFFF">
                     <div class="img" v-for="img in paperdata.f_overall_imgs">
-                      <img-self :src="getimg(img.f_overall_path)" style="float: left" width="150"
-                                     height="200"></img-self>
+                      <img-self-android :src="getimg(img.f_overall_path)" style="float: left" width="150"
+                                     height="200"></img-self-android>
                     </div>
                   </div>
 
@@ -240,8 +240,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
                     <div class="img" style="float: none">
-                      <img-self :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
-                                height="200"></img-self>
+                      <img-self-android :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
+                                height="200"></img-self-android>
                     </div>
                   </div>
                 </td>
@@ -259,8 +259,8 @@ div {
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
                     <div class="img" style="float: none">
-                      <img-self :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
-                                height="200"></img-self>
+                      <img-self-android :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
+                                height="200"></img-self-android>
                     </div>
                   </div>
                 </td>
@@ -324,13 +324,13 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self>
+            <img-self-android v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self>
+            <img-self-android v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self-android>
           </div>
           <div class="col-md-6" v-for="item in otherDarginShowImgs">
-            <img-self v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self>
+            <img-self-android v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self-android>
           </div>
         </div>
       </div>
@@ -347,27 +347,27 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
-                           height="400"></img-self>
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
+                           height="400"></img-self-android>
           </div>
           <div class="col-md-6">
-            <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
+            <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
                            height="400"></img-self>
           </div>
         </div>

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

@@ -32,7 +32,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 paper.f_overall_imgs">
-                <img-self :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self>
+                <img-self-android :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self-android>
                 <img src="../../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path, index)"
                      style="width: 15px;margin-top: -80px" alt="">
               </div>
@@ -55,7 +55,7 @@
                style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
             <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 defectImgs">
-                <img-self :src="img" alt="总体隐患照片" :width="140" :height="170"></img-self>
+                <img-self-android :src="img" alt="总体隐患照片" :width="140" :height="170"></img-self-android>
                 <!--                <img src="../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">-->
               </div>
             </div>
@@ -150,7 +150,7 @@
                    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="paper.f_notified_path" alt="安检通知书/隐患整改通知书照片" width="150" height="200"></img-self>
+                    <img-self-android :src="paper.f_notified_path" alt="安检通知书/隐患整改通知书照片" width="150" height="200"></img-self-android>
                   </div>
                 </div>
                 <div class="row text-right div-photo">