safecheck-client 3.0.32 → 3.0.33-2

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 (88) hide show
  1. package/package.json +133 -133
  2. package/src/App.vue +31 -31
  3. package/src/assets//345/215/225/345/205/203/345/217/267.png +0 -0
  4. package/src/assets//345/234/260/345/235/200.png +0 -0
  5. package/src/assets//345/247/223/345/220/215.png +0 -0
  6. package/src/assets//345/260/217/345/214/272.png +0 -0
  7. package/src/assets//345/260/217/345/214/272/350/223/235/350/211/262.png +0 -0
  8. package/src/assets//345/272/225/346/225/260.png +0 -0
  9. package/src/assets//346/210/267/347/274/226/345/217/267.png +0 -0
  10. package/src/assets//346/245/274/345/217/267.png +0 -0
  11. package/src/assets//346/245/274/345/261/202.png +0 -0
  12. package/src/assets//350/241/250/347/261/273/345/236/213.png +0 -0
  13. package/src/assets//351/227/250/347/211/214/345/217/267.png +0 -0
  14. package/src/components/android/AndroidDefectDeal.vue +5 -5
  15. package/src/components/android/PhoneUpUserinfo.vue +6 -0
  16. package/src/components/android/SafecheckOrderV.vue +4 -1
  17. package/src/components/map/checkScreen.vue +1 -1
  18. package/src/components/planmanage/checkPlanList.vue +3 -3
  19. package/src/components/rongcheng/AspiratedDevices.vue +34 -1
  20. package/src/components/rongcheng/DefectPaper.vue +4 -1
  21. package/src/components/rongcheng/SafecheckDevices.vue +34 -1
  22. package/src/components/rongcheng/SafecheckOrderV.vue +1 -0
  23. package/src/components/rongcheng/SafecheckUserInfo.vue +17 -0
  24. package/src/filiale/Util.js +7 -0
  25. package/src/filiale/ankangyihua/android/AndroidDefectDeal.vue +1 -1
  26. package/src/filiale/ankangyihua/android/CurrentCreate.vue +1 -1
  27. package/src/filiale/bayan/pc/NewCheckpaper.vue +1 -1
  28. package/src/filiale/dexin/android/CasualSave.vue +1050 -0
  29. package/src/filiale/dexin/android/SafecheckDevices.vue +4 -4
  30. package/src/filiale/dexin/android/SafecheckOrderV.vue +2407 -2355
  31. package/src/filiale/dexin/android/WebMeterOpen.vue +377 -0
  32. package/src/filiale/dexin/android/WebMeterOpenEdit.vue +225 -0
  33. package/src/filiale/dexin/android.js +4 -1
  34. package/src/filiale/fugou/pc/AddToCheckBook.vue +160 -0
  35. package/src/filiale/fugou/pc/CheckBook.vue +301 -0
  36. package/src/filiale/fugou/pc/CheckBookAll.vue +67 -0
  37. package/src/filiale/fugou/pc/CheckBookArea.vue +146 -0
  38. package/src/filiale/fugou/pc/CheckBookCompany.vue +144 -0
  39. package/src/filiale/fugou/pc/CheckBookDetails.vue +161 -0
  40. package/src/filiale/fugou/pc/CheckBookEntry.vue +66 -0
  41. package/src/filiale/fugou/pc/CheckBookList.vue +366 -0
  42. package/src/filiale/fugou/pc/CheckBookSearchArea.vue +560 -0
  43. package/src/filiale/fugou/pc/CheckBookSearchUnit.vue +229 -0
  44. package/src/filiale/fugou/pc/CheckBookSearchUser.vue +651 -0
  45. package/src/filiale/fugou/pc/CheckBookSearchUserList.vue +674 -0
  46. package/src/filiale/fugou/pc/CheckBookUser.vue +101 -0
  47. package/src/filiale/fugou/pc/DefectPaperNew.vue +1 -1
  48. package/src/filiale/fugou/pc/PaperDefectMain.vue +22 -1
  49. package/src/filiale/fugou/pc/PlanManage.vue +1007 -0
  50. package/src/filiale/fugou/pc/checkPlanList.vue +371 -0
  51. package/src/filiale/fugou/pc/checkUserList.vue +20 -120
  52. package/src/filiale/fugou/pc.js +60 -5
  53. package/src/filiale/jingyang/android/AddPlanItem.vue +246 -246
  54. package/src/filiale/jingyang/android/CurrentCreate.vue +18 -18
  55. package/src/filiale/jingyang/android/SafecheckOrderV.vue +2281 -2281
  56. package/src/filiale/jingyang/android/SafecheckUserInfo.vue +1 -0
  57. package/src/filiale/jingyang/android.js +4 -0
  58. package/src/filiale/kelai/android/SafecheckDevices.vue +1 -1
  59. package/src/filiale/qianneng/pc/NewCheckpaper.vue +1 -1
  60. package/src/filiale/qingjian/android/SafecheckOrderV.vue +1 -0
  61. package/src/filiale/qingjian/android/SafecheckUserInfo.vue +4 -0
  62. package/src/filiale/rongchuang/android/SafecheckDevices.vue +1680 -0
  63. package/src/filiale/rongchuang/android/SafecheckOrderV.vue +975 -488
  64. package/src/filiale/rongchuang/pc/NewCheckpaper.vue +111 -48
  65. package/src/filiale/shanxian/android/SafecheckOrderV.vue +1 -1
  66. package/src/filiale/shexian/pc/PaperList.vue +822 -0
  67. package/src/filiale/shexian/pc.js +1 -0
  68. package/src/filiale/tongchuan/pc/CheckPlanCountChartArea.vue +1 -1
  69. package/src/filiale/wensu/android/CurrentCreate.vue +1 -1
  70. package/src/filiale/wensu/pc/CheckSearchUser.vue +58 -53
  71. package/src/filiale/wensu/pc/DefectPaperNew.vue +15 -9
  72. package/src/filiale/wensu/pc/PlanManage.vue +831 -0
  73. package/src/filiale/wensu/pc/PrintMaterialBill.vue +28 -11
  74. package/src/filiale/wensu/pc/RoleSelector.vue +2 -2
  75. package/src/filiale/wensu/pc/SelectCheckPlan.vue +208 -168
  76. package/src/filiale/wensu/pc/checkUserList.vue +5 -1
  77. package/src/filiale/wensu/pc.js +20 -19
  78. package/src/filiale/yangchunboneng/android/CurrentCreate.vue +6 -2
  79. package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue +3 -3
  80. package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue +1 -1
  81. package/src/filiale/yangchunboneng/pc/CheckBookUser.vue +3 -3
  82. package/src/filiale/yongzhou/pc/safeStatistics.vue +1 -0
  83. package/src/filiale/yongzhou/pc/safeStatisticsYear.vue +1 -0
  84. package/src/filiale/yunchengminsheng/android/SafecheckDevices.vue +3 -0
  85. package/src/filiale/zhongyi/pc/DefectListNew.vue +6 -6
  86. package/src/main.js +33 -33
  87. package/static/stretch_bottom.png +0 -0
  88. package/static/stretch_top.png +0 -0
@@ -3,26 +3,28 @@
3
3
  <!--返回<span class="glyphicon glyphicon-menu-right"></span>-->
4
4
  <!--</div>-->
5
5
  <div id="savebut" class="no-close row android-repair-order" style="background-color: #f9f9f9">
6
- <div class="col-sm-12 col-xs-12" >
6
+ <div class="col-sm-12 col-xs-12">
7
7
  <ul class="nav nav-tabs" style="background:#ffffff;overflow-y: hidden">
8
- <li v-for="row in tabs" @click="tabSelect(row,$index)" :class="{active1: row.complete === componentName}"
9
- v-if="$index < number+1 && $index < faultshow.number" >
10
- <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun" :class="row.class">
11
- <span class="spanboder">{{row.header}}</span>
12
- <img class="butt2" :src="imgback(row.complete === componentName,row.header === header)"></a>
8
+ <li v-for="row in tabs" @click="tabSelect(row, $index)" :class="{ active1: row.complete === componentName }"
9
+ v-if="$index < number + 1 && $index < faultshow.number">
10
+ <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun"
11
+ :class="row.class">
12
+ <span class="spanboder">{{ row.header }}</span>
13
+ <img class="butt2" :src="imgback(row.complete === componentName, row.header === header)"></a>
13
14
  <p></p>
14
15
  </li>
15
- <div class="col-sm-12 col-xs-12 repair-bg" v-show="routeShow">
16
+ <div class="col-sm-12 col-xs-12 repair-bg" v-show="routeShow">
16
17
  <route name='repair' :reuse="false"></route>
17
18
  </div>
18
- <li v-for="row in tabs" @click="tabSelect(row,$index)" :class="{active1: row.complete === componentName}"
19
- v-if="$index > number && $index < faultshow.number ">
20
- <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun" :class="row.class">
21
- <span class="spanboder">{{row.header}}</span>
22
- <img class="butt2" :src="imgback(row.complete === componentName,row.header === header)"></a>
19
+ <li v-for="row in tabs" @click="tabSelect(row, $index)" :class="{ active1: row.complete === componentName }"
20
+ v-if="$index > number && $index < faultshow.number">
21
+ <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun"
22
+ :class="row.class">
23
+ <span class="spanboder">{{ row.header }}</span>
24
+ <img class="butt2" :src="imgback(row.complete === componentName, row.header === header)"></a>
23
25
  <p></p>
24
26
  </li>
25
- <div class="col-sm-12 col-xs-12 repair-bg" v-if="actionEnabled ">
27
+ <div class="col-sm-12 col-xs-12 repair-bg" v-if="actionEnabled">
26
28
  <div class="auto select-overspread form-horizontal repair-bg " style="padding-bottom:5px;">
27
29
  <div class="bq-parent">
28
30
  <blockquote class="blockquote">
@@ -36,9 +38,9 @@
36
38
  <!--<label>请输入超期原因:</label><br/>-->
37
39
  <!--<textarea style="width: 100%;" v-model=""></textarea>-->
38
40
  <!--</div>-->
39
- <div class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;">
40
- <div class="col-xs-3 col-sm-3 col-md-3" v-if="parentPage=='CurrentCreate'">
41
- <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="save('temp')">
41
+ <div class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;">
42
+ <div class="col-xs-3 col-sm-3 col-md-3" v-if="parentPage == 'CurrentCreate'">
43
+ <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="save('temp')">
42
44
  临时保存
43
45
  </button>
44
46
  </div>
@@ -84,7 +86,7 @@ let loadParamGem = async function (self) {
84
86
 
85
87
  export default {
86
88
  title: '安检单',
87
- props: ['f_plan_id', 'item', 'role','parentPage','source'],
89
+ props: ['f_plan_id', 'item', 'role', 'parentPage', 'source'],
88
90
  // props: ['f_plan_id', 'role'],
89
91
  data() {
90
92
  return {
@@ -107,39 +109,40 @@ export default {
107
109
 
108
110
  data: {
109
111
  f_devices: [],
110
- f_defect_content:'',
111
- f_recording1_path:''
112
+ f_defect_content: '',
113
+ f_recording1_path: ''
112
114
  },
113
- updateuserphone:false, //安检时是否更新用户电话
114
- updatemetermodel:false, //安检时是否更新表型号
115
- updatemeternumber:false, //安检时是否更新表号
116
- beforephone:'',
117
- isUpload:false,
118
- onlySave:true, //判断保存还是保存并上传
119
- livedispose:'',
120
- startClick:false, //开始安检按钮是否可点击
115
+ updateuserphone: false, //安检时是否更新用户电话
116
+ updatemetermodel: false, //安检时是否更新表型号
117
+ updatemeternumber: false, //安检时是否更新表号
118
+ beforephone: '',
119
+ isUpload: false,
120
+ onlySave: true, //判断保存还是保存并上传
121
+ livedispose: '',
122
+ startClick: false, //开始安检按钮是否可点击
121
123
  isStrat: false, //是否开始安检
122
- checkResult:{},//查询结果
123
- newcheckResult:{},
124
+ checkResult: {},//查询结果
125
+ newcheckResult: {},
124
126
  timer: null,
125
127
  showModal: false,
126
128
  pic_to_be_viewed: '',
127
- showBack:true,
129
+ showBack: true,
128
130
  devices: [],
129
- f_devices : [],
130
- isToRepair:false,
131
- clickBack:true, //是否点击返回按钮
132
- isSafeCheckToRepair:false,//是否转维修
133
- Url:this.$androidUtil.getProxyUrl(),
134
- detail:{},
135
- defectDevice:{},
136
- user:{},
131
+ f_devices: [],
132
+ isToRepair: false,
133
+ clickBack: true, //是否点击返回按钮
134
+ isSafeCheckToRepair: false,//是否转维修
135
+ Url: this.$androidUtil.getProxyUrl(),
136
+ detail: {},
137
+ defectDevice: {},
138
+ f_security_check_type_id: '',
139
+ user: {},
137
140
  model: { //转维修数据
138
141
  // 一次派单
139
142
  serviceacitivity: [{
140
143
  f_service_acitivity_type: '派单'
141
144
  }],
142
- f_source:'安检',
145
+ f_source: '安检',
143
146
  f_service_id: '',
144
147
  f_contact_phone: '',
145
148
  f_meetunit: '',
@@ -149,11 +152,11 @@ export default {
149
152
  f_repair_date: Util.toStandardTimeString(),
150
153
  f_card_id: '',
151
154
  // f_department: '', 站点选择
152
- f_reciever:'',
155
+ f_reciever: '',
153
156
  f_remarks: '',
154
157
  f_user_type: '',
155
158
  f_area: '',
156
- f_unit_name:'',
159
+ f_unit_name: '',
157
160
  f_street: '',
158
161
  f_residential_area: '',
159
162
  f_building: '',
@@ -162,33 +165,34 @@ export default {
162
165
  f_room: '',
163
166
  aState: null,
164
167
  f_repairtype: '',
165
- f_repairitems:{},
168
+ f_repairitems: {},
166
169
  },
167
- repairitems:[],
168
- meading:'转站点',
170
+ repairitems: [],
171
+ meading: '转站点',
172
+ serverConfig: {},
169
173
  config: {
170
- "燃气表":{
171
- "checkmust":true,
172
- "index":1,
173
- "items":{
174
+ "燃气表": {
175
+ "checkmust": true,
176
+ "index": 1,
177
+ "items": {
174
178
  //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
175
- "气表表号":{"index":1,"type":"string","readonly":true},
176
- "气表型号":{"index":2,"type":"string","readonly":true},
177
- "气表品牌":{"index":3,"type":"string","readonly":true},
178
- "气表类型":{"index":4,"type":"string","readonly":true},
179
- "进气方向":{"index":5,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true},
180
- "初始表底":{"index":6,"type":"number","isshow":false,"readonly":true},
181
- "上期表读数":{"index":7,"type":"number","readonly":true,isshow:false},
182
- "累购气量":{"index":8,"type":"number","readonly":true},
183
- "累购金额":{"index":8,"type":"number","readonly":true},
184
- "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
185
- "已用金额":{"index":9,"type":"number","checkmust": false},
186
- "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
179
+ "气表表号": { "index": 1, "type": "string", "readonly": true },
180
+ "气表型号": { "index": 2, "type": "string", "readonly": true },
181
+ "气表品牌": { "index": 3, "type": "string", "readonly": true },
182
+ "气表类型": { "index": 4, "type": "string", "readonly": true },
183
+ "进气方向": { "index": 5, "type": "selector", "options": [{ "data": "左表", "isdefault": false }, { "data": "右表", "isdefault": false }], "checkmust": true },
184
+ "初始表底": { "index": 6, "type": "number", "isshow": false, "readonly": true },
185
+ "上期表读数": { "index": 7, "type": "number", "readonly": true, isshow: false },
186
+ "累购气量": { "index": 8, "type": "number", "readonly": true },
187
+ "累购金额": { "index": 8, "type": "number", "readonly": true },
188
+ "已用气量": { "index": 9, "type": "number", "checkmust": false },//基表数
189
+ "已用金额": { "index": 9, "type": "number", "checkmust": false },
190
+ "剩余气量": { "index": 10, "type": "number", "checkmust": false },//累购-已用
187
191
  //显示屏数 --实际剩余气量
188
- "剩余金额":{"index":10,"type":"number","checkmust": false},
189
- "气量异常差值":{"index":11,"type":"number","readonly": true},
190
- "金额异常差值":{"index":11,"type":"number","readonly": true},
191
- "表箱号":{"index":12,"type":"string","readonly": true}
192
+ "剩余金额": { "index": 10, "type": "number", "checkmust": false },
193
+ "气量异常差值": { "index": 11, "type": "number", "readonly": true },
194
+ "金额异常差值": { "index": 11, "type": "number", "readonly": true },
195
+ "表箱号": { "index": 12, "type": "string", "readonly": true }
192
196
  }
193
197
  // 注意,配置项的index必须与上面的固定配置保持'顺序'
194
198
  },
@@ -209,10 +213,10 @@ export default {
209
213
  // }
210
214
  },
211
215
  // 维修项
212
- isneedDate:'',
213
- routeShow:true,
214
- number:0,
215
- shupingshow:false,
216
+ isneedDate: '',
217
+ routeShow: true,
218
+ number: 0,
219
+ shupingshow: false,
216
220
  pipeline: {},
217
221
  details: [],
218
222
  ids: '',
@@ -225,18 +229,18 @@ export default {
225
229
  devicedetails: {},
226
230
  cookdetails: {},
227
231
  componentName: 'safecheck-userinfo',
228
- header:'客户信息',
232
+ header: '客户信息',
229
233
  tabs: [
230
234
  // 参数全部设置成空,在ready时,等model处理好了,再添加
231
235
  {
232
- header: '客户信息',complete:'safecheck-userinfo',class: 'repair-info-class', props: null
236
+ header: '客户信息', complete: 'safecheck-userinfo', class: 'repair-info-class', props: null
233
237
  },
234
238
  {
235
- header: '拍照签名',complete:'paper-feedback', class: 'outlay-class', props: null
239
+ header: '拍照签名', complete: 'paper-feedback', class: 'outlay-class', props: null
236
240
  }
237
241
  ],
238
- faultshow:{
239
- number : 8
242
+ faultshow: {
243
+ number: 8
240
244
  } // 控制 故障汇总 在 菜单里显示与否,
241
245
  }
242
246
  },
@@ -248,21 +252,21 @@ export default {
248
252
  }
249
253
  },
250
254
  methods: {
251
- closely(isdelete){
255
+ closely(isdelete) {
252
256
  try {
253
257
  var startOrStopAudioClipStr;
254
- if (isdelete===true) {
258
+ if (isdelete === true) {
255
259
  //tag
256
- startOrStopAudioClipStr= HostApp.startOrStopAudioClip("----",'停止并删除录音') //停止并删除录音
257
- }else {
260
+ startOrStopAudioClipStr = HostApp.startOrStopAudioClip("----", '停止并删除录音') //停止并删除录音
261
+ } else {
258
262
  //tag
259
- startOrStopAudioClipStr= HostApp.startOrStopAudioClip("----",'停止录音') //停止录音
263
+ startOrStopAudioClipStr = HostApp.startOrStopAudioClip("----", '停止录音') //停止录音
260
264
  }
261
265
  if (startOrStopAudioClipStr.code == 200) {
262
266
  //tag
263
267
  return true;
264
- }else {
265
- return false;
268
+ } else {
269
+ return false;
266
270
  }
267
271
  } catch (e) {
268
272
  console.error("关闭录音方法异常")
@@ -275,7 +279,7 @@ export default {
275
279
  //tag
276
280
  if (this.role != 'inspect') {
277
281
  if (this.data.f_recording1_path != '') {
278
- window.location = "/rs/file"+this.data.f_recording1_path
282
+ window.location = "/rs/file" + this.data.f_recording1_path
279
283
  }
280
284
  } else {
281
285
  //tag
@@ -287,13 +291,13 @@ export default {
287
291
  }
288
292
  //HostApp.__this__ = this
289
293
  /*调用无限制录音模块*/
290
- let startOrStopState = HostApp.startOrStopAudioClip(fileName,"开始录音")
294
+ let startOrStopState = HostApp.startOrStopAudioClip(fileName, "开始录音")
291
295
  //tag
292
296
  if (startOrStopState.code == 200) {
293
- this.data.f_recording1_path = "file:///storage/emulated/0/safecheck/" + fileName
297
+ this.data.f_recording1_path = "file:///storage/emulated/0/safecheck/" + fileName
294
298
  //tag
295
299
  return true;
296
- }else {
300
+ } else {
297
301
  return false;
298
302
  }
299
303
  }
@@ -304,75 +308,75 @@ export default {
304
308
  //tag
305
309
 
306
310
  // 5秒后启用点击事件
307
- setTimeout(function(){
311
+ setTimeout(function () {
308
312
  $("#savebut").removeClass("noclickbut");
309
- },5000);
313
+ }, 5000);
310
314
  },
311
- timeSet(val){
312
- if (!val){
315
+ timeSet(val) {
316
+ if (!val) {
313
317
  return
314
318
  }
315
- let time =new Date(val).getTime()
316
- let time2=new Date().getTime()
317
- if (time2>time) {
319
+ let time = new Date(val).getTime()
320
+ let time2 = new Date().getTime()
321
+ if (time2 > time) {
318
322
  return true
319
323
  }
320
324
  },
321
- imgback(val,isheader){
322
- if(val && this.routeShow && isheader){
325
+ imgback(val, isheader) {
326
+ if (val && this.routeShow && isheader) {
323
327
  return require('../../../assets/xiangxia1.png')
324
- }else{
328
+ } else {
325
329
  return require('../../../assets/xiangyou1.png')
326
330
  }
327
331
  },
328
- changediv(val){
332
+ changediv(val) {
329
333
  //tag
330
334
  return val
331
335
  },
332
336
  // 选择tab
333
- tabSelect (item,number) {
337
+ tabSelect(item, number) {
334
338
  this.header = item.header
335
339
  //tag
336
340
  //tag
337
341
  //tag
338
342
  //tag
339
343
  // 处理关闭/显示 内容
340
- if(this.number == number && !this.routeShow ){
344
+ if (this.number == number && !this.routeShow) {
341
345
  this.routeShow = true
342
- }else if(this.number == number && this.routeShow){
346
+ } else if (this.number == number && this.routeShow) {
343
347
  this.routeShow = false
344
- }else if(this.number != item.complete){
348
+ } else if (this.number != item.complete) {
345
349
  this.routeShow = true
346
350
  }
347
351
  this.number = number
348
352
  this.componentName = item.complete
349
353
  //tag
350
- if(item.complete == 'safecheck-devices'){
354
+ if (item.complete == 'safecheck-devices') {
351
355
  //tag
352
- if(item.header != '燃气表' && this.data['device'+item.number].length == 0){
356
+ if (item.header != '燃气表' && this.data['device' + item.number].length == 0) {
353
357
  this.data['device' + item.number].push({})
354
358
  }
355
359
  //tag
356
360
  //tag)
357
- let idx=this.data['device' + item.number].length - 1
361
+ let idx = this.data['device' + item.number].length - 1
358
362
  let itemprops = {
359
- config:this.config,
360
- device:this.devices[item.number-1],
361
- idx:idx,
362
- role:'inspect'
363
+ config: this.config,
364
+ device: this.devices[item.number - 1],
365
+ idx: idx,
366
+ role: 'inspect'
363
367
  }
364
368
  //tag
365
369
  //tag)
366
370
  //tag)
367
371
  //tag
368
- if(this.routeShow){
372
+ if (this.routeShow) {
369
373
  this.$goto(item.complete, itemprops, 'repair')
370
374
  //tag
371
375
  }
372
- }else{
376
+ } else {
373
377
  //tag
374
- if(this.routeShow){
375
- this.$goto(item.complete, {userinfo:this.data}, 'repair')
378
+ if (this.routeShow) {
379
+ this.$goto(item.complete, { userinfo: this.data }, 'repair')
376
380
  }
377
381
  }
378
382
  this.shupingshow = true
@@ -383,18 +387,20 @@ export default {
383
387
  this.ids += this.model.serviceacitivity[0].imgs[i].imgid + ','
384
388
  }
385
389
  this.ids = this.ids.substring(0, this.ids.length - 1)
386
- if(this.ids){
390
+ if (this.ids) {
387
391
  this.getImgGen();
388
392
  }
389
393
  },
390
- getImgGen(){
394
+ getImgGen() {
391
395
  let http = new HttpResetClass()
392
- http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
396
+ http.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
397
+ data: {
393
398
  items: '*',
394
399
  tablename: 't_files',
395
400
  condition: `id in (${this.ids})`,
396
401
  orderitem: 'id'
397
- }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
402
+ }
403
+ }, { resolveMsg: null, rejectMsg: null }).then((res) => {
398
404
  for (let i = 0; i < res.data.length; i++) {
399
405
  for (let j = 0; j < this.model.serviceacitivity[0].imgs.length; j++) {
400
406
  //tag)
@@ -408,20 +414,20 @@ export default {
408
414
  })
409
415
  },
410
416
 
411
- sortDetails(){
417
+ sortDetails() {
412
418
  for (let i = 0; i < this.details.length; i++) {
413
419
  if (this.details[i].details.length) {
414
420
  for (let j = 0; j < this.details[i].details.length; j++) {
415
421
  if (this.details[i].details[j].f_type === 'a') {
416
- this.doordetails = {details: this.details[i].details}
422
+ this.doordetails = { details: this.details[i].details }
417
423
  break
418
424
  }
419
425
  if (this.details[i].details[j].f_type === 'b') {
420
- this.devicedetails = {details: this.details[i].details}
426
+ this.devicedetails = { details: this.details[i].details }
421
427
  break
422
428
  }
423
429
  if (this.details[i].details[j].f_type === 'c') {
424
- this.cookdetails = {details: this.details[i].details}
430
+ this.cookdetails = { details: this.details[i].details }
425
431
  break
426
432
  }
427
433
  }
@@ -429,9 +435,9 @@ export default {
429
435
  }
430
436
  },
431
437
  // 复制数据
432
- back () {
438
+ back() {
433
439
  let _this = this
434
- if(this.issee){
440
+ if (this.issee) {
435
441
  _this.$back()
436
442
  return
437
443
  }
@@ -442,7 +448,7 @@ export default {
442
448
  }
443
449
  })
444
450
  },
445
- confirm(){
451
+ confirm() {
446
452
  this.$dispatch('confirm')
447
453
  },
448
454
  tick() {
@@ -462,85 +468,87 @@ export default {
462
468
  this.data.f_repaired = this.getRepairState() ? '已修' : '在修'
463
469
  },
464
470
  errorVerify() {
471
+ // if (!this.data.f_seal_uid){
472
+ // return '该用户未施封,请先在客户信息中点击去施封!'
473
+ // }
465
474
  let hasError = this.verifyState()
466
- if(hasError)
475
+ if (hasError)
467
476
  return hasError
468
477
 
469
- if(this.data.f_entry_status != '入户')
478
+ if (this.data.f_entry_status != '入户')
470
479
  return null
471
480
  hasError = this.verifyUser()
472
- if(hasError)
481
+ if (hasError)
473
482
  return hasError
474
483
  hasError = this.verifyDevices()
475
- if(hasError)
484
+ if (hasError)
476
485
  return hasError
477
486
  hasError = this.verifyFeedback()
478
- if(hasError)
487
+ if (hasError)
479
488
  return hasError
480
489
  },
481
490
  verifyState() {
482
- if(Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)
491
+ if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)
483
492
  return '未使用天然气则必须拍照'
484
- if(Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
485
- return '到访不遇必须拍照'
493
+ if (Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
494
+ return '到访不遇必须拍照'
486
495
  },
487
496
  verifyUser() {
488
497
  //tag
489
498
  //tag
490
499
  //tag)
491
500
  let prefix = '用户基本信息:'
492
- if(Util.required(this.data.f_user_name))
501
+ if (Util.required(this.data.f_user_name))
493
502
  return prefix + '用户名必须输入'
494
- if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
503
+ if (!(/^\d{11}$/.test(this.data.f_user_phone))) {
495
504
 
496
505
  return '请输入正确的电话号码'
497
506
  }
498
507
  // if(Util.required(this.data.f_residential_area))
499
508
  // return prefix + '小区名称必须输入'
500
- if(Util.required(this.data.f_address))
509
+ if (Util.required(this.data.f_address))
501
510
  return prefix + '地址必须输入'
502
511
  },
503
512
  verifyDevices() {
504
513
  for (let dev in this.config) {
505
514
  if (this.config[dev].checkmust == true) {
506
515
  let error = true
507
- for(let device in this.data) {
516
+ for (let device in this.data) {
508
517
  if (device.startsWith("device")) {
509
518
  for (let item in this.data[device]) {
510
- if (this.data[device].length != 0 && this.data[device][item].f_device_type == dev) {
519
+ if (this.data[device].length != 0 && this.data[device][item].f_device_type == this.config[dev].itemname) {
511
520
  error = false
512
521
  }
513
522
  }
514
523
  }
515
524
  }
516
525
  if (error) {
517
- return "请检查" + dev
526
+ return "请检查" + this.config[dev].itemname
518
527
  }
519
528
  }
520
529
  }
521
530
 
522
- for (let dev in this.config) {
523
- for(let device in this.data) {
531
+ for (var dev in this.config) {
532
+ for (var device in this.data) {
524
533
  if (device.startsWith("device")) {
525
534
  for (let item in this.data[device]) {
526
535
  //检查每一条安检结果
527
- if (this.data[device].length != 0 && this.data[device][item].f_device_type == dev) {
536
+ if (this.data[device].length != 0 && this.data[device][item].f_device_type == this.config[dev].itemname) {
528
537
  for (let i in this.data[device][item].f_items) {
529
538
  for (let it in this.config[dev].items) {
530
- if (it == this.data[device][item].f_items[i].f_item_name) {
531
- let check=false
532
- if (!this.data[device][item].f_items[i].f_item_value){
533
- check=true
534
- }else if (Array.isArray(this.data[device][item].f_items[i].f_item_value)){
535
- if (this.data[device][item].f_items[i].f_item_value.length==0){
536
- check=true
539
+ if (this.config[dev].items[it].itemname == this.data[device][item].f_items[i].f_item_name) {
540
+ let check = false
541
+ if (!this.data[device][item].f_items[i].f_item_value) {
542
+ check = true
543
+ } else if (Array.isArray(this.data[device][item].f_items[i].f_item_value)) {
544
+ if (this.data[device][item].f_items[i].f_item_value.length == 0) {
545
+ check = true
537
546
  }
538
547
  }
539
-
540
- if(this.config[dev].items[it].type=='picture' && this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_path){
548
+ if (this.config[dev].items[it].type == 'picture' && this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_path) {
541
549
  return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
542
550
  }
543
- if (this.config[dev].items[it].type !='picture' && this.config[dev].items[it].checkmust == true && check) {
551
+ if (this.config[dev].items[it].type != 'picture' && this.config[dev].items[it].checkmust == true && check) {
544
552
  return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
545
553
  }
546
554
  }
@@ -550,6 +558,9 @@ export default {
550
558
  if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_path == Vue.nopic) {
551
559
  return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须拍照"
552
560
  }
561
+ if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_deal_dispose == '现场整改' && isEmpty(this.data[device][item].f_items[i].f_repair_path)) {
562
+ return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中现场整改必须拍照"
563
+ }
553
564
  }
554
565
  }
555
566
  }
@@ -563,16 +574,16 @@ export default {
563
574
  verifyFeedback() {
564
575
  let prefix = '拍照签名:'
565
576
  //tag)
566
- if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
577
+ if (Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
567
578
  return prefix + '必须有安检总体照片'
568
- if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
579
+ if (Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
569
580
  return prefix + '必须有用户签名'
570
- if(Vue.android && this.data.f_defect_notified && this.data.f_notified_path == Vue.nopic)
581
+ if (Vue.android && this.data.f_defect_notified && this.data.f_notified_path == Vue.nopic)
571
582
  return prefix + '下发安检通知书则必须给通知书拍照'
572
- if(Vue.android && this.data.f_blacklist && this.data.f_blocking_cause=='')
583
+ if (Vue.android && this.data.f_blacklist && this.data.f_blocking_cause == '')
573
584
  return prefix + '请填写拉黑原因'
574
- if(!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
575
- return prefix + '请选择服务评价'
585
+ if (!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
586
+ return prefix + '请选择服务评价'
576
587
  },
577
588
 
578
589
  getAllDefect() {
@@ -593,61 +604,34 @@ export default {
593
604
  let hasOther = ''
594
605
  let otherValue = null
595
606
  for (let item in codata[device]) {
596
- if(typeof codata[device][item]=='function'){
607
+ if (typeof codata[device][item] == 'function') {
597
608
  continue
598
609
  }
599
610
  codata[device][item].f_create_time = Util.toStandardTimeString()
600
- // if (codata[device].length > 1) {
601
- // let j = Number.parseInt(item) + 1
602
- // f_device_type = `${codata[device][item].f_device_type}${j}`
603
- // } else {
604
- // f_device_type = codata[device][item].f_device_type
605
- // }
611
+ if (codata[device].length > 1) {
612
+ let j = Number.parseInt(item) + 1
613
+ f_device_type = `${codata[device][item].f_device_type}${j}`
614
+ } else {
615
+ f_device_type = codata[device][item].f_device_type
616
+ }
606
617
  //tag
607
618
  //tag
608
619
  //tag)
609
620
  //tag)
610
- if(item == 'sum' || item == 'removeEmpty'){
621
+ if (item == 'sum' || item == 'removeEmpty') {
611
622
  continue
612
623
  }
613
- for (let i = 0; i < codata[device][item].f_items.length ; i++) {
624
+ for (let i = 0; i < codata[device][item].f_items.length; i++) {
614
625
  //tag
615
- if(i == 'sum' || i == 'removeEmpty'){
616
- continue
617
- }
618
- if(!codata[device][item].f_items[i]){
626
+ if (i == 'sum' || i == 'removeEmpty') {
619
627
  continue
620
628
  }
621
629
  //tag)
622
630
  var items = codata[device][item].f_items[i]
623
- if (!items.f_create_time){
624
- items.f_create_time = ''
625
- items.f_create_time = Util.toStandardTimeString()
626
- }else {
627
- items.f_create_time = Util.toStandardTimeString()
628
- }
631
+ items.f_create_time = Util.toStandardTimeString()
629
632
  //tag)
630
- // items.f_item_lists = []
631
- //tag)
632
- // //tag)
633
- // //tag} name => ${JSON.stringify(items.f_item_name)} value => ${JSON.stringify(items.f_item_value)}`)
634
- // console.log(`f_is_defect => ${this.config[codata[device][item]
635
- // .f_device_type]
636
- // .items[items.f_item_name]
637
- // .options
638
- // .find((option)=>option.data === items.f_item_value)
639
- // .map((option)=>option.f_is_defect)}`)
640
- // if (items.f_is_defect && (items.f_is_defect == true || items.f_is_defect == 'true')) {
641
- // //tag
642
- // checkResults.result = '有隐患'
643
- // //tag)
644
- // //tag)
645
- // // this.$set('checkResult.' + items.f_item_name, items.f_item_value)
646
- // this.checkResult[items.f_item_name] = items.f_item_value
647
- // //tag)
648
- // // this.$set('checkResultsss.' + items.f_item_name, `${f_device_type}${items.f_item_value}`)
649
- // // //tag)
650
- // }
633
+ items.f_item_lists = []
634
+
651
635
  if (items.type == 'selector') {
652
636
  items.selected = []
653
637
  } else if (items.type == 'inputSelector') {
@@ -665,74 +649,79 @@ export default {
665
649
  //tag
666
650
  if (items.type == 'selector' || items.type == 'checkbox' || items.type == 'radio') {
667
651
  for (let i in items.f_item_value) {
668
- if(typeof items.f_item_value[i]=='function'){
652
+ if (typeof items.f_item_value[i] == 'function') {
669
653
  continue
670
654
  }
671
- let configItems = this.config[codata[device][item].f_device_type].items[f_item_name]
655
+ // let configItems = this.config[codata[device][item].f_device_type].items[f_item_name]
656
+ let configItems = ''
657
+ this.config.forEach(e => {
658
+ if (e.itemname == f_device_type)
659
+ e.items.forEach(item => {
660
+ if (item.itemname == f_item_name) {
661
+ configItems = item
662
+ }
663
+ })
664
+ })
665
+ items.f_defect_level = configItems.level
672
666
  //tag)
673
667
  for (let k in configItems.options) {
674
- if(typeof configItems.options[k]=='function'){
668
+ if (typeof configItems.options[k] == 'function') {
675
669
  continue
676
670
  }
677
671
  //tag)
678
672
  if (items.f_item_value[i] === configItems.options[k].data) {
679
-
680
673
  f_is_defect = configItems.options[k].isdefect
681
674
  f_item_value = items.f_item_value[i]
682
- f_defect_level = configItems.options[k].level
683
-
684
- //tag
685
- //tag
686
- //tag
687
-
675
+ f_defect_level = configItems.level
688
676
  if (f_is_defect) {
689
677
  if (checkResults.result !== '有隐患') {
690
678
  checkResults.result = '有隐患'
691
679
  }
692
- if (!this.checkResult.hasOwnProperty(f_item_name)) {
680
+ //console.log('items'+items)
681
+ if (items.f_deal_dispose == '报修') {
682
+ //console.log("检测到需要转维修++++++++++++")
683
+ this.repairDefect.result = '未处理'
684
+ this.repairDefect.data.push(`${f_item_name} : ${f_item_value}`)
685
+ }
686
+ if (!this.checkResult.hasOwnProperty(f_device_type + '-' + f_item_name)) {
693
687
  //tag
694
- this.checkResult[f_item_name] = []
688
+ this.checkResult[f_device_type + '-' + f_item_name] = []
695
689
  }
696
690
 
697
691
  //tag
698
- this.checkResult[f_item_name].push(f_item_value)
692
+ this.checkResult[f_device_type + '-' + f_item_name].push(f_item_value)
699
693
 
700
694
  }
701
695
 
702
- let items_list = {
703
- f_is_defect: f_is_defect,
704
- f_item_value: f_item_value,
705
- f_defect_level: f_defect_level,
706
- f_is_eliminate: null,
707
- f_create_time: Util.toStandardTimeString()
708
- }
709
- if (!items.f_item_lists) {
710
- //tag
711
- items.f_item_lists = []
712
- //tag)
713
- if (JSON.stringify(items_list) !== '{}') {
714
- //tag
715
- items.f_item_lists.push(items_list)
716
- }
696
+ let f_selected = f_item_value
697
+ if (!items.f_selected) {
698
+ items.f_selected = []
699
+ items.f_selected.push(f_item_value)
717
700
  } else {
718
- //tag)
719
- if (JSON.stringify(items_list) !== '{}') {
720
- //tag
721
- items.f_item_lists.push(items_list)
722
- }
701
+ items.f_selected.push(f_item_value)
723
702
  }
724
703
  }
725
704
  }
726
705
  }
706
+ //
707
+ items.f_selected = JSON.stringify(items.f_selected);
708
+ items.f_item_value = items.f_item_value ? items.f_item_value.toString() : undefined
727
709
  } else {
728
- let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
729
- //tag)
730
- f_is_defect = configItems.isdefect
710
+ // let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
711
+ let configItems = ''
712
+ this.config.forEach(e => {
713
+ if (e.itemname == f_device_type)
714
+ e.items.forEach(item => {
715
+ if (item.itemname == f_item_name) {
716
+ configItems = item
717
+ }
718
+ })
719
+ })
720
+
721
+ f_is_defect = items.f_is_defect
731
722
  f_defect_level = configItems.level
732
723
  f_item_value = items.f_item_value
733
- //tag
734
- //tag
735
- //tag
724
+ items.f_defect_level = f_defect_level
736
725
  let items_list = {
737
726
  f_is_defect: f_is_defect,
738
727
  f_item_value: f_item_value,
@@ -779,7 +768,7 @@ export default {
779
768
  hasOther = ''
780
769
  otherValue = null
781
770
  }
782
- items.f_item_value = ''
771
+ // items.f_item_value = ''
783
772
  }
784
773
  //tag)
785
774
  this.f_devices.push(codata[device][item])
@@ -788,7 +777,7 @@ export default {
788
777
  }
789
778
  if (this.checkResult) {
790
779
  for (let key in this.checkResult) {
791
- if(typeof this.checkResult[key]=='function'){
780
+ if (typeof this.checkResult[key] == 'function') {
792
781
  continue
793
782
  }
794
783
  // 上次安检结果数据组织
@@ -804,14 +793,23 @@ export default {
804
793
  }
805
794
  this.checkResult = {}
806
795
  }
807
- //tag
808
- //tag)
796
+ if (checkResults.data.length > 0) {
797
+ let msg = ''
798
+ for (let a = 0; a < checkResults.data.length; a++) {
799
+ for (let datumKey in checkResults.data[a]) {
800
+ msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
801
+ }
802
+ }
803
+ this.data.f_defect_text = msg
804
+ codata.f_defect_text = msg
805
+ }
809
806
  codata.f_defect_content = JSON.stringify(checkResults)
810
807
  this.data.f_defect_content = JSON.stringify(checkResults)
811
808
  //tag
809
+ codata.f_security_check_type_id = this.f_security_check_type_id
812
810
  return codata
813
811
  },
814
- uploadCheckPaper(){
812
+ uploadCheckPaper() {
815
813
  this.saveNoclick()
816
814
  //tag
817
815
  //tag
@@ -821,7 +819,7 @@ export default {
821
819
  //tag
822
820
  //tag
823
821
  //tag
824
- if (Vue.android){
822
+ if (Vue.android) {
825
823
  // if(this.isUpload){
826
824
  // this.isUpload = false
827
825
  // }
@@ -838,7 +836,7 @@ export default {
838
836
  }
839
837
  //tag
840
838
  this.onlySave = false
841
- let res = this.save()
839
+ let res = this.save()
842
840
  // if(res) {
843
841
  // try {
844
842
  // let codata = this.getAllDefect()
@@ -986,12 +984,12 @@ export default {
986
984
  this.saveNoclick()
987
985
  //tag
988
986
  //tag
989
- if(type == 'temp'){
987
+ if (type == 'temp') {
990
988
  this.data.f_complete = '未完成'
991
989
  // 关闭录音方法
992
990
  this.closely(true) //临时保存,删除录音文件并暂停录音
993
991
  this.disableTimer()
994
- }else {
992
+ } else {
995
993
  // 关闭录音方法
996
994
  this.closely(false) // 保存本地,不删除录音文件暂停录音
997
995
  let errString = this.errorVerify()
@@ -999,7 +997,7 @@ export default {
999
997
  //tag
1000
998
  //tag
1001
999
  //tag
1002
- if (Vue.android){
1000
+ if (Vue.android) {
1003
1001
  this.$showMessage(errString)
1004
1002
  }
1005
1003
  return
@@ -1010,7 +1008,7 @@ export default {
1010
1008
  }
1011
1009
  }
1012
1010
  //tag
1013
- if(this.data.f_blacklist!='是'){
1011
+ if (this.data.f_blacklist != '是') {
1014
1012
  delete this.data.f_blocking_cause
1015
1013
  }
1016
1014
  // try {
@@ -1030,10 +1028,10 @@ export default {
1030
1028
  //tag
1031
1029
  let value = this.$androidUtil.path({
1032
1030
  alias: 'getUserinfomation',
1033
- data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
1031
+ data: { condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'" }
1034
1032
  })
1035
1033
  //tag)
1036
- if (this.item.f_no_checkplan == '无计划安检' && this.item.f_no_checkplan != '打回') {
1034
+ if (this.item.f_no_checkplan == '无计划安检' && this.item.f_no_checkplan != '打回') {
1037
1035
  // let result = this.$androidUtil.bzLogic('SafeSaveNoPaper', {
1038
1036
  // f_check_item_id: this.data.f_check_item_id,
1039
1037
  // f_checker_id: this.data.f_checker_id,
@@ -1146,7 +1144,7 @@ export default {
1146
1144
  //tag
1147
1145
  let value = this.$androidUtil.path({
1148
1146
  alias: 'getUserinfomation',
1149
- data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
1147
+ data: { condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'" }
1150
1148
  })
1151
1149
 
1152
1150
  if (this.item.f_no_checkplan == '无计划安检' && value.data.length == 0 && this.item.f_no_checkplan != '打回') {
@@ -1249,7 +1247,7 @@ export default {
1249
1247
  // this.$showMessage("保存失败!")
1250
1248
  // }
1251
1249
  },
1252
- runSyncLogic(logic,callback,backresult){
1250
+ runSyncLogic(logic, callback, backresult) {
1253
1251
  HostApp.runSyncLogic({
1254
1252
  // logic别名,key必须为logic
1255
1253
  'logic': logic,
@@ -1258,10 +1256,10 @@ export default {
1258
1256
  // 固定key,代表是否将logic执行结果作为参数传入回调方法,1代表true,0代表false,
1259
1257
  // 执行回调方法传入key为backresult
1260
1258
  // 如需额外拼接参数,写在logic返回值的params,例如xxlogic返回:{"params": "success"}
1261
- 'backresult':backresult
1259
+ 'backresult': backresult
1262
1260
  })
1263
1261
  },
1264
- logicWithHint(logic,data,callback,backresult){
1262
+ logicWithHint(logic, data, callback, backresult) {
1265
1263
  HostApp.logicWithHint({
1266
1264
  // logic别名,key必须为logic
1267
1265
  'logic': logic,
@@ -1272,17 +1270,17 @@ export default {
1272
1270
  // 固定key,代表是否将logic执行结果作为参数传入回调方法,1代表true,0代表false,
1273
1271
  // 执行回调方法传入key为backresult
1274
1272
  // 如需额外拼接参数,写在logic返回值的params,例如xxlogic返回:{"params": "success"}
1275
- 'backresult':backresult
1273
+ 'backresult': backresult
1276
1274
  })
1277
1275
  },
1278
- saveCallBack(jo){
1276
+ saveCallBack(jo) {
1279
1277
  //tag)
1280
- if(jo.state == 'ok'){
1278
+ if (jo.state == 'ok') {
1281
1279
  let res = JSON.parse(jo.result)
1282
1280
  //tag)
1283
- if(res.code == 200){
1281
+ if (res.code == 200) {
1284
1282
  //tag
1285
- if(!this.onlySave){
1283
+ if (!this.onlySave) {
1286
1284
  let codata = this.getAllDefect()
1287
1285
  //获取微信推送内容
1288
1286
  // let WxResult = this.getWeixin(codata)
@@ -1292,18 +1290,18 @@ export default {
1292
1290
  //如果是转维修上传,则不做校验,上传完成后自动转维修
1293
1291
  //tag
1294
1292
  //tag
1295
- if(!this.isToRepair){
1296
- if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
1293
+ if (!this.isToRepair) {
1294
+ if (haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)) {
1297
1295
  //tag
1298
1296
  //tag
1299
- if(!this.isSafeCheckToRepair){
1297
+ if (!this.isSafeCheckToRepair) {
1300
1298
 
1301
1299
  }
1302
1300
  }
1303
1301
  }
1304
1302
  //tag
1305
- for (let key in codata){
1306
- if(key.startsWith("device")){
1303
+ for (let key in codata) {
1304
+ if (key.startsWith("device")) {
1307
1305
  codata[key] = []
1308
1306
  }
1309
1307
  }
@@ -1354,27 +1352,27 @@ export default {
1354
1352
  // 如需额外拼接参数,写在logic返回值的params,例如xxlogic返回:{"params": "success"}
1355
1353
  'backresult': 1
1356
1354
  })
1357
- }else{
1355
+ } else {
1358
1356
  this.$showMessage('保存成功!')
1359
- if(this.clickBack){
1357
+ if (this.clickBack) {
1360
1358
  this.isStrat = false
1361
1359
  this.$dispatch('confirm')
1362
1360
  //this.$back()
1363
1361
  }
1364
1362
  }
1365
- }else{
1363
+ } else {
1366
1364
  this.$showMessage('保存失败!')
1367
1365
  return
1368
1366
  }
1369
- }else{
1367
+ } else {
1370
1368
  this.$showMessage('服务器内部错误,保存失败!')
1371
1369
  return
1372
1370
  }
1373
1371
  },
1374
- uploadCallBack(jo){
1372
+ uploadCallBack(jo) {
1375
1373
  //获取微信推送路径
1376
1374
  let url = ""
1377
- if(Vue.config.safecheck != undefined) {
1375
+ if (Vue.config.safecheck != undefined) {
1378
1376
  if (Vue.config.safecheck.ApproveConfig != undefined) {
1379
1377
  if (Vue.config.safecheck.ApproveConfig.weixinurl != undefined) {
1380
1378
  url = Vue.config.safecheck.ApproveConfig.weixinurl
@@ -1383,93 +1381,93 @@ export default {
1383
1381
  }
1384
1382
  //tag)
1385
1383
  //tag)
1386
- if(jo.state == 'ok'){
1384
+ if (jo.state == 'ok') {
1387
1385
  let res = JSON.parse(jo.result)
1388
1386
  //tag)
1389
1387
  //tag)
1390
- if(res.code == 200){
1388
+ if (res.code == 200) {
1391
1389
  this.$set('data.f_paper_id', res.id)
1392
- this.isStrat=false
1393
- if(url != ""){
1394
- this.$resetpost(`${url}`,{data:WxResult})
1390
+ this.isStrat = false
1391
+ if (url != "") {
1392
+ this.$resetpost(`${url}`, { data: WxResult })
1395
1393
  }
1396
1394
  //tag
1397
- if(this.isToRepair){
1398
- for (let device in this.data){
1399
- if(device.startsWith("device")){
1395
+ if (this.isToRepair) {
1396
+ for (let device in this.data) {
1397
+ if (device.startsWith("device")) {
1400
1398
  this.data[device] = []
1401
- if(res.data.length > 0){
1402
- for(let i in res.data[0].f_devices){
1403
- if(this.data[device].length > 0){
1404
- if(this.data[device][0].f_device_type == res.data[0].f_devices[i].f_device_type){
1399
+ if (res.data.length > 0) {
1400
+ for (let i in res.data[0].f_devices) {
1401
+ if (this.data[device].length > 0) {
1402
+ if (this.data[device][0].f_device_type == res.data[0].f_devices[i].f_device_type) {
1405
1403
  this.data[device].push(res.data[0].f_devices[i])
1406
- res.data[0].f_devices.splice(i,1)
1404
+ res.data[0].f_devices.splice(i, 1)
1407
1405
  }
1408
- }else{
1406
+ } else {
1409
1407
  this.data[device].push(res.data[0].f_devices[i])
1410
- res.data[0].f_devices.splice(i,1)
1408
+ res.data[0].f_devices.splice(i, 1)
1411
1409
  }
1412
1410
  }
1413
1411
  }
1414
1412
  }
1415
1413
  }
1416
1414
  this.todo()
1417
- }else{
1415
+ } else {
1418
1416
  this.$showMessage('上传成功!')
1419
1417
  //tag
1420
1418
  this.$dispatch('confirm')
1421
1419
  // this.$back()
1422
1420
  }
1423
- }else if(res.code == 309){
1421
+ } else if (res.code == 309) {
1424
1422
  this.$showMessage('该安检单已作废!')
1425
1423
  //tag
1426
1424
  this.$dispatch('confirm')
1427
- }else if(res.code == 710){
1425
+ } else if (res.code == 710) {
1428
1426
  this.$showMessage('上传照片失败,请检查用户签名或安检照片缺失,如无问题请检查手机当前网络是否正常(多次上传失败请先点击*本地缓存*按钮,在网络通畅情况下统一上传)!')
1429
1427
  return
1430
- }else if(res.code == 711){
1428
+ } else if (res.code == 711) {
1431
1429
  this.$showMessage('该安检单已被管理员调整,请联系管理员!')
1432
1430
  return
1433
- }else if(res.code == 712){
1431
+ } else if (res.code == 712) {
1434
1432
  this.$showMessage('网络异常,请重新上传,多次上传失败请联系管理员!')
1435
1433
  return
1436
1434
  }
1437
- else{
1435
+ else {
1438
1436
  this.$showMessage('上传失败!')
1439
1437
  }
1440
- }else {
1438
+ } else {
1441
1439
  this.$showMessage('网络异常,上传失败!')
1442
1440
  }
1443
1441
  this.onlySave = true
1444
1442
  },
1445
- safecheckToRepairCallBack(jo){
1443
+ safecheckToRepairCallBack(jo) {
1446
1444
  //获取微信推送路径
1447
- if(jo.state == 'ok'){
1445
+ if (jo.state == 'ok') {
1448
1446
  let res = JSON.parse(jo.result)
1449
1447
  //tag)
1450
- if(res.code == 200){
1448
+ if (res.code == 200) {
1451
1449
  //tag
1452
- if(res.data.code == 200){
1450
+ if (res.data.code == 200) {
1453
1451
  this.$showMessage('上传并转维修成功!')
1454
- }else{
1452
+ } else {
1455
1453
  this.$showMessage('上传并转维修成功,回写安检单失败!')
1456
1454
  }
1457
1455
  this.$dispatch('confirm')
1458
1456
  // this.$back()
1459
- }else{
1457
+ } else {
1460
1458
  this.$showMessage('上传失败!')
1461
1459
  this.onlySave = true
1462
1460
  }
1463
- }else{
1461
+ } else {
1464
1462
  this.$showMessage('网络异常,上传失败!')
1465
1463
  this.onlySave = true
1466
1464
  }
1467
1465
  },
1468
- todo(){
1466
+ todo() {
1469
1467
  let gen = getRepairParam(this)
1470
1468
  co(gen)
1471
1469
  },
1472
- undo(){
1470
+ undo() {
1473
1471
  this.showCheckToRepair = !this.showCheckToRepair
1474
1472
  this.model.serviceacitivity[0].f_reciever = ''
1475
1473
  this.model.serviceacitivity[0].f_meetunit = ''
@@ -1477,13 +1475,13 @@ export default {
1477
1475
  this.meading = '转站点'
1478
1476
  },
1479
1477
  disableTimer() {
1480
- if(this.timer) {
1478
+ if (this.timer) {
1481
1479
  window.clearTimeout(this.timer)
1482
1480
  this.timer = null
1483
1481
  }
1484
1482
  },
1485
1483
  loaded(paper) {
1486
- if(!paper.hasOwnProperty('id')) {
1484
+ if (!paper.hasOwnProperty('id')) {
1487
1485
  this.$showMessage("该安检单在手机上已经不存在,可能是卸载过程序。可以进入重新安检,或返回安检计划。")
1488
1486
  this.init()
1489
1487
  } else {
@@ -1492,7 +1490,7 @@ export default {
1492
1490
  HostApp.__this__.$goto('safecheck-userinfo', {}, 'paper-router')
1493
1491
  // 如果打回重检则重新计时
1494
1492
  //tag
1495
- if(HostApp.__this__.role == 'inspect'
1493
+ if (HostApp.__this__.role == 'inspect'
1496
1494
  && HostApp.__this__.data.f_approved
1497
1495
  && HostApp.__this__.data.f_approved == '打回') {
1498
1496
  //tag
@@ -1504,7 +1502,7 @@ export default {
1504
1502
  HostApp.__this__ = null
1505
1503
  },
1506
1504
  S4() {
1507
- return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
1505
+ return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
1508
1506
  },
1509
1507
  extend(initalObj, finalObj) {
1510
1508
  var obj = finalObj || {};
@@ -1533,85 +1531,25 @@ export default {
1533
1531
  // })
1534
1532
  // this.isneedDate=res.data[0]["f_subscribe_date"]
1535
1533
  // },
1536
- putDevices() {
1537
- //tag)
1538
- //tag)
1539
- this.$set('data.approve', "true")
1540
- this.$set('data.writeback', "false")
1541
- if (Vue.config.safecheck != undefined) {
1542
- if (Vue.config.safecheck.ApproveConfig != undefined) {
1543
- if (Vue.config.safecheck.ApproveConfig.approve != undefined) {
1544
- this.$set('data.approve', Vue.config.safecheck.ApproveConfig.approve)
1545
- }
1546
- if (Vue.config.safecheck.ApproveConfig.writeback != undefined) {
1547
- this.$set('data.writeback', Vue.config.safecheck.ApproveConfig.writeback)
1548
- }
1549
- if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
1550
- this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
1551
- }
1552
- }
1553
- //tag
1554
- //tag)
1555
- //tag)
1556
- //tag
1557
- if(this.item.f_user_type == '民用'){
1558
- // 民用户
1559
-
1560
- if (Vue.config.safecheck.DevicesConfig != undefined){
1561
- if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
1562
- this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
1563
- }else{
1564
- //tag
1565
- //tag
1566
- //tag
1567
- this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
1568
- }
1569
- // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
1570
- }
1571
- }else {
1572
- // 非民用
1573
- if (Vue.config.safecheck.DevicesSetConfig != undefined){
1574
- if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
1575
- this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
1576
- }else{
1577
- //tag
1578
- //tag
1579
- //tag
1580
- this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
1581
- }
1582
- //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
1583
- }
1584
- }
1585
-
1586
- }
1587
- //tag)
1588
- // 预留设备项位置
1534
+ initConfig() {
1589
1535
  for (let i in this.config) {
1590
- this.tabs.splice(1,0,null)
1536
+ this.tabs.splice(1, 0, null)
1591
1537
  }
1592
- //遍历安检项配置
1593
1538
  for (let i in this.config) {
1594
1539
  //取得安检项索引值
1595
- let n = this.config[i].index
1540
+ let n = parseInt(i) + 1
1596
1541
  //tag
1597
- this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
1542
+ this.devices[n - 1] = { device: parseInt(i), n: n, checkmust: this.config[i].checkmust }
1598
1543
  this.$set('data.' + 'device' + n, [])
1599
- //tag
1600
- // this.tabs.splice(2 + n - 1, 0,
1601
- // {
1602
- // header:i,
1603
- // complete:'safecheck-devices',
1604
- // class:'repair-details-class',
1605
- // number:n
1606
- // })
1607
1544
  this.tabs[n] = {
1608
- header: i,
1545
+ header: this.config[i].itemname,
1609
1546
  complete: 'safecheck-devices',
1610
1547
  class: 'repair-details-class',
1611
1548
  number: n
1612
1549
  }
1613
1550
 
1614
- if(this.config[i].quantity && this.config[i].quantity >0){
1551
+ if (this.config[i].quantity && this.config[i].quantity > 0) {
1552
+
1615
1553
  let items = []
1616
1554
  for (let it in this.config[i].items) {
1617
1555
  //赋值下拉选项
@@ -1619,9 +1557,9 @@ export default {
1619
1557
  for (let op in this.config[i].items[it].options) {
1620
1558
  if (this.config[i].items[it].options[op].isdefault == true) {
1621
1559
  items.push({
1622
- f_defect_level: this.config[i].items[it].options[op].level,
1560
+ f_defect_level: this.config[i].items[it].level,
1623
1561
  f_is_defect: this.config[i].items[it].options[op].isdefect,
1624
- f_item_name: it,
1562
+ f_item_name: this.config[i].items[it].itemname,
1625
1563
  f_item_value: this.config[i].items[it].options[op].data,
1626
1564
  f_path: "",
1627
1565
  type: "selector"
@@ -1630,21 +1568,159 @@ export default {
1630
1568
  }
1631
1569
  }
1632
1570
  }
1633
- for(let q =0;q<this.config[i].quantity;q++) {
1571
+ for (let q = 0; q < this.config[i].quantity; q++) {
1634
1572
  this.data['device' + n].push(
1635
- {f_device_type: i, f_items:items}
1573
+ {
1574
+ f_device_type: this.config[i].itemname, f_items: items
1575
+ }
1636
1576
  )
1637
1577
  }
1638
1578
  }
1639
- // this.data['device' + n].push(
1640
- // {f_device_type: i, f_items: items}
1641
- // )
1642
1579
  n = n + 1
1643
1580
  }
1644
- //tag
1645
1581
  this.faultshow.number = this.tabs.length
1646
1582
  },
1647
- init () {
1583
+ async getSecurityCheckType(url, data) {
1584
+ let res = await new HttpResetClass().http('POST', url,
1585
+ data,
1586
+ { resolveMsg: null, rejectMsg: '网络异常' })
1587
+ this.serverConfig = JSON.parse(res.data)
1588
+ },
1589
+ async putDevices() {
1590
+ //tag)
1591
+ //tag)
1592
+ this.$set('data.approve', "true")
1593
+ this.$set('data.writeback', "false")
1594
+ console.log('this.itemccc', JSON.stringify(this.item))
1595
+ if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
1596
+ try {
1597
+ await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, { id: this.item.f_security_check_type_id })
1598
+ this.f_security_check_type_id = this.serverConfig.data.id
1599
+ } catch (e) {
1600
+ return this.$showMessage('获取配置文件失败,请返回后重新进入!多次失败请联系管理员')
1601
+ }
1602
+ this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
1603
+ this.initConfig()
1604
+ } else {
1605
+ try {
1606
+ await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, { f_safecheck_type: this.item.f_safecheck_type || '年度普检', f_user_type: this.item.f_user_type, f_orgid: Vue.user.orgid })
1607
+ this.f_security_check_type_id = this.serverConfig.data[0].id
1608
+ } catch (e) {
1609
+ return this.$showMessage('获取配置文件失败,请返回后重新进入!多次失败请联系管理员')
1610
+ }
1611
+ console.log('this.config1=', JSON.stringify(this.config))
1612
+ this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
1613
+ console.log('this.config2=', JSON.stringify(this.config))
1614
+ this.initConfig()
1615
+ console.log('this.config3=', JSON.stringify(this.config))
1616
+ // if (Vue.config.safecheck != undefined) {
1617
+ // if (Vue.config.safecheck.ApproveConfig != undefined) {
1618
+ // if (Vue.config.safecheck.ApproveConfig.approve != undefined) {
1619
+ // this.$set('data.approve', Vue.config.safecheck.ApproveConfig.approve)
1620
+ // }
1621
+ // if (Vue.config.safecheck.ApproveConfig.writeback != undefined) {
1622
+ // this.$set('data.writeback', Vue.config.safecheck.ApproveConfig.writeback)
1623
+ // }
1624
+ // if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
1625
+ // this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
1626
+ // }
1627
+ // }
1628
+ // //tag
1629
+ // //tag)
1630
+ // //tag)
1631
+ // //tag
1632
+ // if(this.item.f_user_type == '民用'){
1633
+ // // 民用户
1634
+ //
1635
+ // if (Vue.config.safecheck.DevicesConfig != undefined){
1636
+ // if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
1637
+ // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
1638
+ // }else{
1639
+ // //tag
1640
+ // //tag
1641
+ // //tag
1642
+ // this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
1643
+ // }
1644
+ // // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
1645
+ // }
1646
+ // }else {
1647
+ // // 非民用
1648
+ // if (Vue.config.safecheck.DevicesSetConfig != undefined){
1649
+ // if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
1650
+ // this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
1651
+ // }else{
1652
+ // //tag
1653
+ // //tag
1654
+ // //tag
1655
+ // this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
1656
+ // }
1657
+ // //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
1658
+ // }
1659
+ // }
1660
+ //
1661
+ // }
1662
+ //tag)
1663
+ // 预留设备项位置
1664
+ for (let i in this.config) {
1665
+ this.tabs.splice(1, 0, null)
1666
+ }
1667
+ //遍历安检项配置
1668
+ for (let i in this.config) {
1669
+ //取得安检项索引值
1670
+ let n = this.config[i].index
1671
+ //tag
1672
+ this.devices[n - 1] = { device: i, n: n, checkmust: this.config[i].checkmust }
1673
+ this.$set('data.' + 'device' + n, [])
1674
+ //tag
1675
+ // this.tabs.splice(2 + n - 1, 0,
1676
+ // {
1677
+ // header:i,
1678
+ // complete:'safecheck-devices',
1679
+ // class:'repair-details-class',
1680
+ // number:n
1681
+ // })
1682
+ this.tabs[n] = {
1683
+ header: i,
1684
+ complete: 'safecheck-devices',
1685
+ class: 'repair-details-class',
1686
+ number: n
1687
+ }
1688
+
1689
+ if (this.config[i].quantity && this.config[i].quantity > 0) {
1690
+ let items = []
1691
+ for (let it in this.config[i].items) {
1692
+ //赋值下拉选项
1693
+ if (this.config[i].items[it].type == 'selector') {
1694
+ for (let op in this.config[i].items[it].options) {
1695
+ if (this.config[i].items[it].options[op].isdefault == true) {
1696
+ items.push({
1697
+ f_defect_level: this.config[i].items[it].options[op].level,
1698
+ f_is_defect: this.config[i].items[it].options[op].isdefect,
1699
+ f_item_name: it,
1700
+ f_item_value: this.config[i].items[it].options[op].data,
1701
+ f_path: "",
1702
+ type: "selector"
1703
+ })
1704
+ }
1705
+ }
1706
+ }
1707
+ }
1708
+ for (let q = 0; q < this.config[i].quantity; q++) {
1709
+ this.data['device' + n].push(
1710
+ { f_device_type: i, f_items: items }
1711
+ )
1712
+ }
1713
+ }
1714
+ // this.data['device' + n].push(
1715
+ // {f_device_type: i, f_items: items}
1716
+ // )
1717
+ n = n + 1
1718
+ }
1719
+ //tag
1720
+ this.faultshow.number = this.tabs.length
1721
+ }
1722
+ },
1723
+ init() {
1648
1724
  //tag
1649
1725
  // this.data.f_noplan_item_id = this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
1650
1726
  this.data.ename = Vue.user.ename
@@ -1667,14 +1743,14 @@ export default {
1667
1743
  this.data.f_filialeid = this.item.f_filialeid
1668
1744
  this.data.f_orgstr = this.item.f_orgstr
1669
1745
  this.data.version = this.item.version
1670
- this.data.f_check_version=this.item.f_check_version
1746
+ this.data.f_check_version = this.item.f_check_version
1671
1747
  this.$set('data.f_meters', this.item.f_plan_meters)
1672
1748
  this.$set('data.f_userinfo_code', this.item.f_userinfo_code)
1673
1749
  // 安检状态
1674
1750
  this.$set('data.f_entry_status', '入户')
1675
1751
  this.$set('data.f_usegas', '已使用')
1676
- this.$set('data.f_state',this.item.f_state)
1677
- this.$set('data.f_source', this.source?this.source:'安检')
1752
+ this.$set('data.f_state', this.item.f_state)
1753
+ this.$set('data.f_source', this.source ? this.source : '安检')
1678
1754
  //tag
1679
1755
  // 用户信息
1680
1756
  this.$set('data.f_user_name', this.item.f_user_name)
@@ -1689,7 +1765,7 @@ export default {
1689
1765
  this.$set('data.f_unit', this.item.f_unit)
1690
1766
  //tag
1691
1767
  this.$set('data.f_floor', this.item.f_floor)
1692
- this.$set('data.f_residential_area' , this.item.f_residential_area)
1768
+ this.$set('data.f_residential_area', this.item.f_residential_area)
1693
1769
  this.$set('data.f_idnumber', this.item.f_idnumber)
1694
1770
  this.$set('data.f_comments', this.item.f_comments)
1695
1771
  this.$set('data.f_userproperties', this.item.f_userproperties)
@@ -1711,16 +1787,365 @@ export default {
1711
1787
  this.data.f_check_item_id = this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4()
1712
1788
  }
1713
1789
  //tag
1714
- if(this.item.f_plan_meters) {
1790
+ // if(this.item.f_plan_meters) {
1791
+ // for (let de in this.devices) {
1792
+ // if(typeof this.devices[de]=='function'){
1793
+ // continue
1794
+ // }
1795
+ // this.$set('data.device' + this.devices[de].n, [])
1796
+ // for (let i = 0; i < this.item.f_plan_meters.length; i++) {
1797
+ // if (this.item.f_plan_meters[i].f_meter_type) {
1798
+ // //tag)
1799
+ // if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
1800
+ // this.data['device' + this.devices[de].n].push({
1801
+ // f_device_type: "燃气表",
1802
+ // f_items: [
1803
+ // {
1804
+ // f_defect_level: null,
1805
+ // f_device_id: "",
1806
+ // f_is_defect: "",
1807
+ // f_item_name: "气表表号",
1808
+ // f_item_value: this.item.f_plan_meters[i].f_meter_no,
1809
+ // f_path: "",
1810
+ // type: "number"
1811
+ // },
1812
+ // {
1813
+ // f_defect_level: null,
1814
+ // f_device_id: "",
1815
+ // f_is_defect: "",
1816
+ // f_item_name: "气表型号",
1817
+ // f_item_value: this.item.f_plan_meters[i].f_diaphgram_size,
1818
+ // f_path: "",
1819
+ // type: "string"
1820
+ // },
1821
+ // {
1822
+ // f_defect_level: null,
1823
+ // f_device_id: "",
1824
+ // f_is_defect: "",
1825
+ // f_item_name: "气表品牌",
1826
+ // f_item_value: this.item.f_plan_meters[i].f_aliasname,
1827
+ // f_path: "",
1828
+ // type: "string"
1829
+ // },
1830
+ // {
1831
+ // f_defect_level: null,
1832
+ // f_device_id: "",
1833
+ // f_is_defect: "",
1834
+ // f_item_name: "气表类型",
1835
+ // f_item_value: this.item.f_plan_meters[i].f_meter_classify,
1836
+ // f_path: "",
1837
+ // type: "string"
1838
+ // },
1839
+ // {
1840
+ // f_defect_level: null,
1841
+ // f_device_id: "",
1842
+ // f_is_defect: "",
1843
+ // f_item_name: "进气方向",
1844
+ // f_item_value: this.item.f_plan_meters[i].f_flow_direction,
1845
+ // f_path: "",
1846
+ // type: "selector"
1847
+ // },
1848
+ // {
1849
+ // f_defect_level: null,
1850
+ // f_device_id: "",
1851
+ // f_is_defect: "",
1852
+ // f_item_name: "上期表读数",
1853
+ // f_item_value: this.item.f_plan_meters[i].f_prior_reading,
1854
+ // f_path: "",
1855
+ // type: "number"
1856
+ // },
1857
+ // {
1858
+ // f_defect_level: null,
1859
+ // f_device_id: "",
1860
+ // f_is_defect: "",
1861
+ // f_item_name: "表箱号",
1862
+ // f_item_value: this.item.f_plan_meters[i].f_metertitles,
1863
+ // f_path: "",
1864
+ // type: "string"
1865
+ // }
1866
+ // ]
1867
+ // })
1868
+ // }
1869
+ // else if (this.devices[de].device == "燃气表") {
1870
+ // // delete this.config['燃气表']['items']['表底数']
1871
+ // this.data['device' + this.devices[de].n].push({
1872
+ // f_device_type: "燃气表",
1873
+ // f_items: [
1874
+ // {
1875
+ // f_defect_level: null,
1876
+ // f_device_id: "",
1877
+ // f_is_defect: "",
1878
+ // f_item_name: "气表表号",
1879
+ // f_item_value: this.item.f_plan_meters[i].f_meter_no,
1880
+ // f_path: "",
1881
+ // type: "number"
1882
+ // },
1883
+ // {
1884
+ // f_defect_level: null,
1885
+ // f_device_id: "",
1886
+ // f_is_defect: "",
1887
+ // f_item_name: "气表型号",
1888
+ // f_item_value: this.item.f_plan_meters[i].f_diaphgram_size,
1889
+ // f_path: "",
1890
+ // type: "string"
1891
+ // },
1892
+ // {
1893
+ // f_defect_level: null,
1894
+ // f_device_id: "",
1895
+ // f_is_defect: "",
1896
+ // f_item_name: "气表品牌",
1897
+ // f_item_value: this.item.f_plan_meters[i].f_aliasname,
1898
+ // f_path: "",
1899
+ // type: "string"
1900
+ // },
1901
+ // {
1902
+ // f_defect_level: null,
1903
+ // f_device_id: "",
1904
+ // f_is_defect: "",
1905
+ // f_item_name: "气表类型",
1906
+ // f_item_value: this.item.f_plan_meters[i].f_meter_classify,
1907
+ // f_path: "",
1908
+ // type: "string"
1909
+ // },
1910
+ // {
1911
+ // f_defect_level: null,
1912
+ // f_device_id: "",
1913
+ // f_is_defect: "",
1914
+ // f_item_name: "进气方向",
1915
+ // f_item_value: this.item.f_plan_meters[i].f_flow_direction,
1916
+ // f_path: "",
1917
+ // type: "selector"
1918
+ // },
1919
+ // {
1920
+ // f_defect_level: null,
1921
+ // f_device_id: "",
1922
+ // f_is_defect: "",
1923
+ // f_item_name: "上期表读数",
1924
+ // f_item_value: this.item.f_plan_meters[i].f_prior_reading,
1925
+ // f_path: "",
1926
+ // type: "number"
1927
+ // },
1928
+ // {
1929
+ // f_defect_level: null,
1930
+ // f_device_id: "",
1931
+ // f_is_defect: "",
1932
+ // f_item_name: "表箱号",
1933
+ // f_item_value: this.item.f_plan_meters[i].f_metertitles,
1934
+ // f_path: "",
1935
+ // type: "string"
1936
+ // }
1937
+ // ]
1938
+ // })
1939
+ // }
1940
+ // if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
1941
+ // this.data['device' + this.devices[de].n].forEach(device => {
1942
+ // //tag)
1943
+ // //tag)
1944
+ // /*
1945
+ // "累购气量":{"index":8,"type":"number","readonly":true},
1946
+ // "累购金额":{"index":8,"type":"number","readonly":true},
1947
+ // "字轮读数":{"index":9,"type":"number","checkmust": true},
1948
+ // "已用金额":{"index":9,"type":"number","checkmust": true},
1949
+ // "剩余气量":{"index":10,"type":"number","checkmust": true},
1950
+ // "剩余金额":{"index":10,"type":"number","checkmust": true},
1951
+ // "气量异常差值":{"index":11,"type":"number","readonly": true},
1952
+ // "金额异常差值":{"index":11,"type":"number","readonly": true}
1953
+ // */
1954
+ // if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
1955
+ // if (!this.data.f_collection_type) {
1956
+ // this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
1957
+ // delete this.config['燃气表']['items']['累购气量']
1958
+ // delete this.config['燃气表']['items']['已用气量']
1959
+ // delete this.config['燃气表']['items']['剩余气量']
1960
+ // delete this.config['燃气表']['items']['气量异常差值']
1961
+ // device.f_items.push(
1962
+ // {
1963
+ // f_defect_level: null,
1964
+ // f_device_id: "",
1965
+ // f_is_defect: "",
1966
+ // f_item_name: "初始表底",
1967
+ // isshow: false,
1968
+ // f_item_value: '',
1969
+ // f_path: "",
1970
+ // type: "number"
1971
+ // },
1972
+ // {
1973
+ // f_defect_level: null,
1974
+ // f_device_id: "",
1975
+ // f_is_defect: "",
1976
+ // f_item_name: "累购金额",
1977
+ // f_item_value: this.item.f_plan_meters[i].f_total_fee,
1978
+ // f_path: "",
1979
+ // type: "number"
1980
+ // },
1981
+ // {
1982
+ // f_defect_level: null,
1983
+ // f_device_id: "",
1984
+ // f_is_defect: "",
1985
+ // f_item_name: "已用金额",
1986
+ // f_item_value: null,
1987
+ // f_path: "",
1988
+ // type: "number"
1989
+ // },
1990
+ // {
1991
+ // f_defect_level: null,
1992
+ // f_device_id: "",
1993
+ // f_is_defect: "",
1994
+ // f_item_name: "剩余金额",
1995
+ // f_item_value: null,
1996
+ // f_path: "",
1997
+ // type: "number"
1998
+ // },
1999
+ // {
2000
+ // f_defect_level: null,
2001
+ // f_device_id: "",
2002
+ // f_is_defect: "",
2003
+ // f_item_name: "金额异常差值",
2004
+ // f_item_value: null,
2005
+ // f_path: "",
2006
+ // type: "number"
2007
+ // }
2008
+ // )
2009
+ // //tag)
2010
+ // }
2011
+ // } else
2012
+ // if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
2013
+ // if (!this.data.f_collection_type) {
2014
+ // this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2015
+ // delete this.config['燃气表']['items']['累购金额']
2016
+ // delete this.config['燃气表']['items']['已用金额']
2017
+ // delete this.config['燃气表']['items']['剩余金额']
2018
+ // delete this.config['燃气表']['items']['金额异常差值']
2019
+ // device.f_items.push(
2020
+ // {
2021
+ // f_defect_level: null,
2022
+ // f_device_id: "",
2023
+ // f_is_defect: "",
2024
+ // f_item_name: "初始表底",
2025
+ // isshow: true,
2026
+ // f_item_value: this.item.f_plan_meters[i].f_initial_base,
2027
+ // f_path: "",
2028
+ // type: "number"
2029
+ // },
2030
+ // {
2031
+ // f_defect_level: null,
2032
+ // f_device_id: "",
2033
+ // f_is_defect: "",
2034
+ // f_item_name: "累购气量",
2035
+ // f_item_value: this.item.f_plan_meters[i].f_total_gas,
2036
+ // f_path: "",
2037
+ // type: "number"
2038
+ // },
2039
+ // {
2040
+ // f_defect_level: null,
2041
+ // f_device_id: "",
2042
+ // f_is_defect: "",
2043
+ // f_item_name: "已用气量",
2044
+ // f_item_value: this.item.f_plan_meters[i].f_meter_base,
2045
+ // f_path: "",
2046
+ // type: "number"
2047
+ // },
2048
+ // {
2049
+ // f_defect_level: null,
2050
+ // f_device_id: "",
2051
+ // f_is_defect: "",
2052
+ // f_item_name: "剩余气量",
2053
+ // f_item_value: "",
2054
+ // f_path: "",
2055
+ // type: "number"
2056
+ // },
2057
+ // {
2058
+ // f_defect_level: null,
2059
+ // f_device_id: "",
2060
+ // f_is_defect: "",
2061
+ // f_item_name: "气量异常差值",
2062
+ // f_item_value: null,
2063
+ // f_path: "",
2064
+ // type: "number"
2065
+ // }
2066
+ // )
2067
+ // //tag)
2068
+ // }
2069
+ // }
2070
+ // })
2071
+ // }else if(this.devices[de].device == "燃气表"){
2072
+ // //tag
2073
+ // this.data['device' + this.devices[de].n].forEach(device => {
2074
+ // //tag)
2075
+ // if (!this.data.f_collection_type) {
2076
+ // this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2077
+ // delete this.config['燃气表']['items']['累购金额']
2078
+ // delete this.config['燃气表']['items']['已用金额']
2079
+ // delete this.config['燃气表']['items']['剩余金额']
2080
+ // delete this.config['燃气表']['items']['金额异常差值']
2081
+ // device.f_items.push(
2082
+ // {
2083
+ // f_defect_level: null,
2084
+ // f_device_id: "",
2085
+ // f_is_defect: "",
2086
+ // f_item_name: "初始表底",
2087
+ // isshow: true,
2088
+ // f_item_value: this.item.f_plan_meters[i].f_initial_base,
2089
+ // f_path: "",
2090
+ // type: "number"
2091
+ // },
2092
+ // {
2093
+ // f_defect_level: null,
2094
+ // f_device_id: "",
2095
+ // f_is_defect: "",
2096
+ // f_item_name: "累购气量",
2097
+ // f_item_value: this.item.f_plan_meters[i].f_total_gas,
2098
+ // f_path: "",
2099
+ // type: "number"
2100
+ // },
2101
+ // {
2102
+ // f_defect_level: null,
2103
+ // f_device_id: "",
2104
+ // f_is_defect: "",
2105
+ // f_item_name: "已用气量",
2106
+ // f_item_value: this.item.f_plan_meters[i].f_meter_base,
2107
+ // f_path: "",
2108
+ // type: "number"
2109
+ // },
2110
+ // {
2111
+ // f_defect_level: null,
2112
+ // f_device_id: "",
2113
+ // f_is_defect: "",
2114
+ // f_item_name: "剩余气量",
2115
+ // f_item_value: '',
2116
+ // f_path: "",
2117
+ // type: "number"
2118
+ // },
2119
+ // {
2120
+ // f_defect_level: null,
2121
+ // f_device_id: "",
2122
+ // f_is_defect: "",
2123
+ // f_item_name: "气量异常差值",
2124
+ // isshow:false,
2125
+ // f_item_value: null,
2126
+ // f_path: "",
2127
+ // type: "number"
2128
+ // }
2129
+ // )
2130
+ // //tag)
2131
+ // }
2132
+ // })
2133
+ // }
2134
+ // }
2135
+ // }
2136
+ // }
2137
+ // }
2138
+ if (this.item.f_plan_meters) {
1715
2139
  for (let de in this.devices) {
1716
- if(typeof this.devices[de]=='function'){
2140
+ if (typeof this.devices[de] == 'function') {
1717
2141
  continue
1718
2142
  }
1719
2143
  this.$set('data.device' + this.devices[de].n, [])
1720
2144
  for (let i = 0; i < this.item.f_plan_meters.length; i++) {
1721
2145
  if (this.item.f_plan_meters[i].f_meter_type) {
2146
+ this.data.f_meter_type = this.item.f_plan_meters[i].f_meter_type
1722
2147
  //tag)
1723
- if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
2148
+ if (this.config[this.devices[de].device].itemname == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
1724
2149
  this.data['device' + this.devices[de].n].push({
1725
2150
  f_device_type: "燃气表",
1726
2151
  f_items: [
@@ -1728,7 +2153,7 @@ export default {
1728
2153
  f_defect_level: null,
1729
2154
  f_device_id: "",
1730
2155
  f_is_defect: "",
1731
- f_item_name: "气表表号",
2156
+ f_item_name: "基表编号",
1732
2157
  f_item_value: this.item.f_plan_meters[i].f_meter_no,
1733
2158
  f_path: "",
1734
2159
  type: "number"
@@ -1755,8 +2180,8 @@ export default {
1755
2180
  f_defect_level: null,
1756
2181
  f_device_id: "",
1757
2182
  f_is_defect: "",
1758
- f_item_name: "气表类型",
1759
- f_item_value: this.item.f_plan_meters[i].f_meter_classify,
2183
+ f_item_name: "进气方向",
2184
+ f_item_value: this.item.f_plan_meters[i].f_flow_direction,
1760
2185
  f_path: "",
1761
2186
  type: "string"
1762
2187
  },
@@ -1764,17 +2189,17 @@ export default {
1764
2189
  f_defect_level: null,
1765
2190
  f_device_id: "",
1766
2191
  f_is_defect: "",
1767
- f_item_name: "进气方向",
1768
- f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2192
+ f_item_name: "上次表底",
2193
+ f_item_value: this.item.f_plan_meters[i].f_prior_reading ? this.item.f_plan_meters[i].f_prior_reading : 0,
1769
2194
  f_path: "",
1770
- type: "selector"
2195
+ type: "number"
1771
2196
  },
1772
2197
  {
1773
2198
  f_defect_level: null,
1774
2199
  f_device_id: "",
1775
2200
  f_is_defect: "",
1776
- f_item_name: "上期表读数",
1777
- f_item_value: this.item.f_plan_meters[i].f_prior_reading,
2201
+ f_item_name: "本次表底",
2202
+ f_item_value: "",
1778
2203
  f_path: "",
1779
2204
  type: "number"
1780
2205
  },
@@ -1782,15 +2207,15 @@ export default {
1782
2207
  f_defect_level: null,
1783
2208
  f_device_id: "",
1784
2209
  f_is_defect: "",
1785
- f_item_name: "表箱号",
1786
- f_item_value: this.item.f_plan_meters[i].f_metertitles,
2210
+ f_item_name: "表底差值",
2211
+ f_item_value: "",
1787
2212
  f_path: "",
1788
- type: "string"
2213
+ type: "number"
1789
2214
  }
1790
2215
  ]
1791
2216
  })
1792
2217
  }
1793
- else if (this.devices[de].device == "燃气表") {
2218
+ else if (this.config[this.devices[de].device].itemname == "燃气表") {
1794
2219
  // delete this.config['燃气表']['items']['表底数']
1795
2220
  this.data['device' + this.devices[de].n].push({
1796
2221
  f_device_type: "燃气表",
@@ -1799,7 +2224,7 @@ export default {
1799
2224
  f_defect_level: null,
1800
2225
  f_device_id: "",
1801
2226
  f_is_defect: "",
1802
- f_item_name: "气表表号",
2227
+ f_item_name: "基表编号",
1803
2228
  f_item_value: this.item.f_plan_meters[i].f_meter_no,
1804
2229
  f_path: "",
1805
2230
  type: "number"
@@ -1826,8 +2251,8 @@ export default {
1826
2251
  f_defect_level: null,
1827
2252
  f_device_id: "",
1828
2253
  f_is_defect: "",
1829
- f_item_name: "气表类型",
1830
- f_item_value: this.item.f_plan_meters[i].f_meter_classify,
2254
+ f_item_name: "进气方向",
2255
+ f_item_value: this.item.f_plan_meters[i].f_flow_direction,
1831
2256
  f_path: "",
1832
2257
  type: "string"
1833
2258
  },
@@ -1835,17 +2260,17 @@ export default {
1835
2260
  f_defect_level: null,
1836
2261
  f_device_id: "",
1837
2262
  f_is_defect: "",
1838
- f_item_name: "进气方向",
1839
- f_item_value: this.item.f_plan_meters[i].f_flow_direction,
2263
+ f_item_name: "上次表底",
2264
+ f_item_value: this.item.f_plan_meters[i].f_prior_reading ? this.item.f_plan_meters[i].f_prior_reading : 0,
1840
2265
  f_path: "",
1841
- type: "selector"
2266
+ type: "number"
1842
2267
  },
1843
2268
  {
1844
2269
  f_defect_level: null,
1845
2270
  f_device_id: "",
1846
2271
  f_is_defect: "",
1847
- f_item_name: "上期表读数",
1848
- f_item_value: this.item.f_plan_meters[i].f_prior_reading,
2272
+ f_item_name: "本次表底",
2273
+ f_item_value: "",
1849
2274
  f_path: "",
1850
2275
  type: "number"
1851
2276
  },
@@ -1853,19 +2278,19 @@ export default {
1853
2278
  f_defect_level: null,
1854
2279
  f_device_id: "",
1855
2280
  f_is_defect: "",
1856
- f_item_name: "表箱号",
1857
- f_item_value: this.item.f_plan_meters[i].f_metertitles,
2281
+ f_item_name: "表底差值",
2282
+ f_item_value: "",
1858
2283
  f_path: "",
1859
- type: "string"
2284
+ type: "number"
1860
2285
  }
1861
2286
  ]
1862
2287
  })
1863
2288
  }
1864
- if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
2289
+ /*if (this.config[this.devices[de].device].itemname == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
1865
2290
  this.data['device' + this.devices[de].n].forEach(device => {
1866
2291
  //tag)
1867
2292
  //tag)
1868
- /*
2293
+ /!*
1869
2294
  "累购气量":{"index":8,"type":"number","readonly":true},
1870
2295
  "累购金额":{"index":8,"type":"number","readonly":true},
1871
2296
  "字轮读数":{"index":9,"type":"number","checkmust": true},
@@ -1874,14 +2299,19 @@ export default {
1874
2299
  "剩余金额":{"index":10,"type":"number","checkmust": true},
1875
2300
  "气量异常差值":{"index":11,"type":"number","readonly": true},
1876
2301
  "金额异常差值":{"index":11,"type":"number","readonly": true}
1877
- */
1878
- if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
2302
+ *!/
2303
+ /!*if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
1879
2304
  if (!this.data.f_collection_type) {
1880
2305
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
1881
- delete this.config['燃气表']['items']['累购气量']
1882
- delete this.config['燃气表']['items']['已用气量']
1883
- delete this.config['燃气表']['items']['剩余气量']
1884
- delete this.config['燃气表']['items']['气量异常差值']
2306
+ // delete this.config['燃气表']['items']['累购气量']
2307
+ // delete this.config['燃气表']['items']['已用气量']
2308
+ // delete this.config['燃气表']['items']['剩余气量']
2309
+ // delete this.config['燃气表']['items']['气量异常差值']
2310
+ this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
2311
+ // this.config = this.removeNestedItem(this.config, '燃气表', '累购气量')
2312
+ // this.config = this.removeNestedItem(this.config, '燃气表', '已用气量')
2313
+ // this.config = this.removeNestedItem(this.config, '燃气表', '剩余气量')
2314
+ // this.config = this.removeNestedItem(this.config, '燃气表', '气量异常差值')
1885
2315
  device.f_items.push(
1886
2316
  {
1887
2317
  f_defect_level: null,
@@ -1924,22 +2354,60 @@ export default {
1924
2354
  f_defect_level: null,
1925
2355
  f_device_id: "",
1926
2356
  f_is_defect: "",
1927
- f_item_name: "金额异常差值",
2357
+ f_item_name: "气量异常差值",
1928
2358
  f_item_value: null,
1929
2359
  f_path: "",
1930
2360
  type: "number"
1931
- }
2361
+ },
2362
+ {
2363
+ f_defect_level: null,
2364
+ f_device_id: "",
2365
+ f_is_defect: "",
2366
+ f_item_name: "系统表底数",
2367
+ f_item_value: this.item.f_plan_meters[i].f_metergasnums,
2368
+ f_path: "",
2369
+ type: "number"
2370
+ },
2371
+ {
2372
+ f_defect_level: null,
2373
+ f_device_id: "",
2374
+ f_is_defect: "",
2375
+ f_item_name: "最后通讯时间",
2376
+ f_item_value: this.item.f_plan_meters[i].f_insert_date,
2377
+ f_path: "",
2378
+ type: "string"
2379
+ },
2380
+ {
2381
+ f_defect_level: null,
2382
+ f_device_id: "",
2383
+ f_is_defect: "",
2384
+ f_item_name: "系统剩余金额",
2385
+ f_item_value: this.item.f_plan_meters[i].f_balance_amount,
2386
+ f_path: "",
2387
+ type: "number"
2388
+ },
2389
+ {
2390
+ f_defect_level: null,
2391
+ f_device_id: "",
2392
+ f_is_defect: "",
2393
+ f_item_name: "已用气量",
2394
+ f_item_value: this.item.f_plan_meters[i].f_meter_base,
2395
+ f_path: "",
2396
+ type: "number"
2397
+ },
1932
2398
  )
1933
2399
  //tag)
1934
2400
  }
1935
2401
  } else
1936
- if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
2402
+ if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
1937
2403
  if (!this.data.f_collection_type) {
2404
+ //console.log('this.config,按气量', this.config)
1938
2405
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
1939
- delete this.config['燃气表']['items']['累购金额']
1940
- delete this.config['燃气表']['items']['已用金额']
1941
- delete this.config['燃气表']['items']['剩余金额']
1942
- delete this.config['燃气表']['items']['金额异常差值']
2406
+ this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
2407
+ // this.config = this.removeNestedItem(this.config, '燃气表', '累购金额')
2408
+ // this.config = this.removeNestedItem(this.config, '燃气表', '已用金额')
2409
+ // this.config = this.removeNestedItem(this.config, '燃气表', '剩余金额')
2410
+ // this.config = this.removeNestedItem(this.config, '燃气表', '金额异常差值')
1943
2411
  device.f_items.push(
1944
2412
  {
1945
2413
  f_defect_level: null,
@@ -1992,16 +2460,22 @@ export default {
1992
2460
  }
1993
2461
  }
1994
2462
  })
1995
- }else if(this.devices[de].device == "燃气表"){
2463
+ }
2464
+ else if(this.config[this.devices[de].device].itemname == "燃气表"){
1996
2465
  //tag
1997
2466
  this.data['device' + this.devices[de].n].forEach(device => {
1998
2467
  //tag)
1999
2468
  if (!this.data.f_collection_type) {
2000
2469
  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
2001
- delete this.config['燃气表']['items']['累购金额']
2002
- delete this.config['燃气表']['items']['已用金额']
2003
- delete this.config['燃气表']['items']['剩余金额']
2004
- delete this.config['燃气表']['items']['金额异常差值']
2470
+ // delete this.config['燃气表']['items']['累购金额']
2471
+ // delete this.config['燃气表']['items']['已用金额']
2472
+ // delete this.config['燃气表']['items']['剩余金额']
2473
+ // delete this.config['燃气表']['items']['金额异常差值']
2474
+ // this.config = this.removeNestedItem(this.config, '燃气表', '累购金额')
2475
+ // this.config = this.removeNestedItem(this.config, '燃气表', '已用金额')
2476
+ // this.config = this.removeNestedItem(this.config, '燃气表', '剩余金额')
2477
+ // this.config = this.removeNestedItem(this.config, '燃气表', '金额异常差值')
2478
+ this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
2005
2479
  device.f_items.push(
2006
2480
  {
2007
2481
  f_defect_level: null,
@@ -2054,31 +2528,32 @@ export default {
2054
2528
  //tag)
2055
2529
  }
2056
2530
  })
2057
- }
2531
+ }*/
2058
2532
  }
2059
2533
  }
2060
2534
  }
2061
2535
  }
2536
+
2062
2537
  var pardate = {
2063
- _this:this,
2064
- tittle:'安检详情',
2065
- safe:true
2538
+ _this: this,
2539
+ tittle: '安检详情',
2540
+ safe: true
2066
2541
  }
2067
2542
  // this.$dispatch('gotoson',pardate)
2068
2543
  //tag
2069
- this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
2544
+ this.$goto('safecheck-userinfo', { userinfo: this.data }, 'repair')
2070
2545
  }
2071
2546
  },
2072
2547
  watch: {
2073
- 'row' () {
2548
+ 'row'() {
2074
2549
  //tag
2075
2550
  this.copy()
2076
2551
  }
2077
2552
  },
2078
- async ready () {
2553
+ async ready() {
2079
2554
  //送气超期功能
2080
2555
  //await this.isoverDate()
2081
- this.putDevices()
2556
+ await this.putDevices()
2082
2557
  //如果已检,则提取安检单
2083
2558
  if (this.item.f_state != '未检') {
2084
2559
  if (this.role == 'inspect' || this.role == 'androidview') {
@@ -2092,13 +2567,13 @@ export default {
2092
2567
  if (this.item.f_no_checkplan == '无计划安检') {
2093
2568
  value = this.$androidUtil.path({
2094
2569
  alias: 'getUserinfomation',
2095
- data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan = '无计划安检'"}
2570
+ data: { condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan = '无计划安检'" }
2096
2571
  })
2097
2572
  } else {
2098
- value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
2573
+ value = this.$androidUtil.bzLogic('FetchCheckPaper', { id: this.item.id })
2099
2574
  }
2100
2575
  } else {
2101
- value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
2576
+ value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, { data: { condition: `id = '${this.item.f_paper_id}'` } })
2102
2577
  }
2103
2578
  Util.replaceFalse(value)
2104
2579
  //tag)
@@ -2119,7 +2594,7 @@ export default {
2119
2594
  //tag)
2120
2595
  if (value.data[0].f_devices) {
2121
2596
  for (let da in that.devices) {
2122
- if(typeof that.devices[da]=='function'){
2597
+ if (typeof that.devices[da] == 'function') {
2123
2598
  continue
2124
2599
  }
2125
2600
  that.$set('data.device' + that.devices[da].n, [])
@@ -2127,14 +2602,14 @@ export default {
2127
2602
  value.data[0].f_devices.forEach((item) => {
2128
2603
  //tag)
2129
2604
  for (let i in item.f_items) {
2130
- if(typeof item.f_items[i]=='function'){
2605
+ if (typeof item.f_items[i] == 'function') {
2131
2606
  continue
2132
2607
  }
2133
2608
  // if (item.f_items[i].f_path != '' && item.f_items[i].f_path != null) {
2134
2609
  // this.picture.push({f_path: item.f_items[i].f_path, name: item.f_items[i].f_item_name})
2135
2610
  // }
2136
2611
  for (let de in that.config[item.f_device_type].items) {
2137
- if(typeof that.config[item.f_device_type].items[de]=='function'){
2612
+ if (typeof that.config[item.f_device_type].items[de] == 'function') {
2138
2613
  continue
2139
2614
  }
2140
2615
  if (item.f_items[i].f_item_name == de) {
@@ -2163,22 +2638,22 @@ export default {
2163
2638
  // item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_metertitles
2164
2639
  // }
2165
2640
  // else{
2166
- for (let j in item.f_items[i].f_item_lists) {
2167
- if(typeof item.f_items[i].f_item_lists[j]=='function'){
2168
- continue
2169
- }
2170
- //tag)
2171
- if (item.f_items[i].f_item_value instanceof Array) {
2172
- item.f_items[i].f_item_value.push(item.f_items[i].f_item_lists[j].f_item_value)
2173
- } else {
2174
- item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
2175
- }
2641
+ for (let j in item.f_items[i].f_item_lists) {
2642
+ if (typeof item.f_items[i].f_item_lists[j] == 'function') {
2643
+ continue
2644
+ }
2645
+ //tag)
2646
+ if (item.f_items[i].f_item_value instanceof Array) {
2647
+ item.f_items[i].f_item_value.push(item.f_items[i].f_item_lists[j].f_item_value)
2648
+ } else {
2649
+ item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
2176
2650
  }
2651
+ }
2177
2652
  // }
2178
2653
 
2179
2654
  }
2180
2655
  for (let de in that.devices) {
2181
- if(typeof that.devices[de]=='function'){
2656
+ if (typeof that.devices[de] == 'function') {
2182
2657
  continue
2183
2658
  }
2184
2659
  if (that.devices[de].device == item.f_device_type) {
@@ -2201,11 +2676,11 @@ export default {
2201
2676
  //tag
2202
2677
  this.init()
2203
2678
  }
2204
- if(this.parentPage && this.parentPage=='CurrentCreate'){
2679
+ if (this.parentPage && this.parentPage == 'CurrentCreate') {
2205
2680
  //tag
2206
2681
  let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数,为true则是开启全程录音
2207
2682
  if (isRecodr) {
2208
- if (isRecodr=='true') {
2683
+ if (isRecodr == 'true') {
2209
2684
  this.$showMessage("为了保证服务质量,您的电话将会被全程录音!")
2210
2685
  // 初始化录音
2211
2686
  let resse = this.record()
@@ -2214,22 +2689,22 @@ export default {
2214
2689
  }
2215
2690
  //tag
2216
2691
  var pardate = {
2217
- _this:this,
2218
- tittle:'安检详情',
2219
- safe:true
2692
+ _this: this,
2693
+ tittle: '安检详情',
2694
+ safe: true
2220
2695
  }
2221
2696
  // this.$dispatch('gotoson',pardate)getImgPath
2222
- this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
2697
+ this.$goto('safecheck-userinfo', { userinfo: this.data }, 'repair')
2223
2698
  } else {
2224
2699
  let that = this
2225
2700
  let id
2226
2701
  if (this.role == 'view') {
2227
2702
  id = this.item.id
2228
2703
  }
2229
- this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data:{condition:`id = '${id}'`}}).then((respanse)=> {
2704
+ this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, { data: { condition: `id = '${id}'` } }).then((respanse) => {
2230
2705
  if (respanse.data.length != 0) {
2231
- that.data = Object.assign(that.data,respanse.data[0])
2232
- if(respanse.data[0].f_devices) {
2706
+ that.data = Object.assign(that.data, respanse.data[0])
2707
+ if (respanse.data[0].f_devices) {
2233
2708
  for (let da in that.devices) {
2234
2709
  that.$set('data.device' + that.devices[da].n, [])
2235
2710
  }
@@ -2246,10 +2721,10 @@ export default {
2246
2721
  }
2247
2722
  Util.replaceFalse(that.data)
2248
2723
  Util.booleanFilter(that.data)
2249
- if(this.role == 'view'){
2724
+ if (this.role == 'view') {
2250
2725
  Util.ratifyPics(that.data)
2251
- }else{
2252
- Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
2726
+ } else {
2727
+ Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
2253
2728
  }
2254
2729
  //tag
2255
2730
  } else {
@@ -2257,24 +2732,24 @@ export default {
2257
2732
  this.init()
2258
2733
  }
2259
2734
  var pardate = {
2260
- _this:this,
2261
- tittle:'安检详情',
2262
- safe:true
2735
+ _this: this,
2736
+ tittle: '安检详情',
2737
+ safe: true
2263
2738
  }
2264
2739
  // this.$dispatch('gotoson',pardate)
2265
- this.$goto('safecheck-userinfo', {userinfo:this.data}, 'paper-router')
2740
+ this.$goto('safecheck-userinfo', { userinfo: this.data }, 'paper-router')
2266
2741
  }
2267
2742
  ).catch(
2268
2743
  (respanse) => {
2269
2744
  alert('查找安检单失败')
2270
2745
  })
2271
2746
  }
2272
- }else{
2273
- if(this.parentPage && this.parentPage=='CurrentCreate'){
2747
+ } else {
2748
+ if (this.parentPage && this.parentPage == 'CurrentCreate') {
2274
2749
  //tag
2275
2750
  let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数,为true则是开启全程录音
2276
2751
  if (isRecodr) {
2277
- if (isRecodr=='true') {
2752
+ if (isRecodr == 'true') {
2278
2753
  this.$showMessage("为了保证服务质量,您的电话将会被全程录音!")
2279
2754
  // 初始化录音
2280
2755
  let resse = this.record()
@@ -2315,9 +2790,11 @@ export default {
2315
2790
  </script>
2316
2791
  <style lang="less">
2317
2792
  @import "../../../../src/bootstrap/less/variables.less";
2793
+
2318
2794
  .noclickbut {
2319
2795
  pointer-events: none;
2320
2796
  }
2797
+
2321
2798
  .tab-befor-img (@url) {
2322
2799
  content: '';
2323
2800
  background-image: url("@{url}");
@@ -2331,21 +2808,24 @@ export default {
2331
2808
  }
2332
2809
 
2333
2810
  @media screen and (min-width: 768px) {
2334
- .android-repair-order > div > ul a {
2811
+ .android-repair-order>div>ul a {
2335
2812
  font-size: @font-size-h2;
2336
2813
  margin: 0.3em 0;
2337
2814
  }
2338
2815
  }
2339
- .repair-details-class{
2816
+
2817
+ .repair-details-class {
2340
2818
  &::before {
2341
2819
  .tab-befor-img("../../../assets/huneiweixiu1.png");
2342
2820
  }
2343
2821
  }
2822
+
2344
2823
  .repair-info-class {
2345
2824
  &::before {
2346
2825
  .tab-befor-img("../../../assets/baoxiuxinxi1.png");
2347
2826
  }
2348
2827
  }
2828
+
2349
2829
  .repair-user-info-class {
2350
2830
  &::before {
2351
2831
  .tab-befor-img("../../../assets/jibenxinxi1.png")
@@ -2393,11 +2873,13 @@ export default {
2393
2873
  .tab-befor-img("../../../assets/guzhanghuizong1.png")
2394
2874
  }
2395
2875
  }
2876
+
2396
2877
  .photo-write-class {
2397
2878
  &::before {
2398
2879
  .tab-befor-img("../../../assets/zaoju.png")
2399
2880
  }
2400
2881
  }
2882
+
2401
2883
  .delay-apply-class {
2402
2884
  &::before {
2403
2885
  .tab-befor-img("../../../assets/yonghubaoxiu.png")
@@ -2409,45 +2891,50 @@ export default {
2409
2891
  .tab-befor-img("../../../assets/fanhui.png")
2410
2892
  }
2411
2893
  }
2894
+
2412
2895
  .butt2 {
2413
2896
  display: inline;
2414
2897
  float: right;
2415
2898
  width: 10px;
2416
2899
  text-align: center;
2417
- align-items:center;
2900
+ align-items: center;
2418
2901
  position: absolute;
2419
- top:50%;
2902
+ top: 50%;
2420
2903
 
2421
- left:90%;
2422
- transform: translate(-50%,-50%);
2904
+ left: 90%;
2905
+ transform: translate(-50%, -50%);
2423
2906
  }
2424
- .linesty{
2907
+
2908
+ .linesty {
2425
2909
  display: inline-block;
2426
- height:1px;
2427
- width:100%;
2428
- background:#d0d0d0;
2429
- overflow:hidden;
2910
+ height: 1px;
2911
+ width: 100%;
2912
+ background: #d0d0d0;
2913
+ overflow: hidden;
2430
2914
  vertical-align: middle;
2431
2915
  }
2432
- .spanboder{
2433
- border-bottom:2px solid #499edf;
2916
+
2917
+ .spanboder {
2918
+ border-bottom: 2px solid #499edf;
2434
2919
  padding-bottom: 8px
2435
2920
  }
2921
+
2436
2922
  .app-botton {
2437
- position:fixed;
2923
+ position: fixed;
2438
2924
  background: #87b2dd;
2439
- right:8px;
2925
+ right: 8px;
2440
2926
  color: #FFF;
2441
2927
  padding: 8px;
2442
2928
  text-align: center;
2443
2929
  font-size: 1.2em;
2444
2930
  z-index: 10;
2445
- opacity:0.5;
2931
+ opacity: 0.5;
2446
2932
  bottom: 50px;
2447
2933
  margin-top: -10px;
2448
2934
  height: 40px;
2449
2935
  }
2450
- .android-repair-order > div > ul a {
2936
+
2937
+ .android-repair-order>div>ul a {
2451
2938
  font-size: 12px;
2452
2939
  color: #333333;
2453
2940
  padding: 13px 16px;