safecheck-client 3.0.33-8 → 3.0.33-81

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -293,7 +293,7 @@ export default {
       // 5秒后启用点击事件
       setTimeout(function(){
         $("#savebut").removeClass("noclickbut");
-      },10000);
+      },5000);
     },
     showRepair(){
       this.showModal2=true

package/src/components/rongcheng/report/CheckPlanAreaList.vue

@@ -226,7 +226,7 @@
       this.nameForSql = ['f_plan_month', 'f_residential_area','f_plan_name']
       this.groupNameForSql = 'f_plan_month,f_residential_area,f_plan_name'
       this.f_check_start=Util.toStartDateYearString()
-      this.search()
+      // this.search()
       this.initstreets()
     },
     methods: {
@@ -257,8 +257,6 @@
       },
       search () {
         this.$refs.paged.$refs.cri.search()
-        this.$dispatch('search')
-
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)

package/src/filiale/Util.js

@@ -20,6 +20,11 @@ export function getAttendanceState(item, timeToWork, timeToGo) {
     item.f_state = '正常'
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
+
 export function dateAddDay (date, day) {
   date.setDate(date.getDate() + Number.parseInt(day));
   let month = date.getMonth()+1

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

@@ -154,7 +154,8 @@
                 </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_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font" style="width: 77%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
+                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img></p>
                 </div>
 
                 <div class="row">
@@ -253,6 +254,9 @@
       }
     },
     methods:{
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
       scan(){
         HostApp.__this__=this,
           HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
@@ -300,6 +304,9 @@
         })
         //tag
       },
+      selfSearch(){
+        this.$refs.paged.$refs.cri.search()
+      },
       inspect (info){
         if(info.f_last_check_date){
           this.$showMessage("该用户最后一次安检时间为 "+info.f_last_check_date+" 是否继续对该用户进行安检",['confirm', 'cancel']).then((butt)=>{
@@ -317,7 +324,8 @@
                   safe:true
                 }
                 this.$dispatch('gotoson',pardate)
-                this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
+                let _this = this
+                this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', function(){_this.selfSearch()})
 
               })
             }
@@ -336,7 +344,8 @@
               safe:true
             }
             this.$dispatch('gotoson',pardate)
-            this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
+            let _this = this
+            this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', function(){_this.selfSearch()})
 
           })
         }

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -426,7 +426,8 @@
           deps:Vue.user.deps,
           depids:Vue.user.depids,
           f_remarks:this.selectData.f_remarks,
-          f_repairtype:this.selectData.f_repairtype,
+          f_repairtype:'安检',
+          f_servicetype:'安检维修',
           f_attendant: Vue.user.name,
           loginUser:{name:Vue.user.name,ename:Vue.user.id,id:Vue.user.id},
         }
@@ -747,10 +748,13 @@
                       }
                     }
                     //检查安检下拉结果
-                    if (this.data[device][item].f_items[i].type == 'selector' || this.data[device][item].f_items[i].type == 'radio') {
+                    if (this.data[device][item].f_items[i].type == 'selector' || this.data[device][item].f_items[i].type == 'radio' || this.data[device][item].f_items[i].type == 'checkbox') {
                       if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_path == Vue.nopic) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须拍照"
                       }
+                      if (this.data[device][item].f_items[i].f_is_defect == true && (!this.data[device][item].f_items[i].f_deal_dispose || this.data[device][item].f_items[i].f_deal_dispose == '未处理')) {
+                        return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须选择处理方式"
+                      }
                     }
                   }
                 }
@@ -2519,19 +2523,19 @@
           if (value.data.length != 0) {
             that.$set('data', value.data[0])
             //tag)
-            if (this.data.f_collection_type == '按气量' && this.data.f_user_type == '民用') {
+            if (this.data.f_collection_type == '按气量' && (this.data.f_user_type == '民用' || this.data.f_check_type == '民用')) {
               delete this.config['燃气表']['items']['累购金额']
               delete this.config['燃气表']['items']['已用金额']
               delete this.config['燃气表']['items']['剩余金额']
               delete this.config['燃气表']['items']['金额异常差值']
-            } else if (this.data.f_collection_type == '按金额' && this.data.f_user_type == '民用') {
+            } else if (this.data.f_collection_type == '按金额' && (this.data.f_user_type == '民用' || this.data.f_check_type == '民用')) {
               delete this.config['燃气表']['items']['累购气量']
               delete this.config['燃气表']['items']['已用气量']
               delete this.config['燃气表']['items']['剩余气量']
               delete this.config['燃气表']['items']['气量异常差值']
             }
 
-            if (this.data.f_user_type == '非民用'){
+            if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
               that.config = that.config2
             }