safecheck-client 3.0.35-1 → 3.0.35-10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. package/package.json +1 -1
  2. package/src/components/Util/SafecheckUpload.vue +269 -265
  3. package/src/components/android/CivilCurrentCreate.vue +46 -41
  4. package/src/components/android/examples/UserExamples.vue +136 -136
  5. package/src/components/rongcheng/AspiratedPaperFeedbackm.vue +1049 -1045
  6. package/src/filiale/bayan/android/AddPlanItem.vue +13 -2
  7. package/src/filiale/bayan/android/CheckPlanDown.vue +2 -2
  8. package/src/filiale/bayan/android/PaperFeedback.vue +1669 -1669
  9. package/src/filiale/bayan/android/PhoneUpUserinfo.vue +908 -905
  10. package/src/filiale/bayan/android/SafecheckOrderV.vue +76 -20
  11. package/src/filiale/bayan/android/SafecheckUserInfo.vue +4 -0
  12. package/src/filiale/bayan/pc/CheckPlanAreaList.vue +42 -0
  13. package/src/filiale/bayan/pc/HiddenSituation.vue +295 -295
  14. package/src/filiale/bayan/pc/NewCheckpaper.vue +1992 -1992
  15. package/src/filiale/bayan/pc/PaperList.vue +900 -900
  16. package/src/filiale/bayan/pc/PlanManage.vue +2 -0
  17. package/src/filiale/bayan/pc/SelectCheckPlan.vue +58 -0
  18. package/src/filiale/shanxian/android/AddPlanItem.vue +1 -1
  19. package/src/filiale/shanxian/android/SafecheckOrderV.vue +1 -1
  20. package/src/filiale/tongchuan/android/SafecheckDevices.vue +1207 -1207
  21. package/src/filiale/tongchuan/android/SafecheckOrderV.vue +3035 -3035
  22. package/src/filiale/tongchuan/pc/CheckSearchUser.vue +1053 -1053
  23. package/src/filiale/tongchuan/pc/checkUserList.vue +639 -639
  24. package/src/filiale/xilan/android/AddPlanItem.vue +4 -0
  25. package/src/filiale/xilan/android/CurrentCreate.vue +6 -2
  26. package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue +642 -642
  27. package/src/main.js +33 -33
@@ -162,7 +162,7 @@
162
162
  // "f_repair_approved":"未审核","f_no_checkplan":"有计划安检","f_plan_name":"关于","f_repair_approved_by":null,"f_room":"1","f_office":null,"f_comments":null,
163
163
  // "f_address":"兰山街道泰盛小区1栋1单元1层1室","id_back":null,"f_userinfoid":"2","f_subcompany":null,"f_addressid":null,"f_user_phone2":null,
164
164
  // "f_user_equipment_remarks":null,"f_plan_id":"0819ea6707ad4d9dad217c06a87f4227","f_user_name":"用户二",
165
- // "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}]
165
+ // "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}]
166
166
  // },
167
167
 
168
168
  data: {
@@ -255,19 +255,20 @@
255
255
  "基表编号":{"index":1,"type":"string","readonly":true},
256
256
  "气表型号":{"index":2,"type":"string","readonly":true},
257
257
  "气表品牌":{"index":3,"type":"string","readonly":true},
258
- "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
258
+ "进气方向":{"index":4,"type":"string","readonly":true},
259
259
  "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
260
260
  "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
261
- "累购气量":{"index":7,"type":"number","readonly":true},
261
+ "表累购气量":{"index":7,"type":"number","readonly":true},
262
262
  "累购金额":{"index":7,"type":"number","readonly":true},
263
- "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
264
- "已用金额":{"index":8,"type":"number","checkmust": false},
265
- "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
266
- "剩余金额":{"index":9,"type":"number","checkmust": false},
267
- "气量异常差值":{"index":10,"type":"number","readonly": true},
268
- "金额异常差值":{"index":10,"type":"number","readonly": true},
269
- "表箱号":{"index":11,"type":"string","readonly": true},
270
- "燃气表照片":{"index":12,"type":"picture","checkmust": false}
263
+ "户累购气量":{"index":8,"type":"number","readonly":true},
264
+ "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
265
+ "已用金额":{"index":9,"type":"number","checkmust": false},
266
+ "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
267
+ "剩余金额":{"index":10,"type":"number","checkmust": false},
268
+ "气量异常差值":{"index":11,"type":"number","readonly": true},
269
+ "金额异常差值":{"index":11,"type":"number","readonly": true},
270
+ "表箱号":{"index":12,"type":"string","readonly": true},
271
+ "燃气表照片":{"index":13,"type":"picture","checkmust": false}
271
272
  }
272
273
  },
273
274
  },
@@ -287,11 +288,12 @@
287
288
  "剩余金额":{"index":9,"type":"string","checkmust": false},
288
289
  "累购气量":{"index":10,"type":"string","readonly":true},
289
290
  "表累购气量":{"index":11,"type":"string","readonly":false},
290
- "已用气量":{"index":12,"type":"string","checkmust": false},
291
- "剩余气量":{"index":13,"type":"string","checkmust": false},
292
- "气量异常差值":{"index":14,"type":"number","readonly": true},
293
- "金额异常差值":{"index":15,"type":"number","readonly": true},
294
- "燃气表照片":{"index":16,"type":"picture","checkmust": false}
291
+ "户累购气量":{"index":12,"type":"number","readonly":true},
292
+ "已用气量":{"index":13,"type":"string","checkmust": false},
293
+ "剩余气量":{"index":14,"type":"string","checkmust": false},
294
+ "气量异常差值":{"index":15,"type":"number","readonly": true},
295
+ "金额异常差值":{"index":16,"type":"number","readonly": true},
296
+ "燃气表照片":{"index":17,"type":"picture","checkmust": false}
295
297
 
296
298
  }
297
299
  },
@@ -2069,6 +2071,24 @@
2069
2071
  f_path: "",
2070
2072
  type: "string"
2071
2073
  },
2074
+ {
2075
+ f_defect_level: null,
2076
+ f_device_id: "",
2077
+ f_is_defect: "",
2078
+ f_item_name: "户累购气量",
2079
+ f_item_value: this.item.f_plan_meters[i].f_pregas,
2080
+ f_path: "",
2081
+ type: "string"
2082
+ },
2083
+ {
2084
+ f_defect_level: null,
2085
+ f_device_id: "",
2086
+ f_is_defect: "",
2087
+ f_item_name: "进气方向",
2088
+ f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2089
+ f_path: "",
2090
+ type: "string"
2091
+ },
2072
2092
  {
2073
2093
  f_defect_level: null,
2074
2094
  f_device_id: "",
@@ -2122,6 +2142,24 @@
2122
2142
  f_path: "",
2123
2143
  type: "string"
2124
2144
  },
2145
+ {
2146
+ f_defect_level: null,
2147
+ f_device_id: "",
2148
+ f_is_defect: "",
2149
+ f_item_name: "户累购气量",
2150
+ f_item_value: this.item.f_plan_meters[i].f_pregas,
2151
+ f_path: "",
2152
+ type: "string"
2153
+ },
2154
+ {
2155
+ f_defect_level: null,
2156
+ f_device_id: "",
2157
+ f_is_defect: "",
2158
+ f_item_name: "进气方向",
2159
+ f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2160
+ f_path: "",
2161
+ type: "string"
2162
+ },
2125
2163
  {
2126
2164
  f_defect_level: null,
2127
2165
  f_device_id: "",
@@ -2148,7 +2186,7 @@
2148
2186
  //tag)
2149
2187
  //tag)
2150
2188
  /*
2151
- "累购气量":{"index":8,"type":"number","readonly":true},
2189
+ "表累购气量":{"index":8,"type":"number","readonly":true},
2152
2190
  "累购金额":{"index":8,"type":"number","readonly":true},
2153
2191
  "字轮读数":{"index":9,"type":"number","checkmust": true},
2154
2192
  "已用金额":{"index":9,"type":"number","checkmust": true},
@@ -2160,7 +2198,7 @@
2160
2198
  if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
2161
2199
  if (!this.data.f_collection_type) {
2162
2200
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2163
- delete this.config['燃气表']['items']['累购气量']
2201
+ delete this.config['燃气表']['items']['表累购气量']
2164
2202
  delete this.config['燃气表']['items']['已用气量']
2165
2203
  delete this.config['燃气表']['items']['剩余气量']
2166
2204
  delete this.config['燃气表']['items']['气量异常差值']
@@ -2237,7 +2275,7 @@
2237
2275
  f_defect_level: null,
2238
2276
  f_device_id: "",
2239
2277
  f_is_defect: "",
2240
- f_item_name: "累购气量",
2278
+ f_item_name: "表累购气量",
2241
2279
  f_item_value: this.item.f_plan_meters[i].f_total_gas,
2242
2280
  f_path: "",
2243
2281
  type: "number"
@@ -2300,7 +2338,7 @@
2300
2338
  f_defect_level: null,
2301
2339
  f_device_id: "",
2302
2340
  f_is_defect: "",
2303
- f_item_name: "累购气量",
2341
+ f_item_name: "表累购气量",
2304
2342
  f_item_value: this.item.f_plan_meters[i].f_total_gas,
2305
2343
  f_path: "",
2306
2344
  type: "number"
@@ -2381,6 +2419,24 @@
2381
2419
  f_path: "",
2382
2420
  type: "string"
2383
2421
  },
2422
+ {
2423
+ f_defect_level: null,
2424
+ f_device_id: "",
2425
+ f_is_defect: "",
2426
+ f_item_name: "户累购气量",
2427
+ f_item_value: this.item.f_plan_meters[i].f_pregas,
2428
+ f_path: "",
2429
+ type: "string"
2430
+ },
2431
+ {
2432
+ f_defect_level: null,
2433
+ f_device_id: "",
2434
+ f_is_defect: "",
2435
+ f_item_name: "进气方向",
2436
+ f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2437
+ f_path: "",
2438
+ type: "string"
2439
+ },
2384
2440
  {
2385
2441
  f_defect_level: null,
2386
2442
  f_device_id: "",
@@ -142,6 +142,10 @@
142
142
  </div>
143
143
 
144
144
  </div>
145
+ <div class="col-xs-12 row" style="padding: 2px 0">
146
+ <p class="panel-title col-xs-4 text-left font">临时联系电话</p>
147
+ <p class="panel-title col-xs-8 text-left input-font">{{ f_rent_phone }}</p>
148
+ </div>
145
149
  <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
146
150
  <label class="text-left font">到访不遇照片:</label>
147
151
  <div class="auto">
@@ -56,6 +56,9 @@
56
56
  <button id="btnaaa" style="float: right" class="button_search"
57
57
  @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
58
58
  v-el:cx>查询</button>
59
+ <button id="cle" style="float: right" class="button_search"
60
+ @click="$parent.$parent.cleamsg()"
61
+ v-el:cx>清空</button>
59
62
  </div>
60
63
  </div>
61
64
  <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
@@ -80,6 +83,30 @@
80
83
  :show-rest-button="reset">
81
84
  </datepicker>
82
85
  </div>
86
+ <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
87
+ <label class="font_normal_body">安检时间</label>
88
+ <datepicker
89
+ :value.sync="$parent.$parent.f_safe_start"
90
+ placeholder='结束时间' style="width: 60%"
91
+ :disabled-days-of-week="[]"
92
+ :format="'yyyy-MM-dd 00:00:00'"
93
+ :show-rest-button="reset"
94
+ v-model="$parent.$parent.f_safe_start"
95
+ >
96
+ </datepicker>
97
+ </div>
98
+ <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
99
+ <label class="font_normal_body">安检时间</label>
100
+ <datepicker
101
+ :value.sync="$parent.$parent.f_safe_end"
102
+ placeholder='结束时间' style="width: 60%"
103
+ :disabled-days-of-week="[]"
104
+ :format="'yyyy-MM-dd 23:59:59'"
105
+ :show-rest-button="reset"
106
+ v-model="$parent.$parent.f_safe_end"
107
+ >
108
+ </datepicker>
109
+ </div>
83
110
  <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
84
111
  <label class="font_normal_body" >区&emsp;&emsp;域</label>
85
112
  <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
@@ -240,6 +267,8 @@
240
267
  criteriaShow: false,
241
268
  f_check_start:new Date().getFullYear() + '-01',
242
269
  f_check_end:new Date().getFullYear() + '-12',
270
+ f_safe_start:'',
271
+ f_safe_end:'',
243
272
  planName:[{label: '全部', value: ''}],
244
273
  exportExcelField: {
245
274
  'f_weijian':'未检',
@@ -268,6 +297,9 @@
268
297
 
269
298
  },
270
299
  methods: {
300
+ cleamsg(){
301
+ this.$refs.paged.$refs.cri.model= {}
302
+ },
271
303
  getAllChecker() {
272
304
  new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
273
305
  data: {
@@ -418,6 +450,16 @@
418
450
  args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
419
451
  }
420
452
  }
453
+ if(this.f_safe_start && this.f_safe_end){
454
+ args.condition += `and ch.f_offsite_time >= '${this.f_safe_start}' and ch.f_offsite_time <= '${this.f_safe_end}' `
455
+ } else {
456
+ if(this.f_safe_start){
457
+ args.condition += ` and ch.f_offsite_time >='${this.f_safe_start}'`
458
+ }
459
+ if(this.f_safe_end){
460
+ args.condition += ` and ch.f_offsite_time <='${this.f_safe_end}'`
461
+ }
462
+ }
421
463
  this.$refs.paged.$refs.grid.$el.scrollTop = 0
422
464
  if (this.groupNameForSql=='undefined'){
423
465
  //tag