safecheck-client 4.0.1-46 → 4.0.1-48

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.1-46",
+  "version": "4.0.1-48",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

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

@@ -309,7 +309,7 @@ export default {
   computed: {
     actionEnabled: {
       get() {
-        return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '拒检' || this.item.f_approved == '不通过' )) || (this.role == 'inspect' && this.item.f_complete !='已完成' &&  this.item.f_complete !='已传' )
+        return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '拒检' || this.item.f_approved == '不通过' )) || (this.role == 'inspect' && (this.item.f_complete !='已完成' ||  this.item.f_complete !='已传' ))
       }
     }
   },

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

@@ -188,7 +188,7 @@
   import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
   import * as Util from '../../Util'
-  import {toStandardTimeString} from "../../Util";
+  import {isEmpty, toStandardTimeString} from "../../Util";
 
   export default {
     title: '安检员B',
@@ -307,38 +307,57 @@
       inspect(info) {
         // 当前系统时间
         let newdate = Util.toStandardTimeString()
-        if (info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type == '民用') {
-          // 解析上次安检时间
-          let lastCheckDate = new Date(info.f_last_check_date)
-          let currentDate = new Date(newdate)
-          // 计算时间差（毫秒）
-          let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
+        if(isEmpty(info.f_last_check_date)){
+          info.id = ''
+          info.f_state = '未检'
+          info.f_no_checkplan = '无计划安检'
+          //tag
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+            //tag)
+            info['f_plan_meters'] = response.data
+            var pardate = {
+              _this: this,
+              tittle: '安检详情',
+              safe: true
+            }
+            this.$dispatch('gotoson', pardate)
+            this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+          })
+        }else {
+          if (info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type == '民用') {
+            // 解析上次安检时间
+            let lastCheckDate = new Date(info.f_last_check_date)
+            let currentDate = new Date(newdate)
+            // 计算时间差（毫秒）
+            let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
 
-          // 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', 'cancel']).then((res) => {
-              if (res == 'confirm') {
-                info.id = ''
-                info.f_state = '未检'
-                info.f_no_checkplan = '无计划安检'
-                //tag
-                this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
-                  //tag)
-                  info['f_plan_meters'] = response.data
-                  var pardate = {
-                    _this: this,
-                    tittle: '安检详情',
-                    safe: true
-                  }
-                  this.$dispatch('gotoson', pardate)
-                  this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
-                })
-              }
-            })
+            // 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', 'cancel']).then((res) => {
+                if (res == 'confirm') {
+                  info.id = ''
+                  info.f_state = '未检'
+                  info.f_no_checkplan = '无计划安检'
+                  //tag
+                  this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+                    //tag)
+                    info['f_plan_meters'] = response.data
+                    var pardate = {
+                      _this: this,
+                      tittle: '安检详情',
+                      safe: true
+                    }
+                    this.$dispatch('gotoson', pardate)
+                    this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+                  })
+                }
+              })
+            }
           }
         }
+
       },
       Mreadibook(){
         this.cbc=[]