safecheck-client 4.0.1-42 → 4.0.1-44

package/src/components/android/NewCheckpaperAndroid.vue

@@ -53,11 +53,6 @@ div {
 
 <template>
   <div class="basic-main" style="height: 100%">
-    <!--    <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">-->
-    <!--      <div @click="back()">-->
-    <!--        <img src="../../assets/back.png" style="margin: 0px"/>-->
-    <!--      </div>-->
-    <!--    </div>-->
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
@@ -387,9 +382,10 @@ import Vue from 'vue'
 import * as Util from '../../components/Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {isEmpty} from "../../components/Util";
 let asyncReady = async function (self) {
   try {
-    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
+    let res = await new HttpResetClass().load('GET',`${self.$androidUtil.getProxyUrl()}/api/af-safecheck/vue`,null, {resolveMsg: null, rejectMsg: null})
     self.delConfigKey(res.data)
     Vue.config.safecheck=res.data
     Vue.config.safecheck.DevicesConfig =res.data.DevicesConfig
@@ -541,6 +537,9 @@ export default {
       })
     },
     getimg(val){
+      if(isEmpty(val)){
+        return  ''
+      }
       console.log(`${this.$androidUtil.getProxyUrl()}/${val}`)
 
       return `${this.$androidUtil.getProxyUrl()}/${val}`

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -189,6 +189,11 @@
               <input type="number" class="input_search" v-model="model.f_check_version"
                      style="width: 60%" placeholder="到访不遇次数">
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检结果</label>
+              <input style="width: 60%" type="text" class="input_search" v-model="model.f_defect_content"
+                     placeholder="安检结果" condition="f_defect_content like '%{}%'">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">

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

@@ -762,7 +762,7 @@ 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.$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("网络异常,请检查网络后再试！")

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

@@ -1171,7 +1171,7 @@ export default {
       html2pdf(element)
     },
     showAudit() {
-      var audit = this.$appdata.getSingleValue('安检审核');
+      var audit = this.$login.f.rolestr.includes('安检审核')
       if (audit == '是' && (this.item.f_approved == '未审核' || !this.item.f_approved)) {
         this.showButton = true
       }

package/src/filiale/meihekou/pc/PaperList.vue

@@ -487,7 +487,7 @@ export default {
       shouinfodata:{},
       tableBrands: [{label: '全部', value: ''}],
       audioshow: false,
-      safeAudit: this.$appdata.getSingleValue('安检审核') == '是' ? true : false,
+      safeAudit: this.$login.f.rolestr.includes('安检审核'),
       searchData: {
         condition: "1=1",
         orderitem: "f_offsite_time desc",
@@ -558,14 +558,17 @@ export default {
     showback1(){
       this.showinfo1 = true
       this.showinfo2 = false
+      this.search()
     },
     showback2(){
       this.showinfo1 = true
       this.showinfo3 = false
+      this.search()
     },
     showback3(){
       this.showinfo1 = true
       this.showinfo4 = false
+      this.search()
     },
     //气表品牌查询
     getTableBrands() {

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

@@ -317,11 +317,12 @@
           // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
           // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
           let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
-
           if(timeDiff < sixMonthsInMs){
-            this.$showMessage("该用户半年内已进行入户安检，无需再次安检",['confirm'])
-            // 超过6个月，结束方法
-            return
+            this.$showMessage('该用户半年内已进行入户安检，是否继续安检?', ['confirm', 'cancel']).then((res) => {
+              if (res !== 'confirm') {
+                return
+              }
+            })
           }
         }
         info.id = ''