safecheck-client 4.0.0-55 → 4.0.0-57

package/src/filiale/meihekou/android/MeterReading.vue

@@ -1,106 +1,106 @@
-<template>
-  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
-    <div class="panel panel-default auto repair-info-content">
-      <div class="panel-body">
-        <div class="auto repair-info-content compatible">
-          <div class="row auto">
-            <!-- 上期抄表时间 -->
-            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">上期抄表时间</label>
-              <input v-model="meterData.f_operate_date" class="form-control" readonly
-                     onkeyup="value=value.replace(/[^\d\.]/g,'')" type="text">
-            </div>
-
-            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">上期底数</label>
-              <input v-model="meterData.f_tablebase" class="form-control"
-                     onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
-            </div>
-
-            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">上期结余</label>
-              <input v-model="meterData.f_curbalance" class="form-control"
-                     onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
-            </div>
-
-            <!-- 上次抄表结果状态 -->
-            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">上次抄表结果状态</label>
-              <input v-model="meterData.f_hand_state " class="form-control" readonly type="text">
-            </div>
-
-            <!-- 本期底数 -->
-            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">本期底数</label>
-              <input v-model="service.f_new_tablebase" class="form-control"
-                     onkeyup="value=value.replace(/[^\d\.]/g,'')" type="text">
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { HttpResetClass } from "vue-client"
-
-
-export default {
-  title: '抄表信息',
-  props: {
-    service: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      meterData:{}
-    }
-  },
-  methods: {},
-
-  ready() {
-    if (this.service.f_userinfoid){
-      let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
-        data: {
-          items: 'a.*',
-          tablename: 't_handplan a left join (select f_userinfo_id,max(id) as id from t_handplan group by f_userinfo_id) b on a.id = b.id',
-          condition: `b.f_userinfo_id = '${this.service.f_userinfoid}'`,
-          orderitem: 'a.id'
-        }
-      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        this.meterData = res.data[0]
-
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.form-input-group {
-  margin-bottom: 15px;
-
-  label {
-    padding-left: 8px;
-    border: none;
-    border-left: 5px solid #A2C2EB;
-    width: 110px;
-    text-align: left;
-  }
-
-  input[readonly] {
-    background-color: #f5f5f5;
-    cursor: not-allowed;
-  }
-}
-
-.repair-bg {
-  background-color: #fff;
-}
-
-.repair-info-content {
-}
-</style>
+<template>
+  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
+    <div class="panel panel-default auto repair-info-content">
+      <div class="panel-body">
+        <div class="auto repair-info-content compatible">
+          <div class="row auto">
+            <!-- 上期抄表时间 -->
+            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+              <label class="lb-left text-justify">上期抄表时间</label>
+              <input v-model="meterData.f_operate_date" class="form-control" readonly
+                     onkeyup="value=value.replace(/[^\d\.]/g,'')" type="text">
+            </div>
+
+            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+              <label class="lb-left text-justify">上期底数</label>
+              <input v-model="meterData.f_tablebase" class="form-control"
+                     onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
+            </div>
+
+            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+              <label class="lb-left text-justify">上期结余</label>
+              <input v-model="meterData.f_curbalance" class="form-control"
+                     onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
+            </div>
+
+            <!-- 上次抄表结果状态 -->
+            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+              <label class="lb-left text-justify">上次抄表结果状态</label>
+              <input v-model="meterData.f_hand_state " class="form-control" readonly type="text">
+            </div>
+
+            <!-- 本期底数 -->
+            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
+              <label class="lb-left text-justify">本期底数</label>
+              <input v-model="service.f_new_tablebase" class="form-control"
+                     onkeyup="value=value.replace(/[^\d\.]/g,'')" type="text">
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { HttpResetClass } from "vue-client"
+
+
+export default {
+  title: '抄表信息',
+  props: {
+    service: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      meterData:{}
+    }
+  },
+  methods: {},
+
+  ready() {
+    if (this.service.f_userinfoid){
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: 'a.*',
+          tablename: 't_handplan a left join (select f_userinfo_id,max(id) as id from t_handplan group by f_userinfo_id) b on a.id = b.id',
+          condition: `b.f_userinfo_id = '${this.service.f_userinfoid}'`,
+          orderitem: 'a.id'
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.meterData = res.data[0]
+
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.form-input-group {
+  margin-bottom: 15px;
+
+  label {
+    padding-left: 8px;
+    border: none;
+    border-left: 5px solid #A2C2EB;
+    width: 110px;
+    text-align: left;
+  }
+
+  input[readonly] {
+    background-color: #f5f5f5;
+    cursor: not-allowed;
+  }
+}
+
+.repair-bg {
+  background-color: #fff;
+}
+
+.repair-info-content {
+}
+</style>

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

@@ -188,7 +188,7 @@ export default {
       show_torepair: false,
       onlySave:true, //判断保存还是保存并上传
       livedispose:'',
-      refuseinspection:'', // 拒捡拍照是否提示
+      refuseinspection:'', // 拒检拍照是否提示
       notencountered:'',  // 到访不遇拍照是否提示
       startClick:false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
@@ -338,7 +338,7 @@ export default {
   computed: {
     actionEnabled: {
       get() {
-        return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '拒捡' || this.item.f_approved == '不通过' )) || (this.role == 'inspect' && this.item.f_state !='已检' && this.item.f_complete !='已完成' &&  this.item.f_complete !='已传' )
+        return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '拒检' || this.item.f_approved == '不通过' )) || (this.role == 'inspect' && this.item.f_state !='已检' && this.item.f_complete !='已完成' &&  this.item.f_complete !='已传' )
       }
     }
   },
@@ -466,6 +466,7 @@ export default {
         f_remarks:this.selectData.f_remarks,
         f_repairtype:this.selectData.f_repairtype,
         f_finish_date:this.selectData.f_finish_date,
+        dispatchType: this.selectData.dispatchType,
         f_attendant: Vue.user.name,
         loginUser:{name:Vue.user.name,ename:Vue.user.id,id:Vue.user.id},
       }
@@ -709,7 +710,7 @@ export default {
       if(Vue.android && this.data.f_entry_status == '到访不遇' && this.notencountered && (this.data.f_noanswer_path == Vue.nopic || this.data.f_noanswer_path == ''))
         return  '到访不遇必须拍照'
       if(Vue.android && this.data.f_entry_status == '拒检' && this.refuseinspection && (this.data.f_rejectcheck_path == Vue.nopic || this.data.f_rejectcheck_path == ''))
-        return  '拒捡必须拍照'
+        return  '拒检必须拍照'
     },
     verifyUser() {
       let prefix = '用户基本信息：'