safecheck-client 3.0.35-5 → 3.0.35-51

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

@@ -162,7 +162,7 @@
         //   "f_repair_approved":"未审核","f_no_checkplan":"有计划安检","f_plan_name":"关于","f_repair_approved_by":null,"f_room":"1","f_office":null,"f_comments":null,
         //   "f_address":"兰山街道泰盛小区1栋1单元1层1室","id_back":null,"f_userinfoid":"2","f_subcompany":null,"f_addressid":null,"f_user_phone2":null,
         //   "f_user_equipment_remarks":null,"f_plan_id":"0819ea6707ad4d9dad217c06a87f4227","f_user_name":"用户二",
-        //   "f_plan_meters":[{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
+        //   "f_plan_meters":[{"f_weizhi":null,"f_pregas":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_pregas":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
         // },
 
         data: {
@@ -255,19 +255,20 @@
               "基表编号":{"index":1,"type":"string","readonly":true},
               "气表型号":{"index":2,"type":"string","readonly":true},
               "气表品牌":{"index":3,"type":"string","readonly":true},
-              "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
+              "进气方向":{"index":4,"type":"string","readonly":true},
               "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
               "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
-              "累购气量":{"index":7,"type":"number","readonly":true},
+              "表累购气量":{"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":9,"type":"number","checkmust": false},//累购-已用
-              "剩余金额":{"index":9,"type":"number","checkmust": false},
-              "气量异常差值":{"index":10,"type":"number","readonly": true},
-              "金额异常差值":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
-              "燃气表照片":{"index":12,"type":"picture","checkmust": false}
+              "户累购气量":{"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": false},
+              "气量异常差值":{"index":11,"type":"number","readonly": true},
+              "金额异常差值":{"index":11,"type":"number","readonly": true},
+              "表箱号":{"index":12,"type":"string","readonly": true},
+              "燃气表照片":{"index":13,"type":"picture","checkmust": false}
             }
           },
         },
@@ -287,11 +288,12 @@
               "剩余金额":{"index":9,"type":"string","checkmust": false},
               "累购气量":{"index":10,"type":"string","readonly":true},
               "表累购气量":{"index":11,"type":"string","readonly":false},
-              "已用气量":{"index":12,"type":"string","checkmust": false},
-              "剩余气量":{"index":13,"type":"string","checkmust": false},
-              "气量异常差值":{"index":14,"type":"number","readonly": true},
-              "金额异常差值":{"index":15,"type":"number","readonly": true},
-              "燃气表照片":{"index":16,"type":"picture","checkmust": false}
+              "户累购气量":{"index":12,"type":"number","readonly":true},
+              "已用气量":{"index":13,"type":"string","checkmust": false},
+              "剩余气量":{"index":14,"type":"string","checkmust": false},
+              "气量异常差值":{"index":15,"type":"number","readonly": true},
+              "金额异常差值":{"index":16,"type":"number","readonly": true},
+              "燃气表照片":{"index":17,"type":"picture","checkmust": false}
 
             }
           },
@@ -2069,6 +2071,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        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: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2122,6 +2142,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        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: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2148,7 +2186,7 @@
                     //tag)
                     //tag)
                     /*
-                      "累购气量":{"index":8,"type":"number","readonly":true},
+                      "表累购气量":{"index":8,"type":"number","readonly":true},
                       "累购金额":{"index":8,"type":"number","readonly":true},
                       "字轮读数":{"index":9,"type":"number","checkmust": true},
                       "已用金额":{"index":9,"type":"number","checkmust": true},
@@ -2160,7 +2198,7 @@
                     if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
                       if (!this.data.f_collection_type) {
                         this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                        delete this.config['燃气表']['items']['累购气量']
+                        delete this.config['燃气表']['items']['表累购气量']
                         delete this.config['燃气表']['items']['已用气量']
                         delete this.config['燃气表']['items']['剩余气量']
                         delete this.config['燃气表']['items']['气量异常差值']
@@ -2237,7 +2275,7 @@
                             f_defect_level: null,
                             f_device_id: "",
                             f_is_defect: "",
-                            f_item_name: "累购气量",
+                            f_item_name: "表累购气量",
                             f_item_value: this.item.f_plan_meters[i].f_total_gas,
                             f_path: "",
                             type: "number"
@@ -2300,7 +2338,7 @@
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
-                          f_item_name: "累购气量",
+                          f_item_name: "表累购气量",
                           f_item_value: this.item.f_plan_meters[i].f_total_gas,
                           f_path: "",
                           type: "number"
@@ -2381,6 +2419,24 @@
                         f_path: "",
                         type: "string"
                       },
+                      {
+                        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: "string"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "进气方向",
+                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                        f_path: "",
+                        type: "string"
+                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",

package/src/filiale/bayan/android/SafecheckUserInfo.vue

@@ -142,6 +142,10 @@
           </div>
 
         </div>
+        <div class="col-xs-12 row" style="padding: 2px 0">
+            <p class="panel-title col-xs-4 text-left font">临时联系电话</p>
+            <p class="panel-title col-xs-8 text-left input-font">{{ f_rent_phone }}</p>
+        </div>
         <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
           <label class="text-left font">到访不遇照片：</label>
           <div class="auto">

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

@@ -231,6 +231,15 @@
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
 
           <div v-show="$parent.$parent.$parent.showItem" class="row">
@@ -436,7 +445,15 @@
                 style="width:60%">
               </datepicker>
             </div>
-
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -648,6 +665,7 @@ export default {
     model.f_defect_content = "CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
     return {
       checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      defectlevels: [{label: '全部', value: ''},{label: '一级隐患', value: 'f_fist_count'}, {label: '二级隐患', value: 'f_second_count '}, {label: '三级隐患', value: 'f_third_count'}],
       quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
       bumens: [{label: '请选择', value: ''}],
       teams: [{label: '请选择', value: ''}],
@@ -1127,6 +1145,9 @@ export default {
       if (this.f_check_plan.f_plan_name) {
         args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
       }
+      if (args.model.f_defect_level){
+        args.condition += ` and ${args.model.f_defect_level} > 0 `
+      }
       this.checkes = []
       this.checkAll = false
       this.model.search(args.condition, args.model)