safecheck-client 4.0.0-100 → 4.0.0-101

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

@@ -262,104 +262,29 @@
             <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="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-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>
+                  <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-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>
                 </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>
-                </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>
@@ -531,7 +456,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,
@@ -836,6 +761,7 @@ export default {
                 _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
               }).catch ((msg)=>{
                 this.noLineInspect(row)
+                this.$showMessage("网络异常,请检查网络后再试！")
               })
             }
           }else {