safecheck-client 4.0.0-74 → 4.0.0-76

package/package.json

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

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

@@ -958,7 +958,7 @@ export default {
       if (this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version <= " + this.$refs.paged.$refs.cri.model.f_check_version
       //tag
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {
@@ -1087,8 +1087,8 @@ export default {
       } else {
         if (this.$refs.paged.$refs.cri.model.f_plan_name){
           condition += " and f_plan_name = '" + this.$refs.paged.$refs.cri.model.f_plan_name + "'"
-        }else {
-          condition = ' 1 != 1'
+        } else {
+          condition = ' 1 != 1 '
         }
       }
       let tjData = {
@@ -1097,8 +1097,11 @@ export default {
         condition: condition,
         orderitem: '1'
       }
-      let resultTj = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_OrderBy', 'criteria': tjData}})
-      if (resultTj.code==200){
+      let resultTj = HostApp._executeTask({
+        'type': 'sql',
+        'data': {'alias': 'safe_singleTable_OrderBy', 'criteria': tjData}
+      })
+      if (resultTj.code == 200) {
         const stat = resultTj.data.rows[0];
         this.planTotal = stat.total_items || 0;
         this.notVisited = stat.no_answer_count || 0;

package/src/filiale/jinhong/pc/android.js

@@ -0,0 +1,12 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
+  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) }
+}
+exports.specialComp = specialComp
+