safecheck-client 4.0.0-99 → 4.0.1-10

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

@@ -86,6 +86,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_floor" class="font text-left">楼层：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_floor" class="search_input input-font"
+                       v-model=model.f_floor condition="ti.f_floor like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -250,106 +260,28 @@
         <div partial>
           <div  class="auto app-text" style="margin-top: 5px;">
             <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_last_check_state) }">
+              <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_state,row.f_last_check_state) }">
                 <div class="col-xs-12">
-                  <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 input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}&emsp;&emsp;&emsp;&emsp;{{ row.f_user_name }}</p>
                   <p class="panel-title col-xs-2 text-left input-font" style="width: 5%;float:right">
                     <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
                   </p>
                 </div>
-                <div class="col-xs-12">
-                  <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" style="width: 79%">{{ row.f_user_name }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <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_user_type }}
-                  </p>
-                </div>
                 <div class="col-xs-6">
-                  <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_plan_name }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <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_residential_area }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
                   <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_user_phone }}
                     <img src="../../../assets/phone.png" style="width: 6%"
                          v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone)'/>
                   </p>
                 </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>备用电话:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_rent_phone}}
-                    <img v-if="row.f_rent_phone" src="../../../assets/phone.png" style="width: 6%"
-                         v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_rent_phone)'/>
-                  </p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>租户电话:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_zuhu_phone }}
-                    <img v-if="row.f_zuhu_phone" src="../../../assets/phone.png" style="width: 6%"
-                         v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'/>
-                  </p>
-                </div>
-
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_address }}</p>
-                </div>
-
-                <!--                <div class="row">-->
-                <!--                  <p class="panel-title col-xs-4 text-left font">计划年份</p>-->
-                <!--                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_year }}</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_plan_month }}</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_prearranged_date }}</p>-->
-                <!--                </div>-->
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font"><b>上次安检状态:</b></p>
-                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='入户'" >{{ row.f_last_check_state }}</p>
-                </div>
                 <div class="col-xs-6">
-                  <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_state }}</p>
+                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_unit}}单元{{ row.f_floor}}楼{{ row.f_room}}室</p>
                 </div>
                 <div class="col-xs-6">
-                  <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_upload_state }}</p>
-                </div>
-                <div class="col-xs-12" v-if="row.f_prearranged_date !=null">
-                  <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" style="width: 79%">{{ row.f_prearranged_date }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{row.f_state==='未检'? row.f_state:row.f_last_check_state}}</p>
                 </div>
                 <div class="col-xs-6">
-                  <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_safecheck_type }}</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_check_version }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <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_approved }}</p>
-                </div>
-                <div class="col-xs-6" v-show="row.f_approved == '不通过'">
-                  <p class="panel-title col-xs-5  text-left font" style="color: red;"><b>未通过原因:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_approved_note }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</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">{{timeSet(row.f_issue_time)}}</p>-->
-                <!--</div>-->
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">处理</button>
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right;margin-right:10px;" @click="$parent.$parent.$parent.queryplan(row.id)">转发</button>
@@ -521,7 +453,7 @@ export default {
       check:'',
       plan:'',
       planid:'',
-      model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+      model:Vue.android? new LocalPagedList('androidGetuserinfo',50,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
       showModal: false,
       showModal2:false,
       showModal3:false,
@@ -600,12 +532,19 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
-    getLastCheckStateStyle(state){
-      switch(state) {
-        case '入户': return '#00ff71'
-        case '拒检': return '#00f3ff'
-        case '到访不遇': return '#fff600'
-        default: return 'transparent'
+    getLastCheckStateStyle(state, f_last_check_state) {
+      if (state === '未检') {
+        return 'transparent';
+      }
+      switch(f_last_check_state) {
+        case '入户':
+          return '#00ff71';
+        case '拒检':
+          return '#00f3ff';
+        case '到访不遇':
+          return '#fff600';
+        default:
+          return 'transparent';
       }
     },
     scan(){
@@ -823,9 +762,10 @@ export default {
                 }
                 _this.$dispatch('gotoson',pardate)
                 //tag
-                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
+                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self')
               }).catch ((msg)=>{
                 this.noLineInspect(row)
+                this.$showMessage("网络异常,请检查网络后再试！")
               })
             }
           }else {
@@ -893,6 +833,8 @@ export default {
       //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
       if(this.$refs.paged.$refs.cri.model.f_userinfo_code)
         condition += " and ti.f_userinfo_code like '%"+this.$refs.paged.$refs.cri.model.f_userinfo_code+"%'"
+      if(this.$refs.paged.$refs.cri.model.f_floor)
+        condition += " and ti.f_floor like '%"+this.$refs.paged.$refs.cri.model.f_floor+"%'"
       if(this.$refs.paged.$refs.cri.model.f_keyword)
         condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
       if(this.$refs.paged.$refs.cri.model.f_user_name)

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

@@ -14,10 +14,14 @@
       </div>
       <div class="col-md-12 col-sm-12 col-xs-12">
         <ol class="showIi">
-          <li>1.燃气设施全景</li>
-          <li>2.燃气表照片</li>
-          <li>3.灶具照片</li>
-          <li>4.其他照片</li>
+          <li>1.表前阀+表+年检照片上传</li>
+          <li>2.楼板处拍照上传</li>
+          <li>3.灶前阀+安全阀+连接灶具管照片上传</li>
+          <li>4.灶具接口照片上传</li>
+          <li>5.安全宣传单+灶具炉头照片上传</li>
+          <li>6.热水连接三通拍照上传</li>
+          <li>7.热水器阀门+全景照片上传</li>
+          <li>8.安检单拍照上传</li>
         </ol>
       </div>
     </div>
@@ -29,8 +33,8 @@
           <div class="panel-body panel-self" 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 paper.f_overall_imgs">
-                <img-self :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self>
-                <img src="../../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">
+                <img src="../../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;" alt="">
+                <img-self-android :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self-android>
               </div>
             </div>
             <div class="row text-left div-photo">
@@ -66,7 +70,7 @@
           <div class="panel-body panel-self" 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>
@@ -153,7 +157,7 @@
               <div class="panel-body panel-self" 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">
@@ -1473,12 +1477,12 @@ export default {
   text-align:left;
 }
 .font{
-  font: 15px PingFang-SC-Medium;
+  font: 16px PingFang-SC-Medium;
   color: #333333;
 }
 .showIi{
-  font: 14px PingFang-SC-Medium;
-  color: #666666;
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
 }
 .info{
   margin-top: 15px;