safecheck-client 3.0.30-8 → 3.0.30-80

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

@@ -4,7 +4,6 @@
       <div class="panel-body panel-self">
         <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>
-          <!--<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 @click="searchHistory(userinfo.f_userinfoid)" style="color: #00b3ee;text-decoration:none;">{{ userinfo.f_userinfo_code }}</label><label v-if="upUserinfoSta=='是'" style="color: #00b3ee;text-decoration:none;" @click="upuserinfo(userinfo.f_userinfoid)">信息变更</label>
           </p>
@@ -21,18 +20,7 @@
         <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>
           <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}" 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>-->
-<!--          <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_meters?userinfo.f_meters[0].f_rent_phone:null}}" v-model="userinfo.f_rent_phone"/>-->
-
-<!--        </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"/>-->
-
-<!--        </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 text-left input-font" style="width: 79%">{{ userinfo.f_residential_area }}</p>
@@ -52,7 +40,6 @@
         </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=='机表')"  @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>-->
         </div>
       </div>
       <div class="panel-body">
@@ -83,15 +70,20 @@
             <label class="text-left font">到访不遇照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
-                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                <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="f_noanswer_path" alt="到访不遇照片" width="150" height="200"></img-self>
+                    <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 src="../../../assets/删除.png" @click="delfile('f_noanswers_path', img.f_noanswer_path,index)"
+                           style="width: 15px;margin-top: -80px" alt="">
                     </div>
                   </div>
                   <div class="row text-right div-photo" :class="style__">
-                    <button type="button" name="button" class="btn btn-primary btn-photo" @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%;"></img>
+                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                            @click="takePic('f_noanswers_path', '到访不遇照片')">拍照
+                    </button>
                   </div>
                 </div>
               </div>
@@ -101,15 +93,20 @@
             <label class="text-left font">拒检照片：</label>
             <div class="auto">
               <div class="panel" style="padding: 10px 10px 5px 10px;">
-                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                <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="f_rejectcheck_path" alt="拒检照片" width="150" height="200"></img-self>
+                    <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 src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
+                           style="width: 15px;margin-top: -80px" alt="">
                     </div>
                   </div>
-                  <div class="row text-right div-photo">
-                    <button type="button" name="button" class="btn btn-primary btn-photo" @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%;"></img>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo"
+                            @click="takePic('f_rejectchecks_path', '拒检照片')">拍照
+                    </button>
                   </div>
                 </div>
               </div>
@@ -310,23 +307,6 @@ export default {
         }
       })
     },
-    // updatePhones(f_rent_phone,f_userinfo_id){
-    //   this.$showMessage("将用户 "+this.userinfo.f_meters[0].f_rent_phone+"的电话号码从"+this.beforesphone+"修改为"+f_rent_phone,['confirm', 'cancel']).then((butt)=>{
-    //     if(butt=="confirm"){
-    //       let https = new HttpResetClass()
-    //       https.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdatePhone`, {
-    //         f_rent_phone:f_rent_phone,
-    //         f_userinfo_id: f_userinfo_id,
-    //       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-    //         if(res.data.code == 200){
-    //           this.$showMessage('修改成功！')
-    //         }else{
-    //           this.$showMessage('修改失败！,网络异常')
-    //         }
-    //       })
-    //     }
-    //   })
-    // },
     upuserinfo(f_userinfo_id) {
       this.$dispatch('gotoson', {
         _this: this.$parent.$parent,
@@ -344,9 +324,20 @@ export default {
       //tag
       this.$parent.$parent.$goto('phone-sell-info-xin', {f_userinfo_id: f_userinfo_id})
     },
-    cameraCallBack(prop, fileName) {
-      HostApp.__this__.$set(prop, fileName + '?' + Math.random())
-      //tag
+    cameraCallBack (prop, fileName) {
+      if (prop == 'f_noanswers_path') {
+        let f_noanswer_path = fileName + '?' + Math.random()
+        HostApp.__this__.f_noanswers_path.push({
+          f_noanswer_path: f_noanswer_path
+        })
+      } else if (prop == 'f_rejectchecks_path') {
+        let f_rejectcheck_path = fileName + '?' + Math.random()
+        HostApp.__this__.f_rejectchecks_path.push({
+          f_rejectcheck_path: f_rejectcheck_path
+        })
+      }else {
+        HostApp.__this__.$set(prop, fileName + '?' + Math.random())
+      }
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
@@ -355,10 +346,24 @@ export default {
       HostApp.__this__ = this
       //tag
       let fileName
-      if (!this[prop] || this[prop].includes("nopic.png")) {
+      if (prop == 'f_noanswers_path') {
+        //tag
+        if (this.f_noanswers_path.length == 3) {
+          return
+        }
         fileName = Util.guid() + '-' + prop + '.jpg'
-      } else {
+      } else if (prop == 'f_rejectchecks_path') {
+        //tag
+        if (this.f_rejectchecks_path.length == 3) {
+          return
+        }
+        fileName = Util.guid() + '-' + prop + '.jpg'
+      }else {
+        if (!this[prop] || this[prop].includes('nopic.png')) {
+        fileName = Util.guid() + '-' + prop + '.jpg'
+       } else {
         fileName = Util.getFileName(this[prop])
+       }
       }
       HostApp._open_a_page({
         type: 'boomerang',
@@ -371,12 +376,20 @@ export default {
         }
       })
     },
-    delfile(prop, fileName) {
-      if (fileName == Vue.nopic)
+    delfile (prop, fileName, index) {
+      if (fileName == Vue.nopic) {
         return
-      else {
-        HostApp.delfile(fileName)
-        this[prop] = Vue.nopic
+      } else {
+        if (prop == 'f_noanswers_path') {
+          this.f_noanswers_path.splice(index, 1)
+          HostApp.delfile(fileName)
+        }else if (prop == 'f_rejectchecks_path') {
+          this.f_rejectchecks_path.splice(index, 1)
+          HostApp.delfile(fileName)
+        } else {
+          HostApp.delfile(fileName)
+          this[prop] = Vue.nopic
+        }
       }
     },
     setEntryClass(val) {
@@ -461,10 +474,85 @@ export default {
       }
       if (!this.f_nongasuser_path)
         this.$set('f_nongasuser_path', '')
-      if (!this.f_noanswer_path)
+      //到访多张照片
+      this.$set('f_noanswers_path', [])
+      if (this.f_noanswer_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer_path})
+      } else {
         this.$set('f_noanswer_path', '')
-      if (!this.f_rejectcheck_path)
+      }
+      if (this.f_noanswer1_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer1_path})
+      } else {
+        this.$set('f_noanswer1_path', '')
+      }
+      if (this.f_noanswer2_path) {
+        this.f_noanswers_path.push({f_noanswer_path: this.f_noanswer2_path})
+      } else {
+        this.$set('f_noanswer2_path', '')
+      }
+      //拒检多张照片
+      this.$set('f_rejectchecks_path', [])
+      if (this.f_rejectcheck_path) {
+        this.f_rejectchecks_path.push({f_rejectcheck_path: this.f_rejectcheck_path})
+      } else {
         this.$set('f_rejectcheck_path', '')
+      }
+      if (this.f_rejectcheck1_path) {
+        this.f_rejectchecks_path.push({f_rejectcheck_path: this.f_rejectcheck1_path})
+      } else {
+        this.$set('f_rejectcheck1_path', '')
+      }
+      if (this.f_rejectcheck2_path) {
+        this.f_rejectchecks_path.push({f_rejectcheck_path: this.f_rejectcheck2_path})
+      } else {
+        this.$set('f_rejectcheck2_path', '')
+      }
+
+      this.$watch('f_noanswers_path.length', () => {
+        //tag)
+        for (let i = 0; i < 3; i++) {
+
+          if (this.f_noanswers_path[i] && this.f_noanswers_path[i].f_noanswer_path) {
+            //tag)
+            if (i == 0) {
+              this.f_noanswer_path = this.f_noanswers_path[i].f_noanswer_path
+            } else {
+              this['f_noanswer' + i + '_path'] = this.f_noanswers_path[i].f_noanswer_path
+            }
+          } else {
+            //tag)
+            if (i == 0) {
+              this.f_noanswer_path = null
+            } else {
+              this['f_noanswer' + i + '_path'] = null
+            }
+          }
+        }
+        //tag
+      })
+      this.$watch('f_rejectchecks_path.length', () => {
+        //tag)
+        for (let i = 0; i < 3; i++) {
+
+          if (this.f_rejectchecks_path[i] && this.f_rejectchecks_path[i].f_rejectcheck_path) {
+            //tag)
+            if (i == 0) {
+              this.f_rejectcheck_path = this.f_rejectchecks_path[i].f_rejectcheck_path
+            } else {
+              this['f_rejectcheck' + i + '_path'] = this.f_rejectchecks_path[i].f_rejectcheck_path
+            }
+          } else {
+            //tag)
+            if (i == 0) {
+              this.f_rejectcheck_path = null
+            } else {
+              this['f_rejectcheck' + i + '_path'] = null
+            }
+          }
+        }
+        //tag
+      })
 
 
       this.$watch('f_usegas', (val) => {
@@ -477,9 +565,15 @@ export default {
 
         if (val == '到访不遇') {
           this.f_rejectcheck_path = Vue.nopic
+          this.f_rejectcheck1_path = Vue.nopic
+          this.f_rejectcheck2_path = Vue.nopic
+          this.f_rejectchecks_path = []
         }
         if (val == '拒检') {
           this.f_noanswer_path = Vue.nopic
+          this.f_noanswer_path1 = Vue.nopic
+          this.f_noanswer_path2 = Vue.nopic
+          this.f_noanswers_path = []
         }
 
         if (val != '入户') {
@@ -510,6 +604,10 @@ export default {
           this.$set('f_cookers', [])
           this.$set('f_heaters', [])
           this.$set('f_furnaces', [])
+        } else {
+          this.f_rejectcheck_path = Vue.nopic
+          this.f_noanswer_path = Vue.nopic
+          this.f_novisit_reason = null
         }
       })
     }

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

@@ -380,6 +380,16 @@ div {
             <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3" width="300"
                            height="400"></img-self-safe>
           </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
+                           :src="showimg5" width="300"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
+                           :src="showimg6" width="300"
+                           height="400"></img-self-plus>
+          </div>
           <div class="col-md-6">
             <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4" width="300"
                            height="400"></img-self-safe>
@@ -479,6 +489,8 @@ export default {
       showimg2: '',
       showimg3: '',
       showimg4: '',
+      showimg5: '',
+      showimg6: '',
       startClick: false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
       checkResult: {},//查询结果
@@ -684,6 +696,8 @@ export default {
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
+      this.showimg5 = this.data.f_noanswer1_path
+      this.showimg6 = this.data.f_noanswer2_path
       this.showimg4 = this.data.f_rejectcheck_path
       this.paperdata = this.data
       this.loading = false

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck('yangchunboneng');
+safecheck('tongchuan');
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')

package/src/safecheck.js

@@ -869,6 +869,18 @@ export default function (filiale) {
   Vue.component('defect-deal', (resolve) => {
     require(['./components/pc/DefectDeal'], resolve)
   })
+  Vue.component('paper-edit', (resolve) => {
+    require(['./components/pc/PaperEdit'], resolve)
+  })
+  Vue.component('edit', (resolve) => {
+    require(['./components/pc/Edit'], resolve)
+  })
+  Vue.component('print-data-safe', (resolve) => {
+    require(['./components/pc/PrintData'], resolve)
+  })
+  Vue.component('print-table-safe', (resolve) => {
+    require(['./components/pc/PrintTable'], resolve)
+  })
 
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp