safecheck-client 3.0.32 → 3.0.33-11

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -44,6 +44,17 @@
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title text-left font" style="width: 23%;float: left"><b>使用类型:</b></p>
+          <v-select
+                     :value.sync="f_usetype"
+                     v-model="f_usetype"
+                     width="67%"
+                     placeholder='请选择'
+                     :value-single="true"
+                     :options="f_usetypes"
+                     clear-button></v-select>
+        </div>
         <div class="col-xs-12" style="margin-left: 20px">
           <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
           <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
@@ -914,6 +925,12 @@
       RadioGroup,
       Radio
     },
+    computed: {
+      // 使用类型
+      f_usetypes() {
+        return this.$appdata.getParam('使用类型')
+      }
+    },
   }
 </script>
 

package/src/filiale/Util.js

@@ -20,6 +20,13 @@ export function getAttendanceState(item, timeToWork, timeToGo) {
     item.f_state = '正常'
 }
 
+export function dateAddDay (date, day) {
+  date.setDate(date.getDate() + Number.parseInt(day));
+  let month = date.getMonth()+1
+  let date2 = date.getDate()
+  return date.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date2<10? '0'+ date2 : date2)
+}
+
 // 字符串进行解密
 export function uncompileStr (code) {
   code = unescape(code)

package/src/filiale/ankangyihua/android/AndroidDefectDeal.vue

@@ -491,7 +491,7 @@
       commitDealDefect() {
         //tag
         //tag)
-        debugger
+
         if(this.deal.result.f_rect_methods==''){
          this.$showMessage('请选择整改方式')
           return

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

@@ -862,7 +862,7 @@
 
         //tag
         this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
-        debugger
+
 
       },
       getNewOrder(){

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();"})

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

@@ -751,6 +751,9 @@
                       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) {
+                        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 + "选中必须选择处理方式"
+                      }
                     }
                   }
                 }

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

@@ -1823,7 +1823,7 @@ export default {
     }
   },
   ready() {
-    debugger
+
     if (this.item.f_check_type == '非民用'){
       this.config = this.config3
     }