safecheck-client 4.0.1-48 → 4.0.1-49

package/package.json

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

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

@@ -307,7 +307,7 @@
       inspect(info) {
         // 当前系统时间
         let newdate = Util.toStandardTimeString()
-        if(isEmpty(info.f_last_check_date)){
+        if(isEmpty(info.f_last_check_date) || info.f_user_type == '非民用'){
           info.id = ''
           info.f_state = '未检'
           info.f_no_checkplan = '无计划安检'
@@ -354,6 +354,22 @@
                   })
                 }
               })
+            }else{
+              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)
+              })
             }
           }
         }

package/src/main.js

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