apply-clients 4.1.31-weinan → 4.1.32-weinan

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/app_apply/AppChargeManagement.vue +65 -3
  3. package/src/components/app_apply/AppInstallationDetails.vue +2 -1
  4. package/src/components/app_apply/materialshoufei.vue +35 -1
  5. package/src/components/product/Process/Processes/InstallationDetails.vue +514 -513
  6. package/src/components/product/Process/Service/ServiceControl.vue +36 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "4.1.31-weinan",
3
+ "version": "4.1.32-weinan",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/app_apply/AppChargeManagement.vue CHANGED
@@ -106,7 +106,7 @@
106
106
  </div>
107
107
  </div>
108
108
  <div v-for="(index,payment) in charge.payment_terms">
109
- <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
109
+ <!-- <div class="form-group row vertical-center" :class="payment.f_payment_term ? '':'has-error'">
110
110
  <label class="col-xs-4 control-label">收费项目：</label>
111
111
  <div class="col-xs-8">
112
112
  <input-select class="select select_list"
@@ -116,7 +116,7 @@
116
116
  :value-single="true"
117
117
  close-on-select ></input-select>
118
118
  </div>
119
- </div>
119
+ </div>-->
120
120
  <div class="form-group row vertical-center" :class="payment.f_charge_money ? '':'has-error'">
121
121
  <label class="col-xs-4 control-label">收费金额：</label>
122
122
  <div class="col-xs-8">
@@ -264,6 +264,7 @@ export default {
264
264
  this.timeLeft = 300
265
265
  // 修改支付状态
266
266
  this.updatestate('支付成功','有效')
267
+ this.saveother()
267
268
  // 清除二维码
268
269
  this.clearQrCode()
269
270
  this.showQrCode = false
@@ -317,6 +318,7 @@ export default {
317
318
  console.log(res.data)
318
319
  if (res.data.code == '200'){
319
320
  this.$showMessage('缴费成功！')
321
+ this.saveother()
320
322
  this.showCharge=false
321
323
  return
322
324
  }else {
@@ -587,7 +589,67 @@ export default {
587
589
  resolveMsg: null,
588
590
  rejectMsg: '关闭失败！！！'
589
591
  })
590
- }
592
+ },
593
+ async saveother(){
594
+ let http = new HttpResetClass()
595
+ let data = {
596
+ condition: " 1=1",
597
+ f_process_id: this.selectdata.f_process_id
598
+ }
599
+ let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
600
+ resolveMsg: null,
601
+ rejectMsg: null
602
+ })
603
+ let data1 = {
604
+ tablename: 't_material_charges',
605
+ condition: `f_process_id = '${this.selectdata.f_process_id}'`
606
+ }
607
+ let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'})
608
+
609
+ let otherdetails = []
610
+ for(let i=0;i<res1.data.length;i++){
611
+ otherdetails.push(
612
+ {
613
+ "f_brand_spec":[res1.data[i].f_material_name],
614
+ "f_unitprice":res1.data[i].f_material_price,
615
+ "f_typename":[res1.data[i].f_typename],
616
+ "f_typenumber":[res1.data[i].f_typenumber],
617
+ "f_number":res1.data[i].f_material_number
618
+ }
619
+ )
620
+ }
621
+ console.log("查询的用户信息",otherdetails)
622
+ let data2 = {
623
+ "record_userinfo":res.data[0].f_userinfo_id,
624
+ "f_userfiles_id":res.data[0].f_userfiles_id,
625
+ "f_user_id":res.data[0].f_user_id,
626
+ "f_user_name":res.data[0].f_user_name,
627
+ "f_address":res.data[0].f_address,
628
+ "f_user_type":this.selectdata.f_user_type,
629
+ "f_gasproperties":"",
630
+ "f_collection":this.selectdata.f_cost_sum,
631
+ "f_comments":"",
632
+ "f_payment":this.charge.f_payment_method,
633
+ "f_voucher_number":"",
634
+ "f_bill_style":"普通收据",
635
+ "f_userinfo_id":res.data[0].f_userinfo_id,
636
+ "f_service_person":Vue.user.name,
637
+ "f_operat_type":"其他收费",
638
+ "f_describe":"",
639
+ "f_state":"有效",
640
+ "f_operator":Vue.user.name,
641
+ "f_operatorid":Vue.user.id,
642
+ "f_orgid":Vue.user.orgid,
643
+ "f_orgname":Vue.user.orgs,
644
+ "f_depid":Vue.user.depids,
645
+ "f_depname":Vue.user.f_department_name,
646
+ "t_userfees":"",
647
+ "f_fee_type":"其他费用",
648
+ "f_fee_time":"12",
649
+ "otherdetail":otherdetails
650
+ }
651
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/sale_othercharge_logic`, {data: data2}, {resolveMsg: null, rejectMsg: '保存数据失败'})
652
+ }
591
653
  // async getConfig () {
592
654
  // let http = new HttpResetClass()
593
655
  // let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getWeiXinConfig`, null, {
package/src/components/app_apply/AppInstallationDetails.vue CHANGED
@@ -211,7 +211,7 @@
211
211
  :valueSingle="true"></input-select>
212
212
  </div>
213
213
  </div>-->
214
- <div class="form-group col-sm-6">
214
+ <div class="form-group col-sm-6" :class="[$v.f_install_date.required ? 'has-error' : '']">
215
215
  <label class="col-sm-4 control-label">安装日期：</label>
216
216
  <div class="col-sm-8">
217
217
  <datepicker
@@ -220,6 +220,7 @@
220
220
  v-model="item.f_install_date"
221
221
  format="yyyy-MM-dd HH:mm:ss"
222
222
  :disabled="mark === 1"
223
+ v-validate:f_install_date = "['required']"
223
224
  :show-reset-button="reset">
224
225
  </datepicker>
225
226
  </div>
package/src/components/app_apply/materialshoufei.vue CHANGED
@@ -43,7 +43,32 @@
43
43
  <article slot="modal-body" class="modal-body">
44
44
  <div class="from-group">
45
45
  <label>材料名称</label>
46
- <input type="text" class="form-control" v-model="addItem.f_material_name">
46
+ <input-select
47
+ class="select select_list"
48
+ :value.sync="addItem.f_material_name"
49
+ v-model="addItem.f_material_name"
50
+ :options="positions"
51
+ @change="setTypename"
52
+ :valueSingle="true"></input-select>
53
+ </div>
54
+ <div class="from-group">
55
+ <label>品名规格</label>
56
+ <input-select
57
+ class="select select_list"
58
+ :value.sync="addItem.f_typename"
59
+ v-model="addItem.f_typename"
60
+ :options="typeNameList"
61
+ @change="setTypenumber"
62
+ :valueSingle="true"></input-select>
63
+ </div>
64
+ <div class="from-group">
65
+ <label>型号</label>
66
+ <input-select
67
+ class="select select_list"
68
+ :value.sync="addItem.f_typenumber"
69
+ v-model="addItem.f_typenumber"
70
+ :options="typeNumberList"
71
+ :valueSingle="true"></input-select>
47
72
  </div>
48
73
  <div class="from-group">
49
74
  <label>单价(元)</label>
@@ -84,6 +109,9 @@ export default {
84
109
  },
85
110
  addItem: {},
86
111
  f_cost_sum: 0,
112
+ positions:this.$appdata.getParam('品名及规格'),
113
+ typeNameList:null,
114
+ typeNumberList:null
87
115
  }
88
116
  },
89
117
  props: {
@@ -153,6 +181,12 @@ export default {
153
181
  smalltoBIG() {
154
182
  let num = Number(this.addItem.f_material_price) * Number(this.addItem.f_material_number)
155
183
  return num
184
+ },
185
+ setTypename (val) {
186
+ this.typeNameList = this.$appdata.getParam(val)
187
+ },
188
+ setTypenumber (val) {
189
+ this.typeNumberList = this.$appdata.getParam(val)
156
190
  }
157
191
  },
158
192
  watch: {}
package/src/components/product/Process/Processes/InstallationDetails.vue CHANGED
@@ -1,513 +1,514 @@
1
- <template>
2
- <div class="col-sm-12" style="margin: 20px 0px;">
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>
64
- </div>
65
- <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
66
- <header slot="modal-header" class="modal-header">
67
- <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
68
- <h4 class="modal-title">选择文件</h4>
69
- </header>
70
- <article slot="modal-body" class="modal-body">
71
- <div class="form-group">
72
- <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
73
- </div>
74
- </article>
75
- <footer slot="modal-footer" class="modal-footer"></footer>
76
- </modal>
77
-
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">
88
- <input class="form-control input_view" style=""
89
- v-model="useradders.f_address"
90
- :value="useradders.f_address"
91
- :readonly="true"/>
92
- </div>
93
- </div>
94
-
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>
110
- </div>
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>
124
- </div>
125
- <div class="form-group col-sm-6" :class="[$v.f_meternumber.required ? 'has-error' : '']">
126
- <label class="col-sm-4 control-label">表号：</label>
127
- <div class="col-sm-8">
128
- <input class="form-control input_view" style=""
129
- placeholder="表号"
130
- v-validate:f_meternumber = "['required']"
131
- v-model="item.f_meternumber"
132
- :value="item.f_meternumber"
133
- @change="meternumberValidate(i)"
134
- :readonly="mark === 1"/>
135
- </div>
136
- </div>
137
- <div class="form-group col-sm-6">
138
- <label class="col-sm-4 control-label">表封号：</label>
139
- <div class="col-sm-8">
140
- <input class="form-control input_view" style=""
141
- placeholder="表封号"
142
- v-model="item.f_metertitles"
143
- :value="item.f_metertitles"
144
- :readonly="mark === 1"/>
145
- </div>
146
- </div>
147
- <div class="form-group col-sm-6">
148
- <label class="col-sm-4 control-label">表读数：</label>
149
- <div class="col-sm-8">
150
- <input class="form-control input_view" style=""
151
- type="number"
152
- placeholder="表读数"
153
- v-model="item.f_meter_base"
154
- :value="item.f_meter_base"
155
- :readonly="mark === 1"/>
156
- </div>
157
- </div>
158
- <div class="form-group col-sm-6">
159
- <label class="col-sm-4 control-label">初始底数：</label>
160
- <div class="col-sm-8">
161
- <input class="form-control input_view" style=""
162
- type="number"
163
- v-model="item.f_initial_base"
164
- :value="item.f_initial_base"
165
- placeholder="初始底数"
166
- :readonly="mark === 1"/>
167
- </div>
168
- </div>
169
- <div class="form-group col-sm-6">
170
- <label class="col-sm-4 control-label">表向：</label>
171
- <div class="col-sm-8">
172
- <input-select
173
- class="select select_list"
174
- :value.sync="item.f_aroundmeter"
175
- v-model="item.f_aroundmeter"
176
- :options="aroundmeters"
177
- :disable="mark === 1"
178
- :valueSingle="true"></input-select>
179
- </div>
180
- </div>
181
- <div class="form-group col-sm-6">
182
- <label class="col-sm-4 control-label">安装位置：</label>
183
- <div class="col-sm-8">
184
- <input-select
185
- class="select select_list"
186
- :value.sync="item.f_position"
187
- v-model="item.f_position"
188
- :options="positions"
189
- :disable="mark === 1"
190
- :valueSingle="true"></input-select>
191
- </div>
192
- </div>
193
- <div class="form-group col-sm-6">
194
- <label class="col-sm-4 control-label">安装人：</label>
195
- <div class="col-sm-8">
196
- <input-select
197
- class="select select_list"
198
- :value.sync="item.f_install_person"
199
- v-model="item.f_install_person"
200
- :options="installpersons"
201
- :disable="mark === 1"
202
- :valueSingle="true"></input-select>
203
- </div>
204
- </div>
205
- <div class="form-group col-sm-6">
206
- <label class="col-sm-4 control-label">安装日期：</label>
207
- <div class="col-sm-8">
208
- <datepicker
209
- placeholder="安装日期"
210
- :value.sync="item.f_install_date"
211
- v-model="item.f_install_date"
212
- format="yyyy-MM-dd HH:mm:ss"
213
- :disabled="mark === 1"
214
- :show-reset-button="reset">
215
- </datepicker>
216
- </div>
217
- </div>
218
- </div>
219
-
220
- </article>
221
- <footer slot="modal-footer" class="modal-footer">
222
- <!-- 去除一户多表 -->
223
- <button type="button" class="btn btn-primary" @click="addUserFile" v-if="false">添加表具</button>
224
- <button type="button" class="btn btn-primary" @click="saveUserFile" :disabled="!$v.valid">确认</button>
225
- </footer>
226
- </modal>
227
- </validator>
228
- </template>
229
- <script>
230
- import Vue from 'vue'
231
- import {PagedList} from 'vue-client'
232
- import {HttpResetClass} from 'vue-client'
233
- import {isEmpty} from '../../../Util'
234
-
235
- export default {
236
- title: '安装明细',
237
- props: {
238
- selectdata: {
239
- type: Object
240
- },
241
- mark: {
242
- type: Number,
243
- default: 0
244
- }
245
- },
246
- data () {
247
- return {
248
- showFile: false,
249
- showUserFile: false,
250
- model: {
251
- data: null
252
- },
253
- meterbrands: [], // 气表品牌
254
- useradders: null,
255
- userinfo: {},
256
- installpersons:[],
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
- }
270
- }
271
- },
272
- ready () {
273
- this.search()
274
- this.getMeterbrands()
275
- this.installperson()
276
- },
277
- methods: {
278
- // 追加表具
279
- addUserFile() {
280
- this.userinfo.userfiles.push({})
281
- },
282
- // 保存档案
283
- async saveUserFile() {
284
- console.log("当前表具信息",this.userinfo.userfiles[0])
285
- if ((this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋集中器' ||
286
- this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋4G物联网表' ||
287
- this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋NB物联网表') &&
288
- !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[0].f_meternumber))
289
- {
290
- this.$showAlert('请输入10位表号！！！', 'warning', 2000)
291
- return
292
- }
293
- let data = {
294
- user: this.$login.f,
295
- useradders: this.useradders,
296
- userinfo: this.userinfo,
297
- selectdata: this.selectdata
298
- }
299
- let res = await this.$resetpost('rs/logic/addInstallationDetails', {data:data}, {
300
- resolveMsg: null,
301
- rejectMsg: '表具添加失败！！！'
302
- })
303
- this.$dispatch('breakControl', this.selectdata)
304
- },
305
- // 检查表号是否存在
306
- async meternumberValidate(i) {
307
- if (!this.userinfo.userfiles[i].f_gasbrand_id) {
308
- this.userinfo.userfiles[i].f_meternumber = ''
309
- this.$showAlert('请先选择气表品牌！！！', 'warning', 2000)
310
- return
311
- }
312
- if ((this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋集中器' ||
313
- this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋4G物联网表' ||
314
- this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋NB物联网表') &&
315
- !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[i].f_meternumber))
316
- {
317
- this.$showAlert('请输入10位表号！！！', 'warning', 2000)
318
- return
319
- }
320
- if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
321
- let data = {
322
- f_meternumber: this.userinfo.userfiles[i].f_meternumber,
323
- f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
324
- }
325
- if (this.userinfo.userfiles[i].f_userfiles_id) {
326
- data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
327
- }
328
- let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
329
- resolveMsg: null,
330
- rejectMsg: '表号验证失败！！'
331
- })
332
- if (res.data) {
333
- this.userinfo.userfiles[i].f_meternumber = ''
334
- this.$showAlert('表号已存在！！', 'warning', 3000)
335
- }
336
- }
337
- },
338
- // 选择气表型号
339
- gasmodelChange(i) {
340
- if (this.userinfo.userfiles[i].gasmodel) {
341
- this.userinfo.userfiles[i].f_gasmodel_id = this.userinfo.userfiles[i].gasmodel.id
342
- }
343
- },
344
- // 选择气表品牌
345
- gasbrandChange(i) {
346
- // 清空已保存的气表型号
347
- this.userinfo.userfiles[i].f_gasmodel_id = null
348
- this.userinfo.userfiles[i].gasmodel = null
349
-
350
- if (this.userinfo.userfiles[i].gasbrand) {
351
- // 气表品牌id
352
- this.userinfo.userfiles[i].f_gasbrand_id = this.userinfo.userfiles[i].gasbrand.id
353
- // 气表分类
354
- this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
355
- }
356
- },
357
- // 打开安装明细
358
- async showUserFileModal (row) {
359
- this.useradders = row
360
-
361
- let http = new HttpResetClass()
362
- let data = {
363
- condition: `f_userinfo_id = '${row.f_userinfo_id}'`
364
- }
365
- let res = await http.load('POST', 'rs/logic/getUserinfoAndUserfiles', {data:data}, {
366
- resolveMsg: null,
367
- rejectMsg: null
368
- })
369
-
370
- this.userinfo = res.data
371
-
372
- // 已有表具的 气表信息补充
373
- for (let i = 0; i < this.userinfo.userfiles.length; i++) {
374
- for (const item of this.meterbrands) {
375
- if (item.value.id === this.userinfo.userfiles[i].f_gasbrand_id) {
376
- // this.userinfo.userfiles[i].gasbrand = item.value // 防止双向绑定失败
377
- Vue.set(this.userinfo.userfiles[i], 'gasbrand', item.value)
378
- }
379
- }
380
- if (this.userinfo.userfiles[i].gasbrand) {
381
- for (const item of this.userinfo.userfiles[i].gasbrand.gasmodel) {
382
- if (item.value.id === this.userinfo.userfiles[i].f_gasmodel_id) {
383
- // this.userinfo.userfiles[i].gasmodel = item.value
384
- Vue.set(this.userinfo.userfiles[i], 'gasmodel', item.value)
385
- }
386
- }
387
- }
388
- }
389
- console.log("表具信息",this.userinfo.userfiles)
390
- this.showUserFile = true
391
- },
392
- // 获取气表品牌
393
- async getMeterbrands() {
394
- let http = new HttpResetClass()
395
- let data = {
396
- f_orgid: this.$login.f.orgid,
397
- f_filialeid: this.$login.f.orgid
398
- }
399
- let res = await http.load('POST', 'rs/logic/getMeterbrands', {data:data}, {
400
- resolveMsg: null,
401
- rejectMsg: null
402
- })
403
- this.meterbrands = res.data
404
- },
405
- // 查询
406
- async search () {
407
- let http = new HttpResetClass()
408
- let data = {
409
- condition: " 1=1",
410
- f_process_id: this.selectdata.f_process_id
411
- }
412
- let res = await http.load('POST', 'rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
413
- resolveMsg: null,
414
- rejectMsg: null
415
- })
416
- this.model.data = res.data
417
- if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建') {
418
- let f_installed_households = 0
419
- for (const item of res.data) {
420
- if (item.f_userfiles_num > 0) {
421
- f_installed_households++
422
- }
423
- }
424
- let f_uninstalled_households = this.selectdata.f_apply_count - f_installed_households
425
- for (const item of this.selectdata.fields) {
426
- if (item.label === '已安装户数') {
427
- item.value = f_installed_households
428
- }
429
- if (item.label === '未安装户数') {
430
- item.value = f_uninstalled_households
431
- }
432
- }
433
- }
434
- },
435
- // 安装人
436
- async installperson() {
437
- let http = new HttpResetClass()
438
- let res = await http.load('POST', 'rs/search', {
439
- source: "this.getParentByType($organization$).getChildByName($安全员$).getChildren()",
440
- userid: this.$login.f.id
441
- }, {resolveMsg: null, rejectMsg: null})
442
-
443
- this.installpersons = res.data.map(item =>{
444
- return {
445
- label: item.name,
446
- value: item.name
447
- }
448
- })
449
- },
450
- // 关闭安装明细
451
- closeUserFile() {
452
- this.showUserFile = false
453
- this.useradders = null
454
- this.userinfo = {}
455
- this.search()
456
- },
457
- // 关闭文件上传对话框
458
- closeFile() {
459
- this.showFile = false
460
- // 将选的文件清空
461
- this.$refs.file.$el.querySelector('input').value = ''
462
- this.search()
463
- }
464
- },
465
- events: {
466
- async 'onFileUpload'(file, result) {
467
- let data = {
468
- selectdata: this.selectdata,
469
- filepath: result.f_downloadpath,
470
- user: this.$login.f
471
- }
472
- let res = await this.$resetpost(`rs/logic/importAddInstallationDetails`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
473
-
474
- this.$dispatch('breakControl', this.selectdata)
475
- }
476
- },
477
- computed: {
478
- getCondition () {
479
- let data = {
480
- f_process_id: this.selectdata.f_process_id
481
- }
482
- return data
483
- },
484
- // 表向
485
- aroundmeters() {
486
- return this.$appdata.getParam('左右表')
487
- },
488
- // 安装位置
489
- positions() {
490
- return this.$appdata.getParam('安装位置')
491
- }
492
- },
493
- watch: {
494
- }
495
- }
496
- </script>
497
- <style scoped>
498
- .head-but{
499
- margin-left: 5px;
500
- height: 34px;
501
- /*background-color: #6aa6e2;*/
502
- border-radius: 4px;
503
- font-family: PingFang;
504
- color: #ffffff;
505
- }
506
- /*清除model中的浮动*/
507
- .clearfix:after,.clearfix:before{
508
- display: table;
509
- }
510
- .clearfix:after{
511
- clear: both;
512
- }
513
- </style>
1
+ <template>
2
+ <div class="col-sm-12" style="margin: 20px 0px;">
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>
64
+ </div>
65
+ <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
66
+ <header slot="modal-header" class="modal-header">
67
+ <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
68
+ <h4 class="modal-title">选择文件</h4>
69
+ </header>
70
+ <article slot="modal-body" class="modal-body">
71
+ <div class="form-group">
72
+ <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
73
+ </div>
74
+ </article>
75
+ <footer slot="modal-footer" class="modal-footer"></footer>
76
+ </modal>
77
+
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">
88
+ <input class="form-control input_view" style=""
89
+ v-model="useradders.f_address"
90
+ :value="useradders.f_address"
91
+ :readonly="true"/>
92
+ </div>
93
+ </div>
94
+
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>
110
+ </div>
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>
124
+ </div>
125
+ <div class="form-group col-sm-6" :class="[$v.f_meternumber.required ? 'has-error' : '']">
126
+ <label class="col-sm-4 control-label">表号：</label>
127
+ <div class="col-sm-8">
128
+ <input class="form-control input_view" style=""
129
+ placeholder="表号"
130
+ v-validate:f_meternumber = "['required']"
131
+ v-model="item.f_meternumber"
132
+ :value="item.f_meternumber"
133
+ @change="meternumberValidate(i)"
134
+ :readonly="mark === 1"/>
135
+ </div>
136
+ </div>
137
+ <div class="form-group col-sm-6">
138
+ <label class="col-sm-4 control-label">表封号：</label>
139
+ <div class="col-sm-8">
140
+ <input class="form-control input_view" style=""
141
+ placeholder="表封号"
142
+ v-model="item.f_metertitles"
143
+ :value="item.f_metertitles"
144
+ :readonly="mark === 1"/>
145
+ </div>
146
+ </div>
147
+ <div class="form-group col-sm-6">
148
+ <label class="col-sm-4 control-label">表读数：</label>
149
+ <div class="col-sm-8">
150
+ <input class="form-control input_view" style=""
151
+ type="number"
152
+ placeholder="表读数"
153
+ v-model="item.f_meter_base"
154
+ :value="item.f_meter_base"
155
+ :readonly="mark === 1"/>
156
+ </div>
157
+ </div>
158
+ <div class="form-group col-sm-6">
159
+ <label class="col-sm-4 control-label">初始底数：</label>
160
+ <div class="col-sm-8">
161
+ <input class="form-control input_view" style=""
162
+ type="number"
163
+ v-model="item.f_initial_base"
164
+ :value="item.f_initial_base"
165
+ placeholder="初始底数"
166
+ :readonly="mark === 1"/>
167
+ </div>
168
+ </div>
169
+ <div class="form-group col-sm-6">
170
+ <label class="col-sm-4 control-label">表向：</label>
171
+ <div class="col-sm-8">
172
+ <input-select
173
+ class="select select_list"
174
+ :value.sync="item.f_aroundmeter"
175
+ v-model="item.f_aroundmeter"
176
+ :options="aroundmeters"
177
+ :disable="mark === 1"
178
+ :valueSingle="true"></input-select>
179
+ </div>
180
+ </div>
181
+ <div class="form-group col-sm-6">
182
+ <label class="col-sm-4 control-label">安装位置：</label>
183
+ <div class="col-sm-8">
184
+ <input-select
185
+ class="select select_list"
186
+ :value.sync="item.f_position"
187
+ v-model="item.f_position"
188
+ :options="positions"
189
+ :disable="mark === 1"
190
+ :valueSingle="true"></input-select>
191
+ </div>
192
+ </div>
193
+ <!-- <div class="form-group col-sm-6">
194
+ <label class="col-sm-4 control-label">安装人：</label>
195
+ <div class="col-sm-8">
196
+ <input-select
197
+ class="select select_list"
198
+ :value.sync="item.f_install_person"
199
+ v-model="item.f_install_person"
200
+ :options="installpersons"
201
+ :disable="mark === 1"
202
+ :valueSingle="true"></input-select>
203
+ </div>
204
+ </div>-->
205
+ <div class="form-group col-sm-6" :class="[$v.f_install_date.required ? 'has-error' : '']">
206
+ <label class="col-sm-4 control-label">安装日期：</label>
207
+ <div class="col-sm-8">
208
+ <datepicker
209
+ placeholder="安装日期"
210
+ :value.sync="item.f_install_date"
211
+ v-model="item.f_install_date"
212
+ format="yyyy-MM-dd HH:mm:ss"
213
+ :disabled="mark === 1"
214
+ v-validate:f_install_date = "['required']"
215
+ :show-reset-button="reset">
216
+ </datepicker>
217
+ </div>
218
+ </div>
219
+ </div>
220
+
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>
229
+ </template>
230
+ <script>
231
+ import Vue from 'vue'
232
+ import {PagedList} from 'vue-client'
233
+ import {HttpResetClass} from 'vue-client'
234
+ import {isEmpty} from '../../../Util'
235
+
236
+ export default {
237
+ title: '安装明细',
238
+ props: {
239
+ selectdata: {
240
+ type: Object
241
+ },
242
+ mark: {
243
+ type: Number,
244
+ default: 0
245
+ }
246
+ },
247
+ data () {
248
+ return {
249
+ showFile: false,
250
+ showUserFile: false,
251
+ model: {
252
+ data: null
253
+ },
254
+ meterbrands: [], // 气表品牌
255
+ useradders: null,
256
+ userinfo: {},
257
+ installpersons:[],
258
+ getfield: {
259
+ 'f_address': '地址',
260
+ 'f_meternumber': '表号',
261
+ 'f_gasbrand': '气表品牌',
262
+ 'f_gasmodel': '气表型号',
263
+ 'f_metertitles': '表封号',
264
+ 'f_meter_base': '表读数',
265
+ 'f_initial_base': '初始底数',
266
+ 'f_aroundmeter': '表向',
267
+ 'f_position': '安装位置',
268
+ 'f_install_person': '安装人',
269
+ 'f_install_date': '安装日期'
270
+ }
271
+ }
272
+ },
273
+ ready () {
274
+ this.search()
275
+ this.getMeterbrands()
276
+ this.installperson()
277
+ },
278
+ methods: {
279
+ // 追加表具
280
+ addUserFile() {
281
+ this.userinfo.userfiles.push({})
282
+ },
283
+ // 保存档案
284
+ async saveUserFile() {
285
+ console.log("当前表具信息",this.userinfo.userfiles[0])
286
+ if ((this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋集中器' ||
287
+ this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋4G物联网表' ||
288
+ this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋NB物联网表') &&
289
+ !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[0].f_meternumber))
290
+ {
291
+ this.$showAlert('请输入10位表号！！！', 'warning', 2000)
292
+ return
293
+ }
294
+ let data = {
295
+ user: this.$login.f,
296
+ useradders: this.useradders,
297
+ userinfo: this.userinfo,
298
+ selectdata: this.selectdata
299
+ }
300
+ let res = await this.$resetpost('rs/logic/addInstallationDetails', {data:data}, {
301
+ resolveMsg: null,
302
+ rejectMsg: '表具添加失败！！！'
303
+ })
304
+ this.$dispatch('breakControl', this.selectdata)
305
+ },
306
+ // 检查表号是否存在
307
+ async meternumberValidate(i) {
308
+ if (!this.userinfo.userfiles[i].f_gasbrand_id) {
309
+ this.userinfo.userfiles[i].f_meternumber = ''
310
+ this.$showAlert('请先选择气表品牌！！！', 'warning', 2000)
311
+ return
312
+ }
313
+ if ((this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋集中器' ||
314
+ this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋4G物联网表' ||
315
+ this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋NB物联网表') &&
316
+ !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[i].f_meternumber))
317
+ {
318
+ this.$showAlert('请输入10位表号！！！', 'warning', 2000)
319
+ return
320
+ }
321
+ if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
322
+ let data = {
323
+ f_meternumber: this.userinfo.userfiles[i].f_meternumber,
324
+ f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
325
+ }
326
+ if (this.userinfo.userfiles[i].f_userfiles_id) {
327
+ data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
328
+ }
329
+ let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
330
+ resolveMsg: null,
331
+ rejectMsg: '表号验证失败！！'
332
+ })
333
+ if (res.data) {
334
+ this.userinfo.userfiles[i].f_meternumber = ''
335
+ this.$showAlert('表号已存在！！', 'warning', 3000)
336
+ }
337
+ }
338
+ },
339
+ // 选择气表型号
340
+ gasmodelChange(i) {
341
+ if (this.userinfo.userfiles[i].gasmodel) {
342
+ this.userinfo.userfiles[i].f_gasmodel_id = this.userinfo.userfiles[i].gasmodel.id
343
+ }
344
+ },
345
+ // 选择气表品牌
346
+ gasbrandChange(i) {
347
+ // 清空已保存的气表型号
348
+ this.userinfo.userfiles[i].f_gasmodel_id = null
349
+ this.userinfo.userfiles[i].gasmodel = null
350
+
351
+ if (this.userinfo.userfiles[i].gasbrand) {
352
+ // 气表品牌id
353
+ this.userinfo.userfiles[i].f_gasbrand_id = this.userinfo.userfiles[i].gasbrand.id
354
+ // 气表分类
355
+ this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
356
+ }
357
+ },
358
+ // 打开安装明细
359
+ async showUserFileModal (row) {
360
+ this.useradders = row
361
+
362
+ let http = new HttpResetClass()
363
+ let data = {
364
+ condition: `f_userinfo_id = '${row.f_userinfo_id}'`
365
+ }
366
+ let res = await http.load('POST', 'rs/logic/getUserinfoAndUserfiles', {data:data}, {
367
+ resolveMsg: null,
368
+ rejectMsg: null
369
+ })
370
+
371
+ this.userinfo = res.data
372
+
373
+ // 已有表具的 气表信息补充
374
+ for (let i = 0; i < this.userinfo.userfiles.length; i++) {
375
+ for (const item of this.meterbrands) {
376
+ if (item.value.id === this.userinfo.userfiles[i].f_gasbrand_id) {
377
+ // this.userinfo.userfiles[i].gasbrand = item.value // 防止双向绑定失败
378
+ Vue.set(this.userinfo.userfiles[i], 'gasbrand', item.value)
379
+ }
380
+ }
381
+ if (this.userinfo.userfiles[i].gasbrand) {
382
+ for (const item of this.userinfo.userfiles[i].gasbrand.gasmodel) {
383
+ if (item.value.id === this.userinfo.userfiles[i].f_gasmodel_id) {
384
+ // this.userinfo.userfiles[i].gasmodel = item.value
385
+ Vue.set(this.userinfo.userfiles[i], 'gasmodel', item.value)
386
+ }
387
+ }
388
+ }
389
+ }
390
+ console.log("表具信息",this.userinfo.userfiles)
391
+ this.showUserFile = true
392
+ },
393
+ // 获取气表品牌
394
+ async getMeterbrands() {
395
+ let http = new HttpResetClass()
396
+ let data = {
397
+ f_orgid: this.$login.f.orgid,
398
+ f_filialeid: this.$login.f.orgid
399
+ }
400
+ let res = await http.load('POST', 'rs/logic/getMeterbrands', {data:data}, {
401
+ resolveMsg: null,
402
+ rejectMsg: null
403
+ })
404
+ this.meterbrands = res.data
405
+ },
406
+ // 查询
407
+ async search () {
408
+ let http = new HttpResetClass()
409
+ let data = {
410
+ condition: " 1=1",
411
+ f_process_id: this.selectdata.f_process_id
412
+ }
413
+ let res = await http.load('POST', 'rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
414
+ resolveMsg: null,
415
+ rejectMsg: null
416
+ })
417
+ this.model.data = res.data
418
+ if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建') {
419
+ let f_installed_households = 0
420
+ for (const item of res.data) {
421
+ if (item.f_userfiles_num > 0) {
422
+ f_installed_households++
423
+ }
424
+ }
425
+ let f_uninstalled_households = this.selectdata.f_apply_count - f_installed_households
426
+ for (const item of this.selectdata.fields) {
427
+ if (item.label === '已安装户数') {
428
+ item.value = f_installed_households
429
+ }
430
+ if (item.label === '未安装户数') {
431
+ item.value = f_uninstalled_households
432
+ }
433
+ }
434
+ }
435
+ },
436
+ // 安装人
437
+ async installperson() {
438
+ let http = new HttpResetClass()
439
+ let res = await http.load('POST', 'rs/search', {
440
+ source: "this.getParentByType($organization$).getChildByName($安全员$).getChildren()",
441
+ userid: this.$login.f.id
442
+ }, {resolveMsg: null, rejectMsg: null})
443
+
444
+ this.installpersons = res.data.map(item =>{
445
+ return {
446
+ label: item.name,
447
+ value: item.name
448
+ }
449
+ })
450
+ },
451
+ // 关闭安装明细
452
+ closeUserFile() {
453
+ this.showUserFile = false
454
+ this.useradders = null
455
+ this.userinfo = {}
456
+ this.search()
457
+ },
458
+ // 关闭文件上传对话框
459
+ closeFile() {
460
+ this.showFile = false
461
+ // 将选的文件清空
462
+ this.$refs.file.$el.querySelector('input').value = ''
463
+ this.search()
464
+ }
465
+ },
466
+ events: {
467
+ async 'onFileUpload'(file, result) {
468
+ let data = {
469
+ selectdata: this.selectdata,
470
+ filepath: result.f_downloadpath,
471
+ user: this.$login.f
472
+ }
473
+ let res = await this.$resetpost(`rs/logic/importAddInstallationDetails`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
474
+
475
+ this.$dispatch('breakControl', this.selectdata)
476
+ }
477
+ },
478
+ computed: {
479
+ getCondition () {
480
+ let data = {
481
+ f_process_id: this.selectdata.f_process_id
482
+ }
483
+ return data
484
+ },
485
+ // 表向
486
+ aroundmeters() {
487
+ return this.$appdata.getParam('左右表')
488
+ },
489
+ // 安装位置
490
+ positions() {
491
+ return this.$appdata.getParam('安装位置')
492
+ }
493
+ },
494
+ watch: {
495
+ }
496
+ }
497
+ </script>
498
+ <style scoped>
499
+ .head-but{
500
+ margin-left: 5px;
501
+ height: 34px;
502
+ /*background-color: #6aa6e2;*/
503
+ border-radius: 4px;
504
+ font-family: PingFang;
505
+ color: #ffffff;
506
+ }
507
+ /*清除model中的浮动*/
508
+ .clearfix:after,.clearfix:before{
509
+ display: table;
510
+ }
511
+ .clearfix:after{
512
+ clear: both;
513
+ }
514
+ </style>
package/src/components/product/Process/Service/ServiceControl.vue CHANGED
@@ -48,6 +48,28 @@ export default {
48
48
  ready(){
49
49
  },
50
50
  methods: {
51
+ stopapply(model1,model){
52
+ this.$showMessage('确定不具备条件,终止报建！',['confirm', 'cancel']).then((res)=>{
53
+ if (res=='confirm'){
54
+ this.selectdata = Object.assign( {},this.selectdata,model)
55
+ let data = {
56
+ loginUser: Vue.user,
57
+ selectdata: this.selectdata,
58
+ model: model1
59
+ }
60
+ let http = new HttpResetClass()
61
+ http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
62
+ .then(res => {
63
+ if (res.data === 200) {
64
+ this.$dispatch('search')
65
+ this.$dispatch('close')
66
+ } else {
67
+ this.$showMessage('终止报建失败')
68
+ }
69
+ })
70
+ }
71
+ })
72
+ },
51
73
  // 组件初始化操作
52
74
  refurbish() {
53
75
  this.json_datas = this.$workflow_vue
@@ -765,6 +787,20 @@ export default {
765
787
  return
766
788
  }
767
789
  let http = new HttpResetClass()
790
+ if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model.button.button_name == '提交'){
791
+ let model1 ={
792
+ f_stop_remarks : '不具备安装条件'
793
+ }
794
+ this.stopapply(model1,model)
795
+ return
796
+ }
797
+ if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_aerate == '否' && model.button.button_name == '提交'){
798
+ let model1 ={
799
+ f_stop_remarks : '未通气'
800
+ }
801
+ this.stopapply(model1,model)
802
+ return
803
+ }
768
804
  let requestData = {
769
805
  tables: this.data.tables,
770
806
  start_activity: this.$workflow_vue.start_activity,