telephone-clients 3.0.103-86 → 3.0.103-88

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "telephone-clients",
3
- "version": "3.0.103-86",
3
+ "version": "3.0.103-88",
4
4
  "description": "呼叫模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -19,12 +19,28 @@
19
19
  </div>
20
20
  <div class="row auto" style="margin: 5px 0">
21
21
  <labe class="righttxt">用户状态:</labe>
22
- <input type="text" class="form-control rightipt" readonly v-model="userinfo.baseinfo.base.f_user_state"/>
22
+ <!-- <v-select :value.sync="userinfo.baseinfo.base.f_user_state" class="input-font" style="margin-left: 5%;"-->
23
+ <!-- :width="'60%'"-->
24
+ <!-- v-model="userinfo.baseinfo.base.f_user_state"-->
25
+ <!-- :options='userTypes' placeholder='用户状态' close-on-select clear-button value-single></v-select>-->
26
+ <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_state" readonly/>
23
27
  </div>
24
28
  <div class="row auto" style="margin: 5px 0">
25
29
  <labe class="righttxt">用户电话:</labe>
26
30
  <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_phone"/>
27
31
  </div>
32
+ <div class="row auto" style="margin: 5px 0">
33
+ <labe class="righttxt">合同日期:</labe>
34
+ <datepicker class="rightipt"
35
+ :value.sync="userinfo.baseinfo.base.f_contractdate"
36
+ v-model="userinfo.baseinfo.base.f_contractdate"
37
+ :disabled-days-of-Week="[]"
38
+ :format="'yyyy-MM-dd 00:00:00'"
39
+ :show-reset-button="reset" readonly="readonly"
40
+ >
41
+ </datepicker>
42
+ <!-- <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_contractdate" />-->
43
+ </div>
28
44
  <div class="row auto" style="margin: 5px 0">
29
45
  <labe class="righttxt">租户姓名:</labe>
30
46
  <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_rent_name"/>
@@ -81,14 +97,14 @@
81
97
  </div>
82
98
  <div class="row auto" style="margin: 5px 0">
83
99
  <labe class="righttxt">集收单位:</labe>
84
- <!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area" />-->
85
- <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"
86
- :width="'60%'"
87
- v-model="selectArea"
88
- :timeout="500"
89
- @select-search="select_search"
90
- :options='area' placeholder='请选择集收单位' close-on-select clear-button value-single
91
- @change="area_change()"></v-select>
100
+ <input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area"/>
101
+ <!-- <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"-->
102
+ <!-- :width="'60%'"-->
103
+ <!-- v-model="selectArea"-->
104
+ <!-- :timeout="500"-->
105
+ <!-- @select-search="select_search"-->
106
+ <!-- readonly-->
107
+ <!-- :options='area' placeholder='请选择集收单位' close-on-select clear-button value-single @change="area_change()"></v-select>-->
92
108
  </div>
93
109
  <!--<div class="row auto" style="margin: 5px 0" v-show="addressType=='特殊地址'">
94
110
  <labe class="righttxt">集收单位:</labe>
@@ -99,42 +115,36 @@
99
115
  @select-search="select_search"
100
116
  :options='area' placeholder='请选择集收单位' close-on-select clear-button value-single @change="area_changeTC()"></v-select>
101
117
  </div>-->
102
- <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
118
+ <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
103
119
  <labe class="righttxt">楼&ensp;&ensp;&ensp;&ensp;号:</labe>
104
120
  <input type="text" @change="changeNewAddress" class="form-control rightipt"
105
121
  v-model="userinfo.addressinfo.f_building"/>
106
122
  </div>
107
- <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
123
+ <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
108
124
  <labe class="righttxt">单&ensp;&ensp;&ensp;&ensp;元:</labe>
109
125
  <input type="text" @change="changeNewAddress" class="form-control rightipt"
110
126
  v-model="userinfo.addressinfo.f_unit"/>
111
127
  </div>
112
- <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
128
+ <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
113
129
  <labe class="righttxt">楼&ensp;&ensp;&ensp;&ensp;层:</labe>
114
130
  <input type="text" @change="changeNewAddress" class="form-control rightipt"
115
131
  v-model="userinfo.addressinfo.f_floor"/>
116
132
  </div>
117
- <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
133
+ <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
118
134
  <labe class="righttxt">门&ensp;牌&ensp;号:</labe>
119
135
  <input type="text" @change="changeNewAddress" class="form-control rightipt"
120
136
  v-model="userinfo.addressinfo.f_room"/>
121
137
  </div>
122
138
  <div class="row auto" style="margin: 5px 0">
123
139
  <labe class="righttxt">详细地址:</labe>
124
- <input type="text" class="form-control rightipt" readonly v-model="userinfo_old.addressinfo.f_address"/>
140
+ <input type="text" class="form-control rightipt" v-model="userinfo_old.addressinfo.f_address"/>
125
141
  </div>
126
142
  <div class="row auto" style="margin: 5px 0">
127
143
  <labe class="righttxt">新&ensp;地&ensp;址:</labe>
128
144
  <!--<input type="text" class="form-control rightipt" readonly v-model="getaddress()" />-->
129
- <textarea :readonly="addressType=='普通地址'" class="form-control rightipt" style="height: 80px"
145
+ <textarea readonly class="form-control rightipt" style="height: 80px"
130
146
  v-model="userinfo.addressinfo.f_address"></textarea>
131
147
  </div>
132
-
133
- <!--<div class="row auto" style="margin: 5px 0" v-show="addressType=='特殊地址'">
134
- <labe class="righttxt">新&ensp;地&ensp;址:</labe>&lt;!&ndash;<input type="text" class="form-control rightipt" v-model="userinfo.addressinfo.f_address" />&ndash;&gt;
135
- <textarea class="form-control rightipt" style="height: 80px" v-model="getAddressTS"></textarea>
136
- </div>-->
137
-
138
148
  <div class="row auto" style="margin: 5px 0">
139
149
  <labe class="righttxt">备&ensp;&ensp;&ensp;&ensp;注:</labe>
140
150
  <textarea class="form-control rightipt" style="height: 150px"
@@ -153,15 +163,38 @@
153
163
  <div class="panel-body " v-show="headername=='表具信息'">
154
164
  <div class="row auto" style="margin: 5px 0">
155
165
  <labe class="righttxt">表&ensp;&ensp;&ensp;&ensp;号:</labe>
156
- <input type="text" :readonly="userinfo.meterinfo[0].f_meter_classify!='机表'" class="form-control rightipt"
166
+ <input type="text"
167
+ :readonly="userinfo.meterinfo[0].f_meter_classify!='机表' && userinfo.meterinfo[0].f_meternumber"
168
+ class="form-control rightipt"
157
169
  style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"/>
158
- <button type="button" :disabled="userinfo.meterinfo[0].f_meter_classify!='机表'" name="button"
170
+ <button type="button"
171
+ :disabled="userinfo.meterinfo[0].f_meter_classify!='机表' && userinfo.meterinfo[0].f_meternumber"
172
+ name="button"
159
173
  class="btn btn-primary" style="width: 15%" @click="scan">扫码
160
174
  </button>
161
175
  </div>
176
+
177
+ <!--<div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_meter_classify=='机表'">
178
+ <div class="auto">
179
+ <div class="panel" style="padding: 0px 15px 5px 10px;">
180
+ <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
181
+ <div class="row" style="height: 240px;">
182
+ <div class="col-sm-4">
183
+ <img-self :src="f_meterno_path" alt="表号照片" width="150" height="200"></img-self>
184
+ </div>
185
+ </div>
186
+ <div class="row text-right div-photo" :class="style__">
187
+ <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_meterno_path', '表号照片')">拍照</button>
188
+ <img src="../../../assets/remove.png" :class="style__" @click="delfile('f_meterno_path', this.f_meterno_path)" style="width: 25%;"></img>
189
+ </div>
190
+ </div>
191
+ </div>
192
+ </div>
193
+ </div>-->
162
194
  <div class="row auto" style="margin: 5px 0">
163
195
  <labe class="righttxt">表&ensp;封&ensp;号:</labe>
164
- <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_metertitles"/>
196
+ <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_metertitles"
197
+ :readonly="userinfo.meterinfo[0].f_metertitles"/>
165
198
  </div>
166
199
  <div class="row auto" style="margin: 5px 0">
167
200
  <labe class="righttxt">表&ensp;位&ensp;置:</labe>
@@ -173,23 +206,51 @@
173
206
  :options="wz_types"
174
207
  close-on-select value-single></v-select>
175
208
  </div>
176
- <div class="row auto" style="margin: 5px 0">
209
+ <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_table_state == '待开通'">
177
210
  <labe class="righttxt">表&ensp;品&ensp;牌:</labe>
178
- <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].aaaaaaaa"
179
- v-model="userinfo.meterinfo[0].aaaaaaaa"
211
+ <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasbrand"
212
+ v-model="userinfo.meterinfo[0].f_gasbrand"
180
213
  placeholder='请选择'
181
214
  :width='wid'
182
215
  readonly
183
- :options="pp_types"
216
+ :options="gasbrands"
217
+ close-on-select value-single></v-select>
218
+ </div>
219
+ <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_table_state == '待开通'">
220
+ <labe class="righttxt">气表型号:</labe>
221
+ <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasmodel"
222
+ v-model="userinfo.meterinfo[0].f_gasmodel"
223
+ placeholder='请选择'
224
+ :width='wid'
225
+ readonly
226
+ :disabled="gasmodels.length == 0"
227
+ :options="gasmodels"
184
228
  close-on-select value-single></v-select>
185
229
  </div>
186
230
  <div class="row auto" style="margin: 5px 0">
187
231
  <labe class="righttxt">初始底数:</labe>
188
- <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].aaaaaaaa"/>
232
+ <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_base"/>
233
+ </div>
234
+ <div class="row auto" style="margin: 5px 0">
235
+ <labe class="righttxt">左&ensp;右&ensp;表:</labe>
236
+ <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_aroundmeter"
237
+ v-model="userinfo.meterinfo[0].f_aroundmeter"
238
+ placeholder='请选择'
239
+ :width='wid'
240
+ readonly
241
+ :options="aroundmeters"
242
+ close-on-select value-single></v-select>
189
243
  </div>
190
244
  <div class="row auto" style="margin: 5px 0">
191
245
  <labe class="righttxt">气表类型:</labe>
192
- <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
246
+ <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_meter_classify"
247
+ v-model="userinfo.meterinfo[0].f_meter_classify"
248
+ placeholder='请选择'
249
+ :width='wid'
250
+ readonly
251
+ :disabled="true"
252
+ :options="meter_classifys"
253
+ close-on-select value-single></v-select>
193
254
  </div>
194
255
  <div class="row auto" style="margin: 5px 0">
195
256
  <div style="display: flex;justify-content: center;">
@@ -202,7 +263,6 @@
202
263
  </div>
203
264
  <div class="panel auto">
204
265
  <div class="panel-heading" @click="selectVal('设备信息')" style="background-color: #ffffff">
205
-
206
266
  <span class="spanboder"><img src="../../../assets/list.png" style="width: 22px;margin-right: 8px;">设备信息<img
207
267
  class="butt3" :src="imgback('设备信息')"></span>
208
268
  </div>
@@ -211,7 +271,6 @@
211
271
  style="border:2px solid #A2C2EB; border-top:10px solid #A2C2EB; box-shadow: #00b3ee;margin-bottom: 10px">
212
272
  <div class="row auto" style="margin: 5px 0">
213
273
  <labe class="righttxt">设备类型:</labe>
214
- <!--<input type="text" class="form-control rightipt" readonly v-model="row.f_devices_type" />-->
215
274
  <v-select class="rightipt" :value.sync="row.f_devices_type"
216
275
  v-model="row.f_devices_type"
217
276
  placeholder='请选择'
@@ -230,7 +289,6 @@
230
289
  </div>
231
290
  <div class="row auto" style="margin: 5px 0">
232
291
  <labe class="righttxt">生产日期:</labe>
233
- <!--<input type="text" class="form-control rightipt" v-model="row.f_make_date" />-->
234
292
  <datepicker class="rightipt"
235
293
  :value.sync="row.f_make_date"
236
294
  v-model="row.f_make_date"
@@ -245,7 +303,6 @@
245
303
  </div>
246
304
  <div class="row auto" style="margin: 5px 0">
247
305
  <labe class="righttxt">到期日期:</labe>
248
- <!--<input type="text" class="form-control rightipt" v-model="row.f_expire_date" />-->
249
306
  <datepicker class="rightipt"
250
307
  :value.sync="row.f_expire_date"
251
308
  v-model="row.f_expire_date"
@@ -260,7 +317,6 @@
260
317
  </div>
261
318
  <div class="row auto" style="margin: 5px 0">
262
319
  <labe class="righttxt">安装日期:</labe>
263
- <!--<input type="text" class="form-control rightipt" v-model="row.f_input_date" />-->
264
320
  <datepicker class="rightipt"
265
321
  :value.sync="row.f_input_date"
266
322
  v-model="row.f_input_date"
@@ -273,6 +329,53 @@
273
329
  <labe class="righttxt">设备数量:</labe>
274
330
  <input type="number" class="form-control rightipt" v-model="row.f_devices_num"/>
275
331
  </div>
332
+ <div class="row auto" style="margin: 5px 0">
333
+ <labe class="righttxt">有无不锈钢波纹管:</labe>
334
+ <v-select class="rightipt" :value.sync="row.f_pipe_type"
335
+ v-model="row.f_pipe_type"
336
+ placeholder='请选择'
337
+ :width='wid'
338
+ readonly
339
+ :options="pipetypes"
340
+ close-on-select value-single></v-select>
341
+ </div>
342
+ <div class="row auto" style="margin: 5px 0">
343
+ <labe class="righttxt">波纹管数量:</labe>
344
+ <input type="text" class="form-control rightipt" v-model="row.f_pipe_num"/>
345
+ </div>
346
+ <div class="row auto" style="margin: 5px 0">
347
+ <labe class="righttxt">管道安装日期:</labe>
348
+ <datepicker class="rightipt"
349
+ :value.sync="row.f_pipeinstall_date"
350
+ v-model="row.f_pipeinstall_date"
351
+ :disabled-days-of-Week="[]"
352
+ :format="'yyyy-MM-dd'"
353
+ :show-reset-button="reset" readonly="readonly">
354
+ </datepicker>
355
+ </div>
356
+ <div class="row auto" style="margin: 5px 0">
357
+ <labe class="righttxt">管道到期日期:</labe>
358
+ <datepicker class="rightipt"
359
+ :value.sync="row.f_pipeexpire_date"
360
+ v-model="row.f_pipeexpire_date"
361
+ :disabled-days-of-Week="[]"
362
+ :format="'yyyy-MM-dd'"
363
+ :show-reset-button="reset" readonly="readonly">
364
+ </datepicker>
365
+ </div>
366
+ <div class="row auto" style="margin: 5px 0">
367
+ <labe class="righttxt">有无自闭阀:</labe>
368
+ <v-select class="rightipt" :value.sync="row.f_is_zibifa"
369
+ v-model="row.f_is_zibifa"
370
+ placeholder='请选择'
371
+ :width='wid'
372
+ :options="is_zibifa"
373
+ close-on-select value-single></v-select>
374
+ </div>
375
+ <div class="row auto" style="margin: 5px 0">
376
+ <labe class="righttxt">自闭阀数量:</labe>
377
+ <input type="text" class="form-control rightipt" v-model="row.f_zibifa_num"/>
378
+ </div>
276
379
  <!--<div class="row auto" style="margin: 5px 0">
277
380
  <labe class="righttxt">管道类型:</labe><input type="text" class="form-control rightipt" readonly v-model="row.f_pipe_type" />
278
381
  </div>-->
@@ -295,7 +398,7 @@
295
398
  <div class="panel auto">
296
399
  <div class="panel-body">
297
400
  <div style="display: flex;justify-content: center;">
298
- <button class="col-sm-3 btn btn-primary" :disabled="enable" @click="editUserInfo()">上传审核</button>
401
+ <button class="col-sm-3 btn btn-primary" :disabled="enable" @click="editUserInfo()">上传</button>
299
402
  </div>
300
403
  </div>
301
404
  </div>
@@ -318,10 +421,19 @@
318
421
  userinfo_old: Object,
319
422
  wid: "60%",
320
423
  devices_types: [],
321
- pipe_types: [{label: '橡胶管', value: '橡胶管'}, {label: '波纹管', value: '波纹管'}, {label: '钢管', value: '钢管'}],
424
+ gasbrands: [],
425
+ gasbrand: [],
426
+ gasmodels: [],
427
+ gasmodel: [],
428
+ meter_classifys: this.$appdata.getParam('气表类型'),
429
+ pipe_types: this.$appdata.getParam('管道类型'),
430
+ pipetypes: [{label: '有', value: '不锈钢波纹管'}, {label: '无', value: ''}],
322
431
  wz_types: [],
323
432
  cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
433
+ aroundmeters: this.$appdata.getParam('左右表'),
434
+ is_zibifa: this.$appdata.getParam('有无自闭阀'),
324
435
  pcds: [],
436
+ userTypes: Vue.$appdata.getParam('用户状态'),
325
437
  streets: [],
326
438
  update: false,
327
439
  headername: '基本信息',
@@ -373,18 +485,12 @@
373
485
  },
374
486
  getCode() {
375
487
  var datapa = HostApp.getCode().data;
376
- //tag
377
488
  this.userinfo.meterinfo[0].f_meternumber = datapa
378
489
  },
379
- //数据检查
380
490
  checkVal() {
381
- //检查一些必要信息是否未填
382
491
  this.approveChange = false
383
492
  this.changemeterno = false
384
493
  let checked = {ischeck: true, msg: ''}
385
- //tag
386
- //tag
387
- //tag
388
494
  if (!this.userinfo.baseinfo.base.f_user_name) {
389
495
  checked = {ischeck: false, msg: '请输入用户名称!'}
390
496
  }
@@ -406,15 +512,11 @@
406
512
  }
407
513
  }
408
514
  if (this.userinfo.meterinfo[0].f_meter_classify == '机表' && this.userinfo_old.meterinfo[0].f_meternumber) {
409
-
410
- //tag
411
- //tag
412
515
  if (this.userinfo.meterinfo[0].f_meternumber) {
413
516
  if (this.userinfo.meterinfo[0].f_meternumber != this.userinfo_old.meterinfo[0].f_meternumber) {
414
517
  if (!this.f_meterno_path || this.f_meterno_path == Vue.nopic) {
415
518
  checked = {ischeck: false, msg: '请拍摄表号照片!'}
416
519
  } else {
417
- //用来标识当前有修改机表表号,后台需要进行照片上传
418
520
  this.changemeterno = true
419
521
  }
420
522
  }
@@ -422,42 +524,28 @@
422
524
  checked = {ischeck: false, msg: '请输入表号!'}
423
525
  }
424
526
  }
425
- //检查本次修改信息中是否包含需要审核的内容
426
527
  for (let check in this.checkField) {
427
- //tag
428
528
  if (typeof check != 'function') {
429
529
  for (let i = 0; i < this.checkField[check].length; i++) {
430
- //tag
431
530
  if (check == 'checkUserinfoField') {
432
- //tag
433
- //tag
434
531
  if (this.userinfo.baseinfo.base[this.checkField[check][i]] != this.userinfo_old.baseinfo.base[this.checkField[check][i]]) {
435
- //tag
436
532
  this.approveChange = true
437
533
  }
438
534
  } else if (check == 'checkUserFilesField') {
439
- //tag
440
- //tag
441
535
  if (this.userinfo.meterinfo[0][this.checkField[check][i]] != this.userinfo_old.meterinfo[0][this.checkField[check][i]]) {
442
- //tag
443
536
  this.approveChange = true
444
537
  }
445
538
  } else if (check == 'checkAddressField') {
446
- //tag
447
- //tag
448
539
  if (this.userinfo.addressinfo[this.checkField[check][i]] != this.userinfo_old.addressinfo[this.checkField[check][i]]) {
449
- //tag
450
540
  this.approveChange = true
451
541
  }
452
542
  }
453
543
  }
454
544
  }
455
545
  }
456
- //tag
457
546
  return checked
458
547
  },
459
548
  select_search(text) {
460
- //tag
461
549
  if (this.selectStreet.id) {
462
550
  let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
463
551
  new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
@@ -468,7 +556,6 @@
468
556
  condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
469
557
  }
470
558
  }, {resolveMsg: null, rejectMsg: null}).then((res) => {
471
- //tag)
472
559
  if (res.data.length > 0) {
473
560
  this.area = []
474
561
  res.data.forEach((result) => {
@@ -489,7 +576,6 @@
489
576
  takePic(prop, title) {
490
577
  HostApp.__callback__ = this.cameraCallBack
491
578
  HostApp.__this__ = this
492
- //tag
493
579
  let fileName
494
580
  if (!this[prop] || this[prop].includes("nopic.png")) {
495
581
  fileName = Util.guid() + '-' + prop + '.jpg'
@@ -516,19 +602,17 @@
516
602
  }
517
603
  },
518
604
  editUserInfo() {
519
- let checked = this.checkVal()
520
- if (!checked.ischeck) {
521
- this.$showMessage(checked.msg)
522
- return
605
+ for (let i = 0; i < this.model.length; i++) {
606
+ this.model[i].f_user_id = this.userinfo.meterinfo[0].f_user_id
523
607
  }
524
608
  this.$showMessage('确定是否修改上传审核用户信息?', ['confirm', 'cancel']).then((res) => {
525
609
  if (res === 'confirm') {
526
610
  this.excessive = true
527
611
  let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
528
- //userinfoms.f_user_name=row.f_user_name
529
612
  userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
530
613
  userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
531
614
  userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
615
+ userinfoms.f_user_state = this.userinfo.baseinfo.base.f_user_state
532
616
  userinfoms.f_operator_record = Vue.user.name
533
617
  userinfoms.f_operatorid_record = Vue.user.id
534
618
  userinfoms.f_remark = this.userinfo.baseinfo.base.f_remark
@@ -536,12 +620,19 @@
536
620
  userinfoms.f_orgname_record = Vue.user.orgs
537
621
  userinfoms.f_depid_record = Vue.user.depids
538
622
  userinfoms.f_depname_record = Vue.user.deps
623
+ userinfoms.f_contractdate = this.userinfo.baseinfo.base.f_contractdate
624
+ userinfoms.f_contract_date = this.userinfo.baseinfo.base.f_contractdate
539
625
  this.userinfo_old.meterinfo[0].f_metertitles = this.userinfo.meterinfo[0].f_metertitles
626
+ this.userinfo_old.meterinfo[0].f_table_state = this.userinfo.meterinfo[0].f_table_state
540
627
  this.userinfo_old.meterinfo[0].f_position = this.userinfo.meterinfo[0].f_position
628
+ this.userinfo_old.meterinfo[0].f_meter_base = this.userinfo.meterinfo[0].f_meter_base
629
+ this.userinfo_old.meterinfo[0].f_aroundmeter = this.userinfo.meterinfo[0].f_aroundmeter
630
+ this.userinfo_old.meterinfo[0].f_meter_classify = this.userinfo.meterinfo[0].f_meter_classify
631
+ this.userinfo_old.meterinfo[0].f_gasbrand_id = this.userinfo.meterinfo[0].f_gasbrand_id
632
+ this.userinfo_old.meterinfo[0].f_gasmodel_id = this.userinfo.meterinfo[0].f_gasmodel_id
541
633
  userinfoms.userfiles = []
542
634
  this.userinfo_old.meterinfo[0].devicesinfo = this.model
543
635
  userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
544
- //tag)
545
636
  new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
546
637
  data: {
547
638
  userinfo: userinfoms,
@@ -553,73 +644,23 @@
553
644
  }
554
645
  }
555
646
  }, {resolveMsg: null, rejectMsg: null}).then((res1) => {
556
- //tag+res1.data.status)
557
647
  if (res1.data.status == 200) {
558
- //本次修改信息包含需要审核信息
559
- if (this.approveChange) {
560
- //tag
561
- let res2 = this.$androidUtil.bzLogic('safe_upUserinfoApprove', {
562
- row: {
563
- f_time: Util.toStandardTimeString(),
564
- f_modifier: Vue.user.name,//Vue.user.name
565
- f_modifier_id: Vue.user.id,//Vue.user.id
566
- f_modify_type: '用户档案',
567
- f_userinfoid: this.userinfo.baseinfo.base.f_userinfo_id,
568
- f_userinfo_code: this.userinfo.baseinfo.base.f_userinfo_code,
569
- f_approved: '未审核',
570
- filialestr: Vue.user.orgid,//Vue.user.orgid
571
- version: 1,
572
- f_user_name: this.userinfo.baseinfo.base.f_user_name,
573
- f_user_phone: this.userinfo.baseinfo.base.f_user_phone,
574
- f_street: this.userinfo.addressinfo.f_street,
575
- f_building: this.userinfo.addressinfo.f_building,
576
- f_unit: this.userinfo.addressinfo.f_unit,
577
- f_floor: this.userinfo.addressinfo.f_floor,
578
- f_room: this.userinfo.addressinfo.f_room,
579
- f_building_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_building_suffix,
580
- f_unit_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_unit_suffix,
581
- f_floor_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_floor_suffix,
582
- f_room_suffix: this.userinfo.addressinfo.f_special == 1 ? null : this.userinfo.addressinfo.f_room_suffix,
583
- f_residential_area: this.userinfo.addressinfo.f_residential_area,
584
- f_address: this.userinfo.addressinfo.f_address,
585
- f_pcd: this.userinfo.addressinfo.f_pcd,
586
- f_pcd_id: this.userinfo.addressinfo.f_pcd_id,
587
- f_street_id: this.userinfo.addressinfo.f_street_id,
588
- f_residential_area_id: this.userinfo.addressinfo.f_residential_area_id,
589
- f_used_name: this.userinfo.baseinfo.base.f_used_name,
590
- f_rent_phone: this.userinfo.baseinfo.base.f_rent_phone,
591
- f_slice_area: this.userinfo.addressinfo.f_slice_area,
592
- f_remark: this.userinfo.baseinfo.base.f_remark,
593
- f_source: this.f_source,
594
- f_meterno_path: this.f_meterno_path,
595
- f_iscity: this.userinfo.addressinfo.f_iscity,
596
- f_special: this.userinfo.addressinfo.f_special,
597
- f_meternumber: this.userinfo.meterinfo[0].f_meternumber,
598
- changemeterno: this.changemeterno
599
- },
600
- tablename: 't_modify_userinfo'
601
- })
602
- //tag)
603
- if (res2.code == 200) {
604
- this.$showMessage("变更用户信息成功,需要审核的信息已提交审核,等待管理员处理!")
605
- this.enable = true
606
- this.excessive = false
607
- } else {
608
- this.$showMessage("上传审核信息失败,请检查图片和网络状况是否正常!")
609
- this.excessive = false
610
- }
611
- } else {
612
- this.$showMessage("修改用户信息成功!")
613
- this.enable = true
614
- this.excessive = false
615
- }
616
-
648
+ let data = this.userinfo.addressinfo
649
+ data.f_address = this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
650
+ data.f_operator = Vue.user.name
651
+ new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
652
+ this.$showMessage("修改用户地址信息成功!")
653
+ }).catch(error => {
654
+ this.$showMessage("修改用户地址信息!")
655
+ })
656
+ this.$showMessage("修改用户信息成功!")
657
+ this.enable = true
658
+ this.excessive = false
617
659
  }
618
660
  }).catch((msg) => {
619
661
  this.$showMessage("修改用户信息失败,请检查手机网络状况!")
620
662
  this.excessive = false
621
663
  })
622
-
623
664
  }
624
665
  })
625
666
  },
@@ -637,27 +678,21 @@
637
678
  } else {
638
679
  this.headername = header
639
680
  }
640
-
641
681
  },
642
682
  changeNewAddress() {
643
683
  this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
644
684
  },
645
685
  area_change() {
646
- //tag
647
686
  this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area
648
687
  this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id
649
688
  this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area
650
689
  this.changeNewAddress()
651
- //this.userinfo.addressinfo.f_residential_area=this.f_residential_area.f_residential_area
652
690
  },
653
691
  async street_change() {
654
- //tag
655
692
  if (this.selectStreet.id) {
656
- //如果街道改变--给街道赋值!
657
693
  this.userinfo.addressinfo.f_street = this.selectStreet.f_street
658
694
  this.userinfo.addressinfo.f_street_id = this.selectStreet.id
659
695
  this.userinfo.addressinfo.f_iscity = this.selectStreet.f_iscity
660
- //清空当前选中小区的值
661
696
  this.userinfo.addressinfo.f_residential_area = ''
662
697
  this.userinfo.addressinfo.f_residential_area_id = ''
663
698
  this.userinfo.addressinfo.f_slice_area = ''
@@ -672,24 +707,18 @@
672
707
  condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
673
708
  }
674
709
  }, {resolveMsg: null, rejectMsg: null})
675
- ////tag)
676
710
  res.data.forEach((result) => {
677
711
  this.area.push({label: result.f_residential_area, value: result})
678
712
  })
679
713
  } else {
680
714
  this.area = []
681
715
  }
682
-
683
716
  this.changeNewAddress()
684
717
  },
685
718
  async pcd_change() {
686
- //tag
687
719
  if (this.selectPcd.id) {
688
- //tag
689
- //如果省市区改变-重新赋值
690
720
  this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
691
721
  this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
692
- //清空 选中的街道和集收单位
693
722
  this.selectStreet = {id: ''}
694
723
  this.userinfo.addressinfo.f_street = ''
695
724
  this.userinfo.addressinfo.f_street_id = ''
@@ -717,7 +746,6 @@
717
746
  this.changeNewAddress()
718
747
  },
719
748
  upUserState() {
720
- //tag)
721
749
  if (this.userinfo.meterinfo[0].f_table_state == '正常') {
722
750
  let data = {
723
751
  f_userfiles_id: {
@@ -734,7 +762,7 @@
734
762
  f_operat_type: '停用',
735
763
  f_describe: `${Vue.user.name}对客户${this.userinfo.baseinfo.base.f_user_name}进行表具停用操作`,
736
764
  f_state: '有效',
737
- f_operator: Vue.user.name,//${Vue.$login.f.name}
765
+ f_operator: Vue.user.name,
738
766
  f_operatorid: Vue.user.id,
739
767
  f_orgid: Vue.user.orgid,
740
768
  f_orgname: Vue.user.orgs,
@@ -754,7 +782,6 @@
754
782
 
755
783
  },
756
784
  addDevices() {
757
- //Vue.user.name
758
785
  let obj = {
759
786
  "f_operator": Vue.user.name,
760
787
  "f_picture": null,
@@ -780,7 +807,6 @@
780
807
  this.model.push(obj)
781
808
  },
782
809
  delDevices(idx) {
783
- //tag
784
810
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
785
811
  if (res === 'confirm') {
786
812
  this.model.splice(idx, 1)
@@ -799,11 +825,9 @@
799
825
  condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
800
826
  }
801
827
  }, {resolveMsg: null, rejectMsg: null})
802
- ////tag)
803
828
  res.data.forEach((result) => {
804
829
  this.area.push({label: result.f_residential_area, value: result})
805
830
  })
806
- //tag
807
831
  this.area.push({
808
832
  label: this.userinfo.addressinfo.f_residential_area,
809
833
  value: {
@@ -814,11 +838,9 @@
814
838
  } else {
815
839
  this.area = []
816
840
  }
817
-
818
841
  },
819
842
  async getStreetList() {
820
843
  if (this.selectPcd.id) {
821
- //tag
822
844
  this.streets = []
823
845
  let pcdText = `and f_pcd_id=${this.selectPcd.id}`
824
846
  let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
@@ -830,9 +852,7 @@
830
852
  }
831
853
  }, {resolveMsg: null, rejectMsg: null})
832
854
  streetlist.data.forEach((result) => {
833
- //如果第一次进来有地址id 就拿下地址区域
834
855
  if (this.selectStreet.id && this.selectStreet.id == result.id) {
835
- //tag)
836
856
  this.userinfo.addressinfo.f_iscity = result.f_iscity
837
857
  }
838
858
  this.streets.push({label: result.f_street, value: result})
@@ -842,7 +862,6 @@
842
862
  }
843
863
  },
844
864
  changeAddressType(val) {
845
- //tag
846
865
  if (this.addressType == '普通地址') {
847
866
  this.userinfo.addressinfo.f_special = null
848
867
  } else if (this.addressType == '特殊地址') {
@@ -854,17 +873,16 @@
854
873
  }
855
874
  this.changeNewAddress()
856
875
  }
857
-
858
876
  },
859
877
  computed: {
860
878
  getAddress() {
861
879
  return (this.userinfo.addressinfo.f_pcd ? this.userinfo.addressinfo.f_pcd : '') +
862
880
  (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
863
881
  (this.userinfo.addressinfo.f_residential_area ? this.userinfo.addressinfo.f_residential_area : '') +
864
- (this.userinfo.addressinfo.f_building ? this.userinfo.addressinfo.f_building + (this.userinfo.addressinfo.f_building_suffix ? this.userinfo.addressinfo.f_building_suffix : '') : '') +
865
- (this.userinfo.addressinfo.f_unit ? this.userinfo.addressinfo.f_unit + (this.userinfo.addressinfo.f_unit_suffix ? this.userinfo.addressinfo.f_unit_suffix : '') : '') +
866
- (this.userinfo.addressinfo.f_floor ? this.userinfo.addressinfo.f_floor + (this.userinfo.addressinfo.f_floor_suffix ? this.userinfo.addressinfo.f_floor_suffix : '') : '') +
867
- (this.userinfo.addressinfo.f_room ? this.userinfo.addressinfo.f_room + (this.userinfo.addressinfo.f_room_suffix ? this.userinfo.addressinfo.f_room_suffix : '') : '')
882
+ (this.userinfo.addressinfo.f_building ? this.userinfo.addressinfo.f_building + (this.userinfo.addressinfo.f_building_suffix ? this.userinfo.addressinfo.f_building_suffix : '-') : '') +
883
+ (this.userinfo.addressinfo.f_unit ? this.userinfo.addressinfo.f_unit + (this.userinfo.addressinfo.f_unit_suffix ? this.userinfo.addressinfo.f_unit_suffix : '-') : '') +
884
+ (this.userinfo.addressinfo.f_floor ? this.userinfo.addressinfo.f_floor + (this.userinfo.addressinfo.f_floor_suffix ? this.userinfo.addressinfo.f_floor_suffix : '-') : '') +
885
+ (this.userinfo.addressinfo.f_room ? this.userinfo.addressinfo.f_room + (this.userinfo.addressinfo.f_room_suffix ? this.userinfo.addressinfo.f_room_suffix : '-') : '')
868
886
  },
869
887
  getAddressTS() {
870
888
  return (this.userinfo.addressinfo.f_pcd ? this.userinfo.addressinfo.f_pcd : '') +
@@ -873,41 +891,45 @@
873
891
  }
874
892
  },
875
893
  watch: {
876
-
877
- /*'selectPcd.id' (val) {
878
- //tag
879
- if(this.selectPcd.id){
880
- this.getStreetList()
894
+ 'userinfo.meterinfo[0].f_gasbrand'(val) {
895
+ this.gasmodels = []
896
+ if (!val) {
897
+ return
881
898
  }
899
+ this.userinfo.meterinfo[0].f_gasbrand_id = this.gasbrand.find(item => item.f_meter_brand == val).id
900
+ this.userinfo.meterinfo[0].f_meter_classify = this.gasbrand.find(item => item.f_meter_brand == val).f_meter_type
901
+ new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
902
+ data: {
903
+ items: "*",
904
+ tablename: "t_gasmodel",
905
+ orderitem: "1",
906
+ condition: ` f_gasbrand_id = '${this.userinfo.meterinfo[0].f_gasbrand_id}'`
907
+ }
908
+ }, {resolveMsg: null, rejectMsg: null}).then(response => {
909
+ this.gasmodel = response.data
910
+ response.data.forEach(item => {
911
+ this.gasmodels.push({label: item.f_meter_style, value: item.f_meter_style})
912
+ })
913
+ })
882
914
  },
883
- 'selectStreet.id' (val) {
884
- //tag
885
- if(this.selectStreet.id){
886
- this.getAreaList()
915
+ 'userinfo.meterinfo[0].f_gasmodel'(val) {
916
+ if (!val) {
917
+ return
887
918
  }
888
- }*/
919
+ this.userinfo.meterinfo[0].f_gasmodel_id = this.gasmodel.find(item => item.f_meter_style == val && item.f_gasbrand_id == this.userinfo.meterinfo[0].f_gasbrand_id).id
920
+ },
889
921
  },
890
922
  async ready() {
891
- /*//tag)
892
-
893
- //tag)
894
- //tag)*/
895
- //this.f_userinfo_id=1102260
896
- //this.f_userinfo_id=1997541
897
923
  if (!this.f_userinfo_id) {
898
924
  this.$showMessage("未检测到用户!")
899
925
  this.enable = true
900
926
  return
901
927
  }
902
928
  try {
903
-
904
929
  this.devices_types = Vue.$appdata.getParam('设备类型')
905
930
  this.wz_types = Vue.$appdata.getParam('安装位置')
906
- ////tag)
907
931
  this.excessive = true
908
- //Vue.user.orgid ${this.f_userinfo_id} 10101 ${Vue.user.orgid}
909
-
910
- let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
932
+ let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
911
933
  data: {
912
934
  items: "*",
913
935
  tablename: "t_pcd",
@@ -915,17 +937,25 @@
915
937
  condition: `f_orgid = '${Vue.user.orgid}'`
916
938
  }
917
939
  }, {resolveMsg: null, rejectMsg: null})
918
- //tag)
940
+
941
+ let gasbrand = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
942
+ data: {
943
+ items: "*",
944
+ tablename: "t_gasbrand",
945
+ orderitem: "1",
946
+ condition: ` 1=1`
947
+ }
948
+ }, {resolveMsg: null, rejectMsg: null})
949
+ this.gasbrand = gasbrand.data
950
+ gasbrand.data.forEach(item => {
951
+ this.gasbrands.push({label: item.f_meter_brand, value: item.f_meter_brand})
952
+ })
919
953
  pcdlist.data.forEach((result) => {
920
954
  this.pcds.push({label: result.f_pcd, value: result})
921
955
  })
922
- ////tag)
923
956
  let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
924
- //f_userinfo_code:'12381344',
925
957
  f_userinfo_id: this.f_userinfo_id
926
958
  }, {resolveMsg: null, rejectMsg: null})
927
- //tag
928
- //tag
929
959
  this.userinfo = res.data
930
960
  this.userinfo_old = JSON.parse(JSON.stringify(res.data))
931
961
  this.model = this.userinfo.meterinfo[0].devicesinfo
@@ -938,28 +968,11 @@
938
968
  await this.getAreaList()
939
969
  this.excessive = false
940
970
  this.addressType = this.userinfo.addressinfo.f_special == 1 ? '特殊地址' : '普通地址'
941
- //this.userinfo.addressinfo.f_special=1
942
- //tag
943
971
  } catch (e) {
944
972
  this.excessive = false
945
973
  this.enable = true
946
974
  this.$showMessage('获取用户信息出错,请检查网络状况!')
947
975
  }
948
- new HttpResetClass().load('get', `${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`, {data: {}}, {
949
- resolveMsg: null,
950
- rejectMsg: null
951
- }).then((addressUnit) => {
952
- //tag
953
- //tag
954
- //tag
955
- //tag
956
- this.userinfo.addressinfo.f_building_suffix = addressUnit.data.f_building_suffix
957
- this.userinfo.addressinfo.f_unit_suffix = addressUnit.data.f_unit_suffix
958
- this.userinfo.addressinfo.f_floor_suffix = addressUnit.data.f_floor_suffix
959
- this.userinfo.addressinfo.f_room_suffix = addressUnit.data.f_room_suffix
960
- }).catch((msg) => {
961
- //tag)
962
- })
963
976
  }
964
977
  }
965
978
  </script>
@@ -979,7 +992,6 @@
979
992
  .righttxt {
980
993
  border: none;
981
994
  margin-left: 5px;
982
- /*border-left: 5px solid #A2C2EB;*/
983
995
  float: left;
984
996
  width: 25%;
985
997
  margin-bottom: 3px;
@@ -989,7 +1001,6 @@
989
1001
  }
990
1002
 
991
1003
  .tit1 {
992
- /*background: #ffffff url('../../assets/用户姓名.png') no-repeat fixed center;*/
993
1004
  background-image: url('../../../assets/用户姓名.png');
994
1005
  background-repeat: no-repeat;
995
1006
  background-position: center;
@@ -1022,7 +1033,6 @@
1022
1033
  .div-photo {
1023
1034
  width: auto;
1024
1035
  height: auto;
1025
- /* margin-top: 10px; */
1026
1036
  position: absolute;
1027
1037
  bottom: 10px;
1028
1038
  right: 10px;
@@ -10,6 +10,7 @@ let specialComp = {
10
10
  'zhihuan-first': (resolve) => { require(['./android/ZHihuanFirst'], resolve) },
11
11
  'PhoneUpUserinfoTel': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
12
12
  'repair-info': (resolve) => { require(['./android/RepairInfo'], resolve) },
13
+ 'repair-user-info': (resolve) => { require(['./android/RepairUserInfo.vue'], resolve) },
13
14
  }
14
15
  exports.specialComp = specialComp
15
16