safecheck-client 3.0.33-13 → 3.0.33-130

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

@@ -269,15 +269,17 @@ export default {
             "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
             "累购气量":{"index":7,"type":"number","readonly":true},
             "累购金额":{"index":7,"type":"number","readonly":true},
-            "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
-            "已用金额":{"index":8,"type":"number","checkmust": false},
-            "表底数":{"index":8,"type":"number","checkmust": false},
-            "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
+            "用户累购气量":{"index":8,"type":"number","readonly":true,isshow:false},
+            "已用气量":{"index":10,"type":"number","checkmust": false},//基表数
+            "已用金额":{"index":10,"type":"number","checkmust": false},
+            "系统表底数":{"index":9,"type":"number","checkmust": false,isshow:false},
+            "表底数":{"index":10,"type":"number","checkmust": false},
+            "剩余气量":{"index":11,"type":"number","checkmust": false},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":9,"type":"number","checkmust": false},
-            "气量异常差值":{"index":10,"type":"number","readonly": true},
-            "金额异常差值":{"index":10,"type":"number","readonly": true},
-            "差值是否异常":{"index":10,"type":"selector",
+            "剩余金额":{"index":11,"type":"number","checkmust": false},
+            "气量异常差值":{"index":12,"type":"number","readonly": true},
+            "金额异常差值":{"index":12,"type":"number","readonly": true},
+            "差值是否异常":{"index":12,"type":"selector",
               "multiple": false,
               "checkmust":true,
               "options": [
@@ -293,8 +295,8 @@ export default {
                 }
               ]
             },
-            "表箱号":{"index":11,"type":"string","readonly": true},
-            "燃气表照片":{"index":12,"type":"picture","checkmust": false},
+            "表箱号":{"index":13,"type":"string","readonly": true},
+            "燃气表照片":{"index":14,"type":"picture","checkmust": false},
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         },
@@ -2176,6 +2178,16 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "用户累购气量",
+                          f_item_value: this.item.f_plan_meters[i].f_pregas,
+                          f_path: "",
+                          type: "number",
+                          isshow:false
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
@@ -2194,6 +2206,16 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "系统表底数",
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          isshow:false,
+                          f_path: "",
+                          type: "number"
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
@@ -2224,7 +2246,7 @@ export default {
                       delete this.config['燃气表']['items']['表底数']
                       delete this.config['燃气表']['items']['剩余金额']
                       delete this.config['燃气表']['items']['金额异常差值']
-                      delete this.config['燃气表']['items']['差值是否异常']
+                      delete this.config['燃气表']['items']['气量异常差值']
                       device.f_items.push(
                         {
                           f_defect_level: null,
@@ -2245,12 +2267,32 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "用户累购气量",
+                          f_item_value: this.item.f_plan_meters[i].f_pregas,
+                          f_path: "",
+                          type: "number",
+                          isshow:true
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "已用气量",
-                          f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          f_path: "",
+                          type: "number"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "系统表底数",
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          isshow:false,
                           f_path: "",
                           type: "number"
                         },
@@ -2267,10 +2309,23 @@ export default {
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
-                          f_item_name: "气量异常差值",
+                          f_item_name: "差值是否异常",
+                          checkmust:true,
                           f_item_value: null,
                           f_path: "",
-                          type: "number"
+                          type: "selector",
+                          options: [
+                            {
+                              "data": "是",
+                              "isdefect": true,
+                              "isdefault": false
+                            },
+                            {
+                              "data": "否",
+                              "isdefect": false,
+                              "isdefault": false
+                            }
+                          ]
                         }
                       )
                       //tag)
@@ -2299,6 +2354,16 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "用户累购气量",
+                          f_item_value: this.item.f_plan_meters[i].f_pregas,
+                          f_path: "",
+                          type: "number",
+                          isshow:false
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
@@ -2308,6 +2373,16 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "系统表底数",
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          isshow:true,
+                          f_path: "",
+                          type: "number"
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
@@ -2381,12 +2456,32 @@ export default {
                           f_path: "",
                           type: "number"
                         },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "用户累购气量",
+                          f_item_value: this.item.f_plan_meters[i].f_pregas,
+                          f_path: "",
+                          type: "number",
+                          isshow:false
+                        },
                         {
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "表底数",
-                          f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          f_path: "",
+                          type: "number"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "系统表底数",
+                          f_item_value: this.item.f_plan_meters[i].f_metergasnums,
+                          isshow:false,
                           f_path: "",
                           type: "number"
                         },
@@ -2463,7 +2558,7 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "已用气量",
-                        f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                        f_item_value: this.item.f_plan_meters[i].f_metergasnums,
                         f_path: "",
                         type: "number"
                       },
@@ -2520,13 +2615,17 @@ export default {
         let that = this
         let value = {}
         if (this.role == 'inspect') {
-          if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
-            value = this.$androidUtil.path({
-              alias: 'getUserinfomation',
-              data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-            })
-          } else {
-            value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+          if(this.item.f_no_checkplan != '无计划安检' ){
+            if (this.item.f_no_checkplan == '复检') {
+              value = this.$androidUtil.path({
+                alias: 'getUserinfomation',
+                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+              })
+            } else {
+              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            }
+          }else {
+            value.data =[]
           }
         } else {
           value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
@@ -2673,7 +2772,7 @@ export default {
           })
       }
     }else{
-      if(true){
+      if(this.parentPage && this.parentPage=='AddPlanItem'){
         //tag
         let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
         if (isRecodr) {

package/src/filiale/dexin/android/WebMeterOpen.vue

@@ -214,7 +214,7 @@ export default {
       this.criteriaShow = !this.criteriaShow
     },
     async selfSearch (args) {
-      args.condition = `${args.condition} and f_filialeids = '${Vue.user.f_orgids}'`
+      args.condition = `${args.condition} and f_orgid = '${Vue.user.orgid}'`
       await this.model.search(args.condition, args.model)
     },
     search () {

package/src/filiale/dexin/android/WebMeterOpenEdit.vue

@@ -85,7 +85,7 @@ import Vue from 'vue'
 
 export default {
   title: '物联网表单户开通',
-  data () {
+  data() {
     return {
       showpictrue: false,
       showd: false,
@@ -106,27 +106,22 @@ export default {
     }
   },
   props: {},
-  async ready () {
+  async ready() {
     await this.readyInit()
   },
   methods: {
-    readyInit () {
+    readyInit() {
       this.tabname = this.data.tabname
       console.log('-----------------------------------this.tabname', this.tabname)
       this.model = Object.assign({}, this.model, this.data)
-      this.model.f_gas_person=Vue.user.name
+      this.model.f_gas_person = Vue.user.name
     },
-    cameraCallBack (prop, fileName) {
+    cameraCallBack(prop, fileName) {
       HostApp.__this__.model.f_notified_path = fileName + '?' + Math.random()
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
-    // 返回回调函数
-    goback (val) {
-      this.$dispatch('backarrdel')
-      this.$back()
-    },
-    async commit () {
+    async commit() {
       if (!this.model.f_gas_person) {
         this.$showMessage(`请填写通气人`, ['confirm', 'cancel'])
         return
@@ -134,46 +129,39 @@ export default {
       let param = {
         f_user_id: this.model.f_user_id,
         f_userinfo_id: this.model.f_userinfo_id,
-        f_meternumber: this.model.f_meternumber,
-        version: this.model.version,
-        f_table_state: '正常',
         f_open_date: Util.toStandardTimeString(),
         f_open_person: Vue.user.name,
         f_comments: this.model.f_comments,
-        f_gas_person: this.model.f_gas_person,
-        f_operat_type: '开通',
-        f_describe: `${Vue.user.name}对用户${this.model.f_user_name}进行开通操作`,
         f_state: '有效',
         f_operator: Vue.user.name,
-        f_filiale: Vue.user.f_fengongsi,
-        f_outlets: Vue.user.f_parentname,
-        f_orgstr: Vue.user.orgpathstr,
-        f_filialeids: Vue.user.f_orgids,
-        userfiles: {
-          f_user_id: this.model.f_user_id,
-          f_meternumber: this.model.f_meternumber,
-          version: this.model.version,
-          f_table_state: '正常',
-          f_gas_date: Util.toStandardTimeString(),
-          f_gas_person: this.model.f_gas_person,
-          f_open_date: Util.toStandardTimeString()
-        }
+        f_operatorid: Vue.user.id,
+        f_orgname: Vue.user.orgs,
+        f_orgid: Vue.user.orgid,
+        f_depid: Vue.user.orgid,
+        f_depname: Vue.user.orgs,
+        f_meternumber: this.model.f_meternumber,
+        version: this.model.version,
+        f_table_state: '正常',
+        f_gas_date: Util.toStandardTimeString(),
+        f_gas_person: this.model.f_gas_person,
+        f_userfiles_id: this.model.f_userfiles_id
       }
       this.$showMessage(`开通前请确认表号和表类型！！！`, ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_open_meter`, param, {rejectMsg: '开通失败', resolveMsg: '开通成功'}).then(res=>(
-            this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/updateUserfiles`, param.userfiles).then((res) => {
-              if (res.data == 200){this.$back()}else {this.$showMessage('网络异常，请稍后再试')}
-            })
-          ))
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/updateUserfiles`, param).then((res) => {
+            if (res.data == 200) {
+              this.$showMessage('开通成功')
+            } else {
+              this.$showMessage('网络异常，请稍后再试')
+            }
+          })
         }
       })
-
     },
 
   },
   watch: {
-    'data' () {
+    'data'() {
     }
   }
 }