safecheck-client 3.0.33-1 → 3.0.33-101

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

@@ -212,6 +212,12 @@ div {
                   </button-link>
                 </td>
               </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">备注信息:</td>
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 50%">
+                  {{ paperdata.f_remark }}
+                </td>
+              </tr>
 
               </tbody>
             </table>

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

@@ -737,7 +737,7 @@ export default {
     },
     getGasAberrantNumber(val) {
       //tag
-      if(!this.f_table_base.index || !this.f_gas_balance.index){
+      if(!this.f_table_base.index || !this.f_gas_balance.index || !this.f_gas_aberrant_number.index){
         //tag
         return
       }

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'() {
     }
   }
 }