safecheck-client 4.0.0-63 → 4.0.0-65

package/src/filiale/meihekou/android.js

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

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

@@ -1819,19 +1819,13 @@ export default {
                 if (typeof this.deviceconfig==='string'){
                   this.deviceconfig=JSON.parse(this.deviceconfig)
                 }
-                //tag)
               }
-              if (this.data.f_collection_type == '按金额' && this.data.f_meter_type != '物联网表') {
-                let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
-                //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-                //tag)
-              } else if(this.data.f_collection_type == '按气量' &&this.data.f_meter_type!= '物联网表'){
-                let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
+              if (this.data.f_collection_type == '按金额' && this.item.f_meter_type != '物联网表') {
+                this.deviceconfig["燃气表"].items = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
+              } else if(this.data.f_collection_type == '按气量' && this.item.f_meter_type!= '物联网表'){
+                this.deviceconfig["燃气表"].items = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
               } else {
-                let aaa = Object.assign({}, this.config3["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
+                this.deviceconfig["燃气表"].items = Object.assign({}, this.config3["燃气表"].items, this.deviceconfig["燃气表"].items)
               }
               this.deviceconfig2 = ObjConfig.getObjConfig(this.deviceconfig)
               this.deviceconfig2[0].items = jsonSort(this.deviceconfig2[0].items, "index")