safecheck-client 3.0.30-97 → 3.0.30-99

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/android/SafecheckOrderV.vue +2 -2
  3. package/src/filiale/dexin/android/SafecheckDevices.vue +1305 -0
  4. package/src/filiale/dexin/android/SafecheckOrderV.vue +129 -14
  5. package/src/filiale/dexin/android.js +1 -0
  6. package/src/filiale/fugou/pc/PaperDefectMain.vue +32 -21
package/src/filiale/dexin/android/SafecheckOrderV.vue CHANGED
@@ -249,13 +249,14 @@
249
249
  "基表编号":{"index":1,"type":"string","readonly":true},
250
250
  "气表型号":{"index":2,"type":"string","readonly":true},
251
251
  "气表品牌":{"index":3,"type":"string","readonly":true},
252
- "进气方向":{"index":4,"type":"string","readonly":true},
252
+ "进气方向":{"index":4,"type":"string","readonly":false},
253
253
  "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
254
254
  "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
255
255
  "累购气量":{"index":7,"type":"number","readonly":true},
256
256
  "累购金额":{"index":7,"type":"number","readonly":true},
257
257
  "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
258
258
  "已用金额":{"index":8,"type":"number","checkmust": false},
259
+ "表基数":{"index":8,"type":"number","checkmust": false},
259
260
  "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
260
261
  //显示屏数 --实际剩余气量
261
262
  "剩余金额":{"index":9,"type":"number","checkmust": false},
@@ -2131,25 +2132,14 @@
2131
2132
  ]
2132
2133
  })
2133
2134
  }
2134
- if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
2135
+ if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') < 0) {
2135
2136
  this.data['device' + this.devices[de].n].forEach(device => {
2136
- //tag)
2137
- //tag)
2138
- /*
2139
- "累购气量":{"index":8,"type":"number","readonly":true},
2140
- "累购金额":{"index":8,"type":"number","readonly":true},
2141
- "字轮读数":{"index":9,"type":"number","checkmust": true},
2142
- "已用金额":{"index":9,"type":"number","checkmust": true},
2143
- "剩余气量":{"index":10,"type":"number","checkmust": true},
2144
- "剩余金额":{"index":10,"type":"number","checkmust": true},
2145
- "气量异常差值":{"index":11,"type":"number","readonly": true},
2146
- "金额异常差值":{"index":11,"type":"number","readonly": true}
2147
- */
2148
2137
  if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
2149
2138
  if (!this.data.f_collection_type) {
2150
2139
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2151
2140
  delete this.config['燃气表']['items']['累购气量']
2152
2141
  delete this.config['燃气表']['items']['已用气量']
2142
+ delete this.config['燃气表']['items']['表基数']
2153
2143
  delete this.config['燃气表']['items']['剩余气量']
2154
2144
  delete this.config['燃气表']['items']['气量异常差值']
2155
2145
  device.f_items.push(
@@ -2208,6 +2198,128 @@
2208
2198
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2209
2199
  delete this.config['燃气表']['items']['累购金额']
2210
2200
  delete this.config['燃气表']['items']['已用金额']
2201
+ delete this.config['燃气表']['items']['表基数']
2202
+ delete this.config['燃气表']['items']['剩余金额']
2203
+ delete this.config['燃气表']['items']['金额异常差值']
2204
+ device.f_items.push(
2205
+ {
2206
+ f_defect_level: null,
2207
+ f_device_id: "",
2208
+ f_is_defect: "",
2209
+ f_item_name: "初始表底",
2210
+ isshow: true,
2211
+ f_item_value: this.item.f_plan_meters[i].f_initial_base,
2212
+ f_path: "",
2213
+ type: "number"
2214
+ },
2215
+ {
2216
+ f_defect_level: null,
2217
+ f_device_id: "",
2218
+ f_is_defect: "",
2219
+ f_item_name: "累购气量",
2220
+ f_item_value: this.item.f_plan_meters[i].f_total_gas,
2221
+ f_path: "",
2222
+ type: "number"
2223
+ },
2224
+ {
2225
+ f_defect_level: null,
2226
+ f_device_id: "",
2227
+ f_is_defect: "",
2228
+ f_item_name: "已用气量",
2229
+ f_item_value: this.item.f_plan_meters[i].f_meter_base,
2230
+ f_path: "",
2231
+ type: "number"
2232
+ },
2233
+ {
2234
+ f_defect_level: null,
2235
+ f_device_id: "",
2236
+ f_is_defect: "",
2237
+ f_item_name: "剩余气量",
2238
+ f_item_value: "",
2239
+ f_path: "",
2240
+ type: "number"
2241
+ },
2242
+ {
2243
+ f_defect_level: null,
2244
+ f_device_id: "",
2245
+ f_is_defect: "",
2246
+ f_item_name: "气量异常差值",
2247
+ f_item_value: null,
2248
+ f_path: "",
2249
+ type: "number"
2250
+ }
2251
+ )
2252
+ //tag)
2253
+ }
2254
+ }
2255
+ })
2256
+ }else if(this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') > 0){
2257
+ this.data['device' + this.devices[de].n].forEach(device => {
2258
+ if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
2259
+ if (!this.data.f_collection_type) {
2260
+ this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2261
+ delete this.config['燃气表']['items']['累购气量']
2262
+ delete this.config['燃气表']['items']['已用气量']
2263
+ delete this.config['燃气表']['items']['已用金额']
2264
+ delete this.config['燃气表']['items']['剩余气量']
2265
+ delete this.config['燃气表']['items']['气量异常差值']
2266
+ device.f_items.push(
2267
+ {
2268
+ f_defect_level: null,
2269
+ f_device_id: "",
2270
+ f_is_defect: "",
2271
+ f_item_name: "初始表底",
2272
+ isshow: false,
2273
+ f_item_value: '',
2274
+ f_path: "",
2275
+ type: "number"
2276
+ },
2277
+ {
2278
+ f_defect_level: null,
2279
+ f_device_id: "",
2280
+ f_is_defect: "",
2281
+ f_item_name: "累购金额",
2282
+ f_item_value: this.item.f_plan_meters[i].f_total_fee,
2283
+ f_path: "",
2284
+ type: "number"
2285
+ },
2286
+ {
2287
+ f_defect_level: null,
2288
+ f_device_id: "",
2289
+ f_is_defect: "",
2290
+ f_item_name: "表基数",
2291
+ f_item_value: null,
2292
+ f_path: "",
2293
+ type: "number"
2294
+ },
2295
+ {
2296
+ f_defect_level: null,
2297
+ f_device_id: "",
2298
+ f_is_defect: "",
2299
+ f_item_name: "剩余金额",
2300
+ f_item_value: null,
2301
+ f_path: "",
2302
+ type: "number"
2303
+ },
2304
+ {
2305
+ f_defect_level: null,
2306
+ f_device_id: "",
2307
+ f_is_defect: "",
2308
+ f_item_name: "金额异常差值",
2309
+ f_item_value: null,
2310
+ f_path: "",
2311
+ type: "number"
2312
+ }
2313
+ )
2314
+ //tag)
2315
+ }
2316
+ } else
2317
+ if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
2318
+ if (!this.data.f_collection_type) {
2319
+ this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2320
+ delete this.config['燃气表']['items']['累购金额']
2321
+ delete this.config['燃气表']['items']['已用金额']
2322
+ delete this.config['燃气表']['items']['表基数']
2211
2323
  delete this.config['燃气表']['items']['剩余金额']
2212
2324
  delete this.config['燃气表']['items']['金额异常差值']
2213
2325
  device.f_items.push(
@@ -2271,6 +2383,7 @@
2271
2383
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2272
2384
  delete this.config['燃气表']['items']['累购金额']
2273
2385
  delete this.config['燃气表']['items']['已用金额']
2386
+ delete this.config['燃气表']['items']['表基数']
2274
2387
  delete this.config['燃气表']['items']['剩余金额']
2275
2388
  delete this.config['燃气表']['items']['金额异常差值']
2276
2389
  device.f_items.push(
@@ -2372,11 +2485,13 @@
2372
2485
  if (this.data.f_collection_type == '按气量') {
2373
2486
  delete this.config['燃气表']['items']['累购金额']
2374
2487
  delete this.config['燃气表']['items']['已用金额']
2488
+ delete this.config['燃气表']['items']['表基数']
2375
2489
  delete this.config['燃气表']['items']['剩余金额']
2376
2490
  delete this.config['燃气表']['items']['金额异常差值']
2377
2491
  } else if (this.data.f_collection_type == '按金额') {
2378
2492
  delete this.config['燃气表']['items']['累购气量']
2379
2493
  delete this.config['燃气表']['items']['已用气量']
2494
+ delete this.config['燃气表']['items']['表基数']
2380
2495
  delete this.config['燃气表']['items']['剩余气量']
2381
2496
  delete this.config['燃气表']['items']['气量异常差值']
2382
2497
  }
package/src/filiale/dexin/android.js CHANGED
@@ -3,6 +3,7 @@ import Vue from "vue";
3
3
 
4
4
  // 手机特殊目录注册到该文件中
5
5
  let specialComp = {
6
+ 'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
6
7
  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) }
7
8
  }
8
9
 
package/src/filiale/fugou/pc/PaperDefectMain.vue CHANGED
@@ -65,14 +65,14 @@
65
65
  <!--<input type="text" class="input_search" v-model="model.f_device_type"-->
66
66
  <!--style="width: 60%" placeholder="检&ensp;查&ensp;项" condition="f_device_type like '%{}%'">-->
67
67
  </div>
68
- <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
69
- <label class="font_normal_body">隐患名称</label>
68
+ <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
69
+ <label class="font_normal_body">隐患原因</label>
70
70
  <v-select :value.sync="model.f_item_name"
71
71
  v-model='model.f_item_name'
72
72
  style="width: 60%"
73
73
  class="select_list select"
74
74
  :options='$parent.$parent.DefectConfigs'
75
- placeholder='隐患名称'
75
+ placeholder='隐患原因'
76
76
  :multiple="true"
77
77
  condition="f_item_name in {}"></v-select>
78
78
  </div>
@@ -409,7 +409,7 @@
409
409
  try {
410
410
  let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
411
411
  Vue.config = res.data
412
- self.getDefectInfoConfig(res.data)
412
+ self.getDeviceTypes(res.data)
413
413
  } catch (error) {
414
414
  // 忽略704,文件找不到异常R
415
415
  if (error.status !== 704) {
@@ -509,6 +509,33 @@
509
509
  }
510
510
  },
511
511
  methods: {
512
+ getDeviceTypes(val) {
513
+ try {
514
+ if (val.safecheck.DevicesSetConfig != undefined) {
515
+ this.DefectConfig = val.safecheck.DevicesConfig
516
+ for (var Key1 in this.DefectConfig) {
517
+ this.device_types.push({label: Key1, value: Key1})
518
+ }
519
+ }
520
+ } catch (e) {
521
+ }
522
+ },
523
+ async getDefectInfoConfig() {
524
+ var resData = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable_GroupBy', {data: {
525
+ items: 'f_item_name',
526
+ tablename: 't_devices_items',
527
+ condition: 'f_is_defect = true',
528
+ groupitem: 'f_item_name',
529
+ }}, {
530
+ warnMsg: null,
531
+ resolveMsg: null
532
+ })
533
+ if (resData.data) {
534
+ for (let i = 0; i < resData.data.length; i++) {
535
+ this.DefectConfigs.push({label: resData.data[i].f_item_name, value: resData.data[i].f_item_name})
536
+ }
537
+ }
538
+ },
512
539
  isChecked(row) {
513
540
  return this.checkes.findIndex(item => item.f_defect_id == row.f_defect_id) != -1
514
541
  },
@@ -686,23 +713,6 @@
686
713
  this.cancel1()
687
714
  this.$showMessage('本次转维修成功'+successCount+'单')
688
715
  },
689
- getDefectInfoConfig(val){
690
- try {
691
- if (val.safecheck.DevicesSetConfig != undefined) {
692
- this.DefectConfig = val.safecheck.DevicesConfig
693
- // 获取到配置项，进行遍历，获取每个隐患项
694
- for (var Key1 in this.DefectConfig){
695
- this.device_types.push({label:Key1,value:Key1})
696
- for(var Key2 in this.DefectConfig[Key1].items){
697
- this.DefectConfigs.push({label:Key2,value:Key2})
698
- }
699
- }
700
- // 非民用或其他配置项加入，在进行遍历
701
- }
702
- }catch (e) {
703
- //tag
704
- }
705
- },
706
716
  showaudio(){
707
717
  //tag
708
718
  this.audioshow=!this.audioshow
@@ -885,6 +895,7 @@
885
895
  //this.pianqu()
886
896
  this.Mreadibook(`('${this.$login.f.orgid}')`)
887
897
  co(gen)
898
+ this.getDefectInfoConfig()
888
899
  }
889
900
  }
890
901
  </script>