safecheck-client 3.0.33-1 → 3.0.33-100

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

@@ -900,7 +900,7 @@ export default {
       this.f_items[this.f_measurement_error.index].f_item_value = this.f_items[this.f_mechanical_reading.index].f_item_value - this.f_items[this.f_electronic_reading.index].f_item_value
       this.f_items[this.f_measurement_error.index].f_item_value = this.f_items[this.f_measurement_error.index].f_item_value.toFixed(3)
       if (isNaN(this.f_items[this.f_measurement_error.index].f_item_value)) {
-        this.f_items[this.f_meter_aberrant_number1.index].f_item_value = null
+        this.f_items[this.f_measurement_error.index].f_item_value = null
       }
       // 计算差值是否在范围内
       //tag)

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

@@ -89,12 +89,12 @@
           <div class="row" style="margin-top: 10px" v-if="row.f_repair_data.dispatchType == '派发给维修员'">
             <label class="font_normal_body">维&ensp;修&ensp;员</label>
             <v-select :value.sync="row.f_repair_data.f_repairman" :value-single="true" :options='repairers'
-                      placeholder='请选择维修员' close-on-select></v-select>
+                      placeholder='请选择' close-on-select></v-select>
           </div>
           <div class="row" style="margin-top: 10px" v-if="row.f_repair_data.dispatchType == '派发给站点'">
             <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
             <v-select :value-single="true" :value.sync="row.f_repair_data.selectedStation" @change="selectclick(row)"
-                      :options='childrenOptions' placeholder='请选择维修员' close-on-select></v-select>
+                      :options='childrenOptions' placeholder='请选择' close-on-select></v-select>
           </div>
           <div class="row" style="margin-top: 10px">
             <label class="font_normal_body">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
@@ -252,7 +252,7 @@ export default {
             "累购金额": { "index": 8, "type": "number", "readonly": true },
             "已用气量": { "index": 9, "type": "number", "checkmust": false },//基表数
             "已用金额": { "index": 9, "type": "number", "checkmust": false },
-            "机械读数": { "index": 10, "type": "number", "checkmust": false },
+            "机械读数": { "index": 10, "type": "number", "checkmust": true },
             "电子读数": { "index": 12, "type": "number", "checkmust": false },
             "剩余气量": { "index": 11, "type": "number", "checkmust": false },//累购-已用
             //显示屏数  --实际剩余气量
@@ -1973,6 +1973,7 @@ export default {
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_rent_phone', this.item.f_rent_phone)
+      this.$set('data.f_zuhu_phone', this.item.f_zuhu_phone)
       this.$set('data.f_user_phone', this.item.f_user_phone)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
       this.$set('data.f_address', this.item.f_address)
@@ -1986,7 +1987,7 @@ export default {
       this.$set('data.f_unit', this.item.f_unit)
       this.$set('data.f_ins_stop_date', this.item.f_plan_meters[0].f_ins_stop_date)
       this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_zhongdian)
-      this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_audit_comments)
+      this.$set('data.f_audit_comments', this.item.f_plan_meters[0].f_audit_comments)
       this.$set('data.f_gas_date', this.item.f_plan_meters[0].f_gas_date)
       this.$set('data.f_gas_pointsnumber', this.item.f_plan_meters[0].f_gas_pointsnumber)
       //tag
@@ -2562,6 +2563,16 @@ export default {
             }
             //tag)
           }
+          if (this.item.f_plan_meters && this.item.f_plan_meters[0]){
+            this.$set('data.f_ins_stop_date', this.item.f_plan_meters[0].f_ins_stop_date)
+            this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_zhongdian)
+            this.$set('data.f_audit_comments', this.item.f_plan_meters[0].f_audit_comments)
+            this.$set('data.f_gas_date', this.item.f_plan_meters[0].f_gas_date)
+            this.$set('data.f_gas_pointsnumber', this.item.f_plan_meters[0].f_gas_pointsnumber)
+            this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)
+            this.$set('data.f_valve_state', this.item.f_plan_meters[0].f_valve_state)
+            this.$set('data.f_off_valve_reason', this.item.f_plan_meters[0].f_off_valve_reason)
+          }
         } else {
           //tag
           this.init()