apply-clients 4.1.66 → 4.1.67

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.
@@ -1,71 +1,66 @@
1
1
  <template>
2
2
  <div class="col-sm-12" style="margin: 20px 0px;">
3
-
4
- <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
5
- <template partial='head'>
6
- <tr>
7
- <th>序号</th>
8
- <th>客户编号</th>
9
- <th>客户名称</th>
10
- <th>客户电话</th>
11
- <th>地址信息</th>
12
- <th>表具数量</th>
13
- <th v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'">单价(户)</th>
14
- <th v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'">累计缴费</th>
15
- <th>
16
- <button type="button" class="btn btn-info head-but"
17
- :disabled="$parent.$parent.mark === 1"
18
- @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
19
- <a type="button" class="btn btn-info head-but"
20
- href="/apply/download/excel/安装明细.xlsx" download>模板下载</a>
21
- </th>
22
- </tr>
23
- </template>
24
- <template partial='body'>
25
- <tr>
26
- <td style="text-align: center;">
27
- <nobr>{{$index+1}}</nobr>
28
- </td>
29
- <td style="text-align: center;">
30
- <nobr>{{row.f_userinfo_code}}</nobr>
31
- </td>
32
- <td style="text-align: center;">
33
- <nobr>{{row.f_user_name}}</nobr>
34
- </td>
35
- <td style="text-align: center;">
36
- <nobr>{{row.f_user_phone}}</nobr>
37
- </td>
38
- <td style="text-align: center;">
39
- <nobr>{{row.f_address}}</nobr>
40
- </td>
41
- <td style="text-align: center;">
42
- <nobr>{{row.f_userfiles_num === null ? 0 : row.f_userfiles_num}}</nobr>
43
- </td>
44
- <td style="text-align: center;"
45
- v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'"
46
- >
47
- <nobr>{{$parent.$parent.selectdata.f_price}}</nobr>
48
- </td>
49
- <td style="text-align: center;"
50
- v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建'"
51
- >
52
- <nobr>{{row.f_cumulative_payment_money}}</nobr>
53
- </td>
54
- <td style="text-align: center;">
55
- <nobr>
56
- <button
57
- type="button"
58
- name="button"
59
- class="btn btn-link"
60
- :disabled="(row.f_cumulative_payment_money < $parent.$parent.selectdata.f_price && ($parent.$parent.selectdata.f_apply_type === '散户集体报建' || $parent.$parent.selectdata.f_apply_type === '煤改气报建')) || $parent.$parent.mark === 1"
61
- @click="$parent.$parent.showUserFileModal(row)">
62
- {{row.f_userfiles_num > 0 ? '修正' : '添加'}}
63
- </button>
64
- </nobr>
65
- </td>
66
- </tr>
67
- </template>
68
- </data-grid>
3
+ <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
4
+ <template partial='head'>
5
+ <tr>
6
+ <th>序号</th>
7
+ <th>客户编号</th>
8
+ <th>客户名称</th>
9
+ <th>客户电话</th>
10
+ <th>地址信息</th>
11
+ <th v-if="selectdata.f_apply_type !== '开发商集体报建'">是否结清</th>
12
+ <th>表具数量</th>
13
+ <th>
14
+ <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
15
+ @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
16
+ <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
17
+ href="/apply/download/excel/v3报装表具批量导入.xlsx" download>模板下载</a>
18
+ <export-excel :data="$parent.$parent.getCondition"
19
+ :field="$parent.$parent.getfield"
20
+ sqlurl="rs/logic/applyExportfile"
21
+ sql-name="getInstallableAddress"
22
+ template-name='可安装地址'
23
+ btn-name="导出可安装"
24
+ :choose-col="true"></export-excel>
25
+ </th>
26
+ </tr>
27
+ </template>
28
+ <template partial='body'>
29
+ <tr>
30
+ <td style="text-align: center;">
31
+ <nobr>{{$index+1}}</nobr>
32
+ </td>
33
+ <td style="text-align: center;">
34
+ <nobr>{{row.f_userinfo_code}}</nobr>
35
+ </td>
36
+ <td style="text-align: center;">
37
+ <nobr>{{row.f_user_name}}</nobr>
38
+ </td>
39
+ <td style="text-align: center;">
40
+ <nobr>{{row.f_user_phone}}</nobr>
41
+ </td>
42
+ <td style="text-align: center;">
43
+ <nobr>{{row.f_address}}</nobr>
44
+ </td>
45
+ <td style="text-align: center;" v-if="selectdata.f_apply_type !== '开发商集体报建'">
46
+ <nobr>{{row.f_cumulative_payment_money < $parent.$parent.selectdata.f_price ? '否' : '是'}}</nobr>
47
+ </td>
48
+ <td style="text-align: center;">
49
+ <nobr>{{row.f_userfiles_num === null ? 0 : row.f_userfiles_num}}</nobr>
50
+ </td>
51
+ <td style="text-align: center;">
52
+ <nobr>
53
+ <button
54
+ type="button" name="button" class="btn btn-link"
55
+ :disabled="row.f_cumulative_payment_money < $parent.$parent.selectdata.f_price && selectdata.f_apply_type !== '开发商集体报建'"
56
+ @click="$parent.$parent.showUserFileModal(row)">
57
+ {{$parent.$parent.mark === 1 ? '查看' : row.f_userfiles_num > 0 ? '修正' : '添加'}}
58
+ </button>
59
+ </nobr>
60
+ </td>
61
+ </tr>
62
+ </template>
63
+ </data-grid>
69
64
  </div>
70
65
  <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
71
66
  <header slot="modal-header" class="modal-header">
@@ -80,148 +75,157 @@
80
75
  <footer slot="modal-footer" class="modal-footer"></footer>
81
76
  </modal>
82
77
 
83
- <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细">
84
- <header slot="modal-header" class="modal-header">
85
- <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
86
- <h4 class="modal-title">安装明细</h4>
87
- </header>
88
- <article slot="modal-body" class="modal-body clearfix">
89
- <div v-if="$parent.showaddress" class="form-group col-sm-12">
90
- <label class="col-sm-2 control-label">地址信息:</label>
91
- <div class="col-sm-10">
92
- <input class="form-control input_view" style=""
93
- v-model="useradders.f_address"
94
- :value="useradders.f_address"
95
- :readonly="true"/>
96
- </div>
97
- </div>
98
-
99
- <div v-for="(i, item) in userinfo.userfiles" class="form-group col-sm-12 panel panel-info">
100
- <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
101
- <div class="form-group col-sm-6">
102
- <label class="col-sm-4 control-label">燃气表品牌:</label>
103
- <div class="col-sm-8">
104
- <input-select
105
- class="select select_list"
106
- :value.sync="item.f_meter_brand"
107
- v-model="item.f_meter_brand"
108
- :options="meterbrands"
109
- @change="gasbrandChange(i)"
110
- :valueSingle="true"></input-select>
111
- </div>
112
- </div>
113
-
114
-
115
-
116
- <div class="form-group col-sm-6" >
117
- <label class="col-sm-4 control-label">燃气表型号:</label>
118
- <div class="col-sm-8">
78
+ <validator name="v">
79
+ <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细">
80
+ <header slot="modal-header" class="modal-header">
81
+ <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
82
+ <h4 class="modal-title">安装明细</h4>
83
+ </header>
84
+ <article slot="modal-body" class="modal-body clearfix">
85
+ <div class="form-group col-sm-12">
86
+ <label class="col-sm-2 control-label">地址信息:</label>
87
+ <div class="col-sm-10">
119
88
  <input class="form-control input_view" style=""
120
- placeholder="请输入"
121
- v-model="item.f_meter_type"
122
- :value="item.f_meter_type"
123
- :readonly="false"/>
89
+ v-model="useradders.f_address"
90
+ :value="useradders.f_address"
91
+ :readonly="true"/>
124
92
  </div>
125
93
  </div>
126
94
 
127
-
128
- <div class="form-group col-sm-6">
129
- <label class="col-sm-4 control-label">表向:</label>
130
- <div class="col-sm-8">
131
- <input-select
132
- class="select select_list"
133
- :value.sync="item.f_meter_direction"
134
- v-model="item.f_meter_direction"
135
- :options="aroundmeters"
136
- :valueSingle="true"></input-select>
95
+ <div v-for="(i, item) in userinfo.userfiles" class="form-group col-sm-12 panel panel-info">
96
+ <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
97
+ <div class="form-group col-sm-6" :class="[$v.gasbrand.required ? 'has-error' : '']">
98
+ <label class="col-sm-4 control-label">气表品牌:</label>
99
+ <div class="col-sm-8">
100
+ <input type="text" v-show="false" v-model="item.gasbrand.id" v-validate:gasbrand = "['required']" >
101
+ <input-select
102
+ class="select select_list"
103
+ :value.sync="item.gasbrand"
104
+ v-model="item.gasbrand"
105
+ :options="meterbrands"
106
+ @change="gasbrandChange(i)"
107
+ :disable="mark === 1"
108
+ :valueSingle="true"></input-select>
109
+ </div>
137
110
  </div>
138
- </div>
139
-
140
-
141
- <div v-if="$parent.showbutton1" class="form-group col-sm-6" :class="item.f_meternumber ? '':'has-error'">
142
- <label class="col-sm-4 control-label">燃气表表号:</label>
143
- <div class="col-sm-8">
144
- <input class="form-control input_view" style=""
145
- placeholder="表号"
146
- v-model="item.f_meter_card"
147
- :value="item.f_meter_card"
148
- @change="meternumberValidate(i)"
149
- :readonly="false"/>
111
+ <div class="form-group col-sm-6" :class="[$v.gasmodel.required ? 'has-error' : '']">
112
+ <label class="col-sm-4 control-label">气表型号:</label>
113
+ <div class="col-sm-8">
114
+ <input type="text" v-show="false" v-model="item.gasmodel.f_meter_style" :value.sync="item.gasmodel.f_meter_style" v-validate:gasmodel = "['required']" >
115
+ <input-select
116
+ class="select select_list"
117
+ :value.sync="item.gasmodel"
118
+ v-model="item.gasmodel"
119
+ :options.sync="item.gasbrand.gasmodel"
120
+ @change="gasmodelChange(i)"
121
+ :disable="mark === 1"
122
+ :valueSingle="true"></input-select>
123
+ </div>
150
124
  </div>
151
- </div>
152
-
153
- <div v-if="$parent.showbutton2" class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
154
- <label class="col-sm-4 control-label">流量计品牌:</label>
155
- <div class="col-sm-8">
156
- <input-select
157
- class="select select_list"
158
- :value.sync="item.f_aroundmeter"
159
- v-model="item.f_aroundmeter"
160
- :options="f_aroundmeter"
161
- :valueSingle="true"></input-select>
162
125
  </div>
163
- </div>
164
-
165
- <div v-if="$parent.showbutton2" class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
166
- <label class="col-sm-4 control-label">流量计型号:</label>
167
- <div class="col-sm-8">
168
- <input-select
169
- class="select select_list"
170
- :value.sync="item.f_aroundmeter"
171
- v-model="item.f_aroundmeter"
172
- :options="f_aroundmeter"
173
- :valueSingle="true"></input-select>
126
+ <div class="form-group col-sm-6" :class="[$v.f_meternumber.required ? 'has-error' : '']">
127
+ <label class="col-sm-4 control-label">表号:</label>
128
+ <div class="col-sm-8">
129
+ <input class="form-control input_view" style=""
130
+ placeholder="表号"
131
+ v-validate:f_meternumber = "['required']"
132
+ v-model="item.f_meternumber"
133
+ :value="item.f_meternumber"
134
+ @change="meternumberValidate(i)"
135
+ :readonly="mark === 1"/>
136
+ </div>
174
137
  </div>
175
- </div>
176
-
177
- <div v-if="$parent.showbutton2" class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
178
- <label class="col-sm-4 control-label">控制器品牌:</label>
179
- <div class="col-sm-8">
180
- <input-select
181
- class="select select_list"
182
- :value.sync="item.f_aroundmeter"
183
- v-model="item.f_aroundmeter"
184
- :options="f_aroundmeter"
185
- :valueSingle="true"></input-select>
138
+ <div class="form-group col-sm-6">
139
+ <label class="col-sm-4 control-label">表封号:</label>
140
+ <div class="col-sm-8">
141
+ <input class="form-control input_view" style=""
142
+ placeholder="表封号"
143
+ v-model="item.f_metertitles"
144
+ :value="item.f_metertitles"
145
+ :readonly="mark === 1"/>
146
+ </div>
186
147
  </div>
187
- </div>
188
-
189
- <div v-if="$parent.showbutton2" class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
190
- <label class="col-sm-4 control-label">控制器型号:</label>
191
- <div class="col-sm-8">
192
- <input-select
193
- class="select select_list"
194
- :value.sync="item.f_aroundmeter"
195
- v-model="item.f_aroundmeter"
196
- :options="f_aroundmeter"
197
- :valueSingle="false"></input-select>
148
+ <div class="form-group col-sm-6">
149
+ <label class="col-sm-4 control-label">表读数:</label>
150
+ <div class="col-sm-8">
151
+ <input class="form-control input_view" style=""
152
+ type="number"
153
+ placeholder="表读数"
154
+ v-model="item.f_meter_base"
155
+ :value="item.f_meter_base"
156
+ :readonly="mark === 1"/>
157
+ </div>
198
158
  </div>
199
- </div>
200
-
201
- <div v-if="$parent.showbutton2" class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
202
- <label class="col-sm-4 control-label">控制器表号:</label>
203
- <div class="col-sm-8">
204
- <input-select
205
- class="select select_list"
206
- :value.sync="item.f_aroundmeter"
207
- v-model="item.f_aroundmeter"
208
- :options="aroundmeters"
209
- :valueSingle="true"></input-select>
159
+ <div class="form-group col-sm-6">
160
+ <label class="col-sm-4 control-label">初始底数:</label>
161
+ <div class="col-sm-8">
162
+ <input class="form-control input_view" style=""
163
+ type="number"
164
+ v-model="item.f_initial_base"
165
+ :value="item.f_initial_base"
166
+ placeholder="初始底数"
167
+ :readonly="mark === 1"/>
168
+ </div>
169
+ </div>
170
+ <div class="form-group col-sm-6">
171
+ <label class="col-sm-4 control-label">表向:</label>
172
+ <div class="col-sm-8">
173
+ <input-select
174
+ class="select select_list"
175
+ :value.sync="item.f_aroundmeter"
176
+ v-model="item.f_aroundmeter"
177
+ :options="aroundmeters"
178
+ :disable="mark === 1"
179
+ :valueSingle="true"></input-select>
180
+ </div>
181
+ </div>
182
+ <div class="form-group col-sm-6">
183
+ <label class="col-sm-4 control-label">安装位置:</label>
184
+ <div class="col-sm-8">
185
+ <input-select
186
+ class="select select_list"
187
+ :value.sync="item.f_position"
188
+ v-model="item.f_position"
189
+ :options="positions"
190
+ :disable="mark === 1"
191
+ :valueSingle="true"></input-select>
192
+ </div>
193
+ </div>
194
+ <div class="form-group col-sm-6">
195
+ <label class="col-sm-4 control-label">安装人:</label>
196
+ <div class="col-sm-8">
197
+ <input-select
198
+ class="select select_list"
199
+ :value.sync="item.f_install_person"
200
+ v-model="item.f_install_person"
201
+ :options="installperson"
202
+ :disable="mark === 1"
203
+ :valueSingle="true"></input-select>
204
+ </div>
205
+ </div>
206
+ <div class="form-group col-sm-6">
207
+ <label class="col-sm-4 control-label">安装日期:</label>
208
+ <div class="col-sm-8">
209
+ <datepicker
210
+ placeholder="安装日期"
211
+ :value.sync="item.f_install_date"
212
+ v-model="item.f_install_date"
213
+ format="yyyy-MM-dd HH:mm:ss"
214
+ :disabled="mark === 1"
215
+ :show-reset-button="reset">
216
+ </datepicker>
217
+ </div>
210
218
  </div>
211
219
  </div>
212
220
 
213
-
214
-
215
-
216
- </div>
217
-
218
- </article>
219
- <footer slot="modal-footer" class="modal-footer">
220
- <!-- 去除一户多表 -->
221
- <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
222
- <button type="button" class="btn btn-primary" @click="saveUserFile">确认</button>
223
- </footer>
224
- </modal>
221
+ </article>
222
+ <footer slot="modal-footer" class="modal-footer">
223
+ <!-- 去除一户多表 -->
224
+ <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
225
+ <button type="button" class="btn btn-primary" @click="saveUserFile" :disabled="!$v.valid">确认</button>
226
+ </footer>
227
+ </modal>
228
+ </validator>
225
229
  </template>
226
230
  <script>
227
231
  import Vue from 'vue'
@@ -244,45 +248,38 @@ export default {
244
248
  return {
245
249
  showFile: false,
246
250
  showUserFile: false,
247
- showaddress:true,
248
- showbutton1:false,
249
- showbutton2:false,
250
251
  model: {
251
252
  data: null
252
253
  },
253
254
  meterbrands: [], // 气表品牌
254
255
  useradders: null,
255
- userinfo: {}
256
+ userinfo: {},
257
+ getfield: {
258
+ 'f_address': '地址',
259
+ 'f_meternumber': '表号',
260
+ 'f_gasbrand': '气表品牌',
261
+ 'f_gasmodel': '气表型号',
262
+ 'f_metertitles': '表封号',
263
+ 'f_meter_base': '表读数',
264
+ 'f_initial_base': '初始底数',
265
+ 'f_aroundmeter': '表向',
266
+ 'f_position': '安装位置',
267
+ 'f_install_person': '安装人',
268
+ 'f_install_date': '安装日期'
269
+ }
256
270
  }
257
271
  },
258
272
  ready () {
259
- console
260
273
  this.search()
261
274
  this.getMeterbrands()
262
275
  },
263
276
  methods: {
277
+ // 追加表具
278
+ addUserFile() {
279
+ this.userinfo.userfiles.push({})
280
+ },
264
281
  // 保存档案
265
282
  async saveUserFile() {
266
- if (this.userinfo.userfiles.length > 1) {
267
- this.$showAlert('该地址下已有表具信息,暂不支持一户多表!!!', 'warning', 3000)
268
- return
269
- }
270
- // 检查必填项
271
- // for (let i = 0; i < this.userinfo.userfiles.length; i++) {
272
- // let userfile = this.userinfo.userfiles[i]
273
- // if (userfile.f_gasbrand_id === null || userfile.f_gasbrand_id === '') {
274
- // this.$showAlert(`表具${i+1}气表品牌没有选择!!!`, 'warning', 3000)
275
- // return
276
- // }
277
- // // if (userfile.f_gasmodel_id === null || userfile.f_gasmodel_id === '') {
278
- // // this.$showAlert(`表具${i+1}气表型号没有选择!!!`, 'warning', 3000)
279
- // // return
280
- // // }
281
- // // if (userfile.f_meternumber === null || userfile.f_meternumber === '') {
282
- // // this.$showAlert(`表具${i+1}表号没有填写!!!`, 'warning', 3000)
283
- // // return
284
- // // }
285
- // }
286
283
  let data = {
287
284
  user: this.$login.f,
288
285
  useradders: this.useradders,
@@ -296,30 +293,30 @@ export default {
296
293
  this.$dispatch('breakControl', this.selectdata)
297
294
  },
298
295
  // 检查表号是否存在
299
- // async meternumberValidate(i) {
300
- // if (!this.userinfo.userfiles[i].f_gasbrand_id) {
301
- // this.userinfo.userfiles[i].f_meternumber = ''
302
- // this.$showAlert('请先选择气表品牌!!!', 'warning', 3000)
303
- // return
304
- // }
305
- // if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
306
- // let data = {
307
- // f_meternumber: this.userinfo.userfiles[i].f_meternumber,
308
- // f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
309
- // }
310
- // if (this.userinfo.userfiles[i].f_userfiles_id) {
311
- // data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
312
- // }
313
- // let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
314
- // resolveMsg: null,
315
- // rejectMsg: '表号验证失败!!'
316
- // })
317
- // if (res.data) {
318
- // this.userinfo.userfiles[i].f_meternumber = ''
319
- // this.$showAlert('表号已存在!!', 'warning', 3000)
320
- // }
321
- // }
322
- // },
296
+ async meternumberValidate(i) {
297
+ if (!this.userinfo.userfiles[i].f_gasbrand_id) {
298
+ this.userinfo.userfiles[i].f_meternumber = ''
299
+ this.$showAlert('请先选择气表品牌!!!', 'warning', 3000)
300
+ return
301
+ }
302
+ if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
303
+ let data = {
304
+ f_meternumber: this.userinfo.userfiles[i].f_meternumber,
305
+ f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
306
+ }
307
+ if (this.userinfo.userfiles[i].f_userfiles_id) {
308
+ data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
309
+ }
310
+ let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
311
+ resolveMsg: null,
312
+ rejectMsg: '表号验证失败!!'
313
+ })
314
+ if (res.data) {
315
+ this.userinfo.userfiles[i].f_meternumber = ''
316
+ this.$showAlert('表号已存在!!', 'warning', 3000)
317
+ }
318
+ }
319
+ },
323
320
  // 选择气表型号
324
321
  gasmodelChange(i) {
325
322
  if (this.userinfo.userfiles[i].gasmodel) {
@@ -331,6 +328,7 @@ export default {
331
328
  // 清空已保存的气表型号
332
329
  this.userinfo.userfiles[i].f_gasmodel_id = null
333
330
  this.userinfo.userfiles[i].gasmodel = null
331
+
334
332
  if (this.userinfo.userfiles[i].gasbrand) {
335
333
  // 气表品牌id
336
334
  this.userinfo.userfiles[i].f_gasbrand_id = this.userinfo.userfiles[i].gasbrand.id
@@ -338,20 +336,13 @@ export default {
338
336
  this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
339
337
  }
340
338
  },
341
- // 追加表具
342
- addUserFile() {
343
- this.userinfo.userfiles.push({})
344
- },
345
-
346
-
347
339
  // 打开安装明细
348
340
  async showUserFileModal (row) {
349
-
350
341
  this.useradders = row
351
342
 
352
343
  let http = new HttpResetClass()
353
344
  let data = {
354
- condition: `f_userinfo_id='${row.f_userinfo_id}'`
345
+ condition: `f_userinfo_id = '${row.f_userinfo_id}'`
355
346
  }
356
347
  let res = await http.load('POST', 'rs/logic/getUserinfoAndUserfiles', {data:data}, {
357
348
  resolveMsg: null,
@@ -359,19 +350,20 @@ export default {
359
350
  })
360
351
 
361
352
  this.userinfo = res.data
362
- console.log("12121313",this.userinfo)
363
353
 
364
354
  // 已有表具的 气表信息补充
365
- for (const userfile of this.userinfo.userfiles) {
355
+ for (let i = 0; i < this.userinfo.userfiles.length; i++) {
366
356
  for (const item of this.meterbrands) {
367
- if (item.value.id === userfile.f_gasbrand_id) {
368
- userfile.gasbrand = item.value
357
+ if (item.value.id === this.userinfo.userfiles[i].f_gasbrand_id) {
358
+ // this.userinfo.userfiles[i].gasbrand = item.value // 防止双向绑定失败
359
+ Vue.set(this.userinfo.userfiles[i], 'gasbrand', item.value)
369
360
  }
370
361
  }
371
- if (userfile.gasbrand) {
372
- for (const item of userfile.gasbrand.gasmodel) {
373
- if (item.value.id === userfile.f_gasmodel_id) {
374
- userfile.gasmodel = item.value
362
+ if (this.userinfo.userfiles[i].gasbrand) {
363
+ for (const item of this.userinfo.userfiles[i].gasbrand.gasmodel) {
364
+ if (item.value.id === this.userinfo.userfiles[i].f_gasmodel_id) {
365
+ // this.userinfo.userfiles[i].gasmodel = item.value
366
+ Vue.set(this.userinfo.userfiles[i], 'gasmodel', item.value)
375
367
  }
376
368
  }
377
369
  }
@@ -383,6 +375,7 @@ export default {
383
375
  async getMeterbrands() {
384
376
  let http = new HttpResetClass()
385
377
  let data = {
378
+ f_orgid: this.$login.f.orgid,
386
379
  f_filialeid: this.$login.f.orgid
387
380
  }
388
381
  let res = await http.load('POST', 'rs/logic/getMeterbrands', {data:data}, {
@@ -403,7 +396,7 @@ export default {
403
396
  rejectMsg: null
404
397
  })
405
398
  this.model.data = res.data
406
- if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
399
+ if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建') {
407
400
  let f_installed_households = 0
408
401
  for (const item of res.data) {
409
402
  if (item.f_userfiles_num > 0) {
@@ -420,20 +413,12 @@ export default {
420
413
  }
421
414
  }
422
415
  }
423
- if (this.selectdata.f_apply_type === '工商户报建' ){
424
- this.showbutton2=true
425
- }
426
- else
427
- this.showbutton1=true
428
- if (this.selectdata.f_apply_type === '散户报建' ){
429
- this.showaddress=false
430
- }
431
416
  },
432
417
  // 关闭安装明细
433
418
  closeUserFile() {
434
419
  this.showUserFile = false
435
420
  this.useradders = null
436
- this.userinfo = null
421
+ this.userinfo = {}
437
422
  this.search()
438
423
  },
439
424
  // 关闭文件上传对话框
@@ -451,40 +436,54 @@ export default {
451
436
  filepath: result.f_downloadpath,
452
437
  user: this.$login.f
453
438
  }
454
- let res = await this.$resetpost(`rs/logic/importAddInstallationDetails`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
455
- if(res.data.type === "success"){
456
- this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
457
- }else{
458
- this.$showMessage(res.data.msg);
459
- }
439
+ let res = await this.$resetpost(`rs/logic/importAddInstallationDetails`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败!!!', silent: true}, 0)
440
+
460
441
  this.$dispatch('breakControl', this.selectdata)
461
442
  }
462
443
  },
463
444
  computed: {
445
+ getCondition () {
446
+ let data = {
447
+ f_process_id: this.selectdata.f_process_id
448
+ }
449
+ return data
450
+ },
451
+ // 安装人
452
+ installperson() {
453
+ return this.$login.f.f_installman.map(item => {
454
+ return {
455
+ label: item.name,
456
+ value: item.name
457
+ }
458
+ })
459
+ },
464
460
  // 表向
465
461
  aroundmeters() {
466
462
  return this.$appdata.getParam('左右表')
467
463
  },
468
-
464
+ // 安装位置
465
+ positions() {
466
+ return this.$appdata.getParam('安装位置')
467
+ }
469
468
  },
470
469
  watch: {
471
470
  }
472
471
  }
473
472
  </script>
474
473
  <style scoped>
475
- .head-but{
476
- margin-left: 5px;
477
- height: 34px;
478
- /*background-color: #6aa6e2;*/
479
- border-radius: 4px;
480
- font-family: PingFang;
481
- color: #ffffff;
482
- }
483
- /*清除model中的浮动*/
484
- .clearfix:after,.clearfix:before{
485
- display: table;
486
- }
487
- .clearfix:after{
488
- clear: both;
489
- }
474
+ .head-but{
475
+ margin-left: 5px;
476
+ height: 34px;
477
+ /*background-color: #6aa6e2;*/
478
+ border-radius: 4px;
479
+ font-family: PingFang;
480
+ color: #ffffff;
481
+ }
482
+ /*清除model中的浮动*/
483
+ .clearfix:after,.clearfix:before{
484
+ display: table;
485
+ }
486
+ .clearfix:after{
487
+ clear: both;
488
+ }
490
489
  </style>