safecheck-client 4.0.0-11 → 4.0.0-111

package/src/filiale/meihekou/pc.js

@@ -0,0 +1,13 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
+  'new-check-paper-temp': (resolve) => { require(['./pc/NewCheckpaperTemp'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/pingxiang/android/PaperFeedback.vue

@@ -1065,7 +1065,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1123,7 +1123,7 @@ export default {
         limit_times = Vue.config.safecheck.ApproveConfig.limit_times
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,

package/src/filiale/qianneng/android/PaperFeedback.vue

@@ -1109,7 +1109,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1161,7 +1161,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             data:this.$parent.$parent.data,
             item:this.$parent.$parent.data.item,

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")