apply-clients 4.1.61 → 4.1.65

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,134 +1,134 @@
1
- <template>
2
- <div class="flex-row">
3
- <div class="basic-main">
4
- <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
5
- <exploration-select v-ref:query :show-data="showData"></exploration-select>
6
- </div>
7
- <div v-if="showtotal" style="height: 89%">
8
- <tabset v-ref:tabs :close="false">
9
- <tab :header='selectdata.defname'>
10
- <service-control v-ref:service :selectdata="selectdata"></service-control>
11
- </tab>
12
- <tab header='附件'>
13
- <apply-upload :blodid="selectdata.f_process_id"
14
- :isupload = "true"
15
- :isdelete="true"
16
- :isusetype="true"
17
- :isremark = "true"
18
- :takeimg="false"
19
- :issearch="true"
20
- :defname="selectdata.defname">
21
- </apply-upload>
22
- </tab>
23
- </tabset>
24
- </div>
25
- </div>
26
- </div>
27
- </template>
28
- <script>
29
- import Vue from 'vue'
30
- import {HttpResetClass} from 'vue-client'
31
- export default {
32
- title: '报建流程',
33
- data () {
34
- return {
35
- showQuery: true, // 控制查询页
36
- showData: true, // 控制列表数据
37
- showtotal: false, // 详情显示
38
- selectdata: {},
39
- xmlname: '' // 配置文件名
40
- }
41
- },
42
- created () {
43
- },
44
- methods: {
45
- // 获取页面配置json文件
46
- async loadName () {
47
- let http = new HttpResetClass()
48
- let xmldata = {
49
- data: this.$login.f,
50
- workname: this.selectdata.processname
51
- }
52
- let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
53
-
54
- if (res.data.code && res.data.code === 200) {
55
- Vue.prototype.$workflow_vue = res.data.workflow_vue
56
- } else {
57
- this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
58
- return
59
- }
60
- }
61
- },
62
- events: {
63
- 'onMessage' (data) {
64
- console.log('接收消息')
65
- console.log(data)
66
- if (data.type === 'apply-task') {
67
- this.$refs.query.$refs.cp.$refs.cri.search()
68
- }
69
- },
70
- // 刷新控制层
71
- async 'breakControl' (servicedata) {
72
-
73
- if (servicedata.id) {
74
- let http = new HttpResetClass()
75
- let data = {
76
- condition: `u.id = ${servicedata.id}`,
77
- data: {
78
- id: this.$login.f.id,
79
- orgid: this.$login.f.orgid
80
- }
81
- }
82
- let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败,请手查询更新!!!'})
83
-
84
- this.selectdata = res.data[0]
85
- } else {
86
- this.selectdata = servicedata
87
- }
88
-
89
- this.showtotal = false
90
- this.$nextTick(() => {
91
- this.showtotal = true
92
- })
93
-
94
- },
95
- // 初始化
96
- async 'apply' (val) {
97
- this.showtotal = false
98
- this.selectdata = val
99
-
100
- // if (this.selectdata.f_apply_type === '集体报建') {
101
- // this.xmlname = '集体报建流程'
102
- // } else if (this.selectdata.f_apply_type === '散户报建') {
103
- // this.xmlname = '散户报建流程'
104
- // } else {
105
- // this.$showMessage('暂无此类报装')
106
- // return
107
- // }
108
-
109
- // 次方法必须同步执行,否则后续会出问题
110
- // 获取页面json配置文件
111
- await this.loadName()
112
-
113
- // 显示详细
114
- this.showtotal = true
115
- // 关闭列表数据
116
- this.showData = false
117
- // 关闭分页
118
- this.$refs.query.$refs.cp.pager = false
119
- },
120
- 'search' () {
121
- // 关闭详细
122
- this.showtotal = false
123
- // 显示列表数据
124
- this.showData = true
125
- // 显示分页
126
- this.$refs.query.$refs.cp.pager = true
127
- // 调用查询
128
- this.$refs.query.$refs.cp.$refs.cri.search()
129
- }
130
- },
131
- watch: {
132
- }
133
- }
134
- </script>
1
+ <template>
2
+ <div class="flex-row">
3
+ <div class="basic-main">
4
+ <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
5
+ <exploration-select v-ref:query :show-data="showData"></exploration-select>
6
+ </div>
7
+ <div v-if="showtotal" style="height: 89%">
8
+ <tabset v-ref:tabs :close="false">
9
+ <tab :header='selectdata.defname'>
10
+ <service-control v-ref:service :selectdata="selectdata"></service-control>
11
+ </tab>
12
+ <tab header='附件'>
13
+ <apply-upload :blodid="selectdata.f_process_id"
14
+ :isupload = "true"
15
+ :isdelete="true"
16
+ :isusetype="true"
17
+ :isremark = "true"
18
+ :takeimg="false"
19
+ :issearch="true"
20
+ :defname="selectdata.defname">
21
+ </apply-upload>
22
+ </tab>
23
+ </tabset>
24
+ </div>
25
+ </div>
26
+ </div>
27
+ </template>
28
+ <script>
29
+ import Vue from 'vue'
30
+ import {HttpResetClass} from 'vue-client'
31
+ export default {
32
+ title: '报建流程',
33
+ data () {
34
+ return {
35
+ showQuery: true, // 控制查询页
36
+ showData: true, // 控制列表数据
37
+ showtotal: false, // 详情显示
38
+ selectdata: {},
39
+ xmlname: '' // 配置文件名
40
+ }
41
+ },
42
+ created () {
43
+ },
44
+ methods: {
45
+ // 获取页面配置json文件
46
+ async loadName () {
47
+ let http = new HttpResetClass()
48
+ let xmldata = {
49
+ data: this.$login.f,
50
+ workname: this.selectdata.processname
51
+ }
52
+ let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
53
+
54
+ if (res.data.code && res.data.code === 200) {
55
+ Vue.prototype.$workflow_vue = res.data.workflow_vue
56
+ } else {
57
+ this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
58
+ return
59
+ }
60
+ }
61
+ },
62
+ events: {
63
+ 'onMessage' (data) {
64
+ console.log('接收消息')
65
+ console.log(data)
66
+ if (data.type === 'apply-task') {
67
+ this.$refs.query.$refs.cp.$refs.cri.search()
68
+ }
69
+ },
70
+ // 刷新控制层
71
+ async 'breakControl' (servicedata) {
72
+
73
+ if (servicedata.id) {
74
+ let http = new HttpResetClass()
75
+ let data = {
76
+ condition: `u.id = ${servicedata.id}`,
77
+ data: {
78
+ id: this.$login.f.id,
79
+ orgid: this.$login.f.orgid
80
+ }
81
+ }
82
+ let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败,请手查询更新!!!'})
83
+
84
+ this.selectdata = res.data[0]
85
+ } else {
86
+ this.selectdata = servicedata
87
+ }
88
+
89
+ this.showtotal = false
90
+ this.$nextTick(() => {
91
+ this.showtotal = true
92
+ })
93
+
94
+ },
95
+ // 初始化
96
+ async 'apply' (val) {
97
+ this.showtotal = false
98
+ this.selectdata = val
99
+
100
+ // if (this.selectdata.f_apply_type === '集体报建') {
101
+ // this.xmlname = '集体报建流程'
102
+ // } else if (this.selectdata.f_apply_type === '散户报建') {
103
+ // this.xmlname = '散户报建流程'
104
+ // } else {
105
+ // this.$showMessage('暂无此类报装')
106
+ // return
107
+ // }
108
+
109
+ // 次方法必须同步执行,否则后续会出问题
110
+ // 获取页面json配置文件
111
+ await this.loadName()
112
+
113
+ // 显示详细
114
+ this.showtotal = true
115
+ // 关闭列表数据
116
+ this.showData = false
117
+ // 关闭分页
118
+ this.$refs.query.$refs.cp.pager = false
119
+ },
120
+ 'search' () {
121
+ // 关闭详细
122
+ this.showtotal = false
123
+ // 显示列表数据
124
+ this.showData = true
125
+ // 显示分页
126
+ this.$refs.query.$refs.cp.pager = true
127
+ // 调用查询
128
+ this.$refs.query.$refs.cp.$refs.cri.search()
129
+ }
130
+ },
131
+ watch: {
132
+ }
133
+ }
134
+ </script>
@@ -86,7 +86,7 @@
86
86
  <h4 class="modal-title">安装明细</h4>
87
87
  </header>
88
88
  <article slot="modal-body" class="modal-body clearfix">
89
- <div class="form-group col-sm-12">
89
+ <div v-if="$parent.showaddress" class="form-group col-sm-12">
90
90
  <label class="col-sm-2 control-label">地址信息:</label>
91
91
  <div class="col-sm-10">
92
92
  <input class="form-control input_view" style=""
@@ -98,80 +98,108 @@
98
98
 
99
99
  <div v-for="(i, item) in userinfo.userfiles" class="form-group col-sm-12 panel panel-info">
100
100
  <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
101
- <div class="form-group col-sm-6" :class="item.f_gasbrand_id ? '':'has-error'">
101
+ <div class="form-group col-sm-6">
102
102
  <label class="col-sm-4 control-label">燃气表品牌:</label>
103
103
  <div class="col-sm-8">
104
104
  <input-select
105
105
  class="select select_list"
106
- :value.sync="item.gasbrand"
107
- v-model="item.gasbrand"
106
+ :value.sync="item.f_meter_brand"
107
+ v-model="item.f_meter_brand"
108
108
  :options="meterbrands"
109
109
  @change="gasbrandChange(i)"
110
110
  :valueSingle="true"></input-select>
111
111
  </div>
112
112
  </div>
113
- <div class="form-group col-sm-6" :class="item.f_gasmodel_id ? '':'has-error'">
113
+
114
+
115
+
116
+ <div class="form-group col-sm-6" >
114
117
  <label class="col-sm-4 control-label">燃气表型号:</label>
118
+ <div class="col-sm-8">
119
+ <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"/>
124
+ </div>
125
+ </div>
126
+
127
+
128
+ <div class="form-group col-sm-6">
129
+ <label class="col-sm-4 control-label">表向:</label>
115
130
  <div class="col-sm-8">
116
131
  <input-select
117
132
  class="select select_list"
118
- :value.sync="item.gasmodel"
119
- v-model="item.gasmodel"
120
- :options="item.gasbrand.gasmodel"
121
- @change="gasmodelChange(i)"
133
+ :value.sync="item.f_meter_direction"
134
+ v-model="item.f_meter_direction"
135
+ :options="aroundmeters"
122
136
  :valueSingle="true"></input-select>
123
137
  </div>
124
138
  </div>
125
- <div v-if="showbutton1" class="form-group col-sm-6" :class="item.f_meternumber ? '':'has-error'">
126
- <label class="col-sm-4 control-label">表号:</label>
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>
127
143
  <div class="col-sm-8">
128
144
  <input class="form-control input_view" style=""
129
145
  placeholder="表号"
130
- v-model="item.f_meternumber"
131
- :value="item.f_meternumber"
146
+ v-model="item.f_meter_card"
147
+ :value="item.f_meter_card"
132
148
  @change="meternumberValidate(i)"
133
149
  :readonly="false"/>
134
150
  </div>
135
151
  </div>
136
152
 
137
- <div v-if="showbutton2" class="form-group col-sm-6":class="item.f_control_brand ? '':'has-error'">
138
- <label class="col-sm-4 control-label">控制器品牌:</label>
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>
139
155
  <div class="col-sm-8">
140
156
  <input-select
141
157
  class="select select_list"
142
- :value.sync="item.f_control_brand"
143
- v-model="item.f_control_brand"
144
- :options="aroundmeters"
158
+ :value.sync="item.f_aroundmeter"
159
+ v-model="item.f_aroundmeter"
160
+ :options="f_aroundmeter"
145
161
  :valueSingle="true"></input-select>
146
162
  </div>
147
163
  </div>
148
164
 
149
- <div v-if="showbutton2" class="form-group col-sm-6":class="item.f_control_type ? '':'has-error'">
150
- <label class="col-sm-4 control-label">控制器型号:</label>
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>
151
167
  <div class="col-sm-8">
152
168
  <input-select
153
169
  class="select select_list"
154
- :value.sync="item.f_control_type"
155
- v-model="item.f_control_type"
156
- :options="aroundmeters"
170
+ :value.sync="item.f_aroundmeter"
171
+ v-model="item.f_aroundmeter"
172
+ :options="f_aroundmeter"
157
173
  :valueSingle="true"></input-select>
158
174
  </div>
159
175
  </div>
160
176
 
161
- <div v-if="showbutton2" class="form-group col-sm-6":class="item.f_control_code ? '':'has-error'">
162
- <label class="col-sm-4 control-label">控制器表号:</label>
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>
163
179
  <div class="col-sm-8">
164
180
  <input-select
165
181
  class="select select_list"
166
- :value.sync="item.f_control_code"
167
- v-model="item.f_control_code"
168
- :options="aroundmeters"
182
+ :value.sync="item.f_aroundmeter"
183
+ v-model="item.f_aroundmeter"
184
+ :options="f_aroundmeter"
169
185
  :valueSingle="true"></input-select>
170
186
  </div>
171
187
  </div>
172
188
 
173
- <div class="form-group col-sm-6":class="item.f_aroundmeter ? '':'has-error'">
174
- <label class="col-sm-4 control-label">表向:</label>
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>
198
+ </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>
175
203
  <div class="col-sm-8">
176
204
  <input-select
177
205
  class="select select_list"
@@ -183,6 +211,8 @@
183
211
  </div>
184
212
 
185
213
 
214
+
215
+
186
216
  </div>
187
217
 
188
218
  </article>
@@ -214,8 +244,9 @@ export default {
214
244
  return {
215
245
  showFile: false,
216
246
  showUserFile: false,
247
+ showaddress:true,
217
248
  showbutton1:false,
218
- showbutton2:true,
249
+ showbutton2:false,
219
250
  model: {
220
251
  data: null
221
252
  },
@@ -225,6 +256,7 @@ export default {
225
256
  }
226
257
  },
227
258
  ready () {
259
+ console
228
260
  this.search()
229
261
  this.getMeterbrands()
230
262
  },
@@ -236,21 +268,21 @@ export default {
236
268
  return
237
269
  }
238
270
  // 检查必填项
239
- for (let i = 0; i < this.userinfo.userfiles.length; i++) {
240
- let userfile = this.userinfo.userfiles[i]
241
- if (userfile.f_gasbrand_id === null || userfile.f_gasbrand_id === '') {
242
- this.$showAlert(`表具${i+1}气表品牌没有选择!!!`, 'warning', 3000)
243
- return
244
- }
245
- if (userfile.f_gasmodel_id === null || userfile.f_gasmodel_id === '') {
246
- this.$showAlert(`表具${i+1}气表型号没有选择!!!`, 'warning', 3000)
247
- return
248
- }
249
- // if (userfile.f_meternumber === null || userfile.f_meternumber === '') {
250
- // this.$showAlert(`表具${i+1}表号没有填写!!!`, 'warning', 3000)
251
- // return
252
- // }
253
- }
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
+ // }
254
286
  let data = {
255
287
  user: this.$login.f,
256
288
  useradders: this.useradders,
@@ -264,30 +296,30 @@ export default {
264
296
  this.$dispatch('breakControl', this.selectdata)
265
297
  },
266
298
  // 检查表号是否存在
267
- async meternumberValidate(i) {
268
- if (!this.userinfo.userfiles[i].f_gasbrand_id) {
269
- this.userinfo.userfiles[i].f_meternumber = ''
270
- this.$showAlert('请先选择气表品牌!!!', 'warning', 3000)
271
- return
272
- }
273
- if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
274
- let data = {
275
- f_meternumber: this.userinfo.userfiles[i].f_meternumber,
276
- f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
277
- }
278
- if (this.userinfo.userfiles[i].f_userfiles_id) {
279
- data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
280
- }
281
- let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
282
- resolveMsg: null,
283
- rejectMsg: '表号验证失败!!'
284
- })
285
- if (res.data) {
286
- this.userinfo.userfiles[i].f_meternumber = ''
287
- this.$showAlert('表号已存在!!', 'warning', 3000)
288
- }
289
- }
290
- },
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
+ // },
291
323
  // 选择气表型号
292
324
  gasmodelChange(i) {
293
325
  if (this.userinfo.userfiles[i].gasmodel) {
@@ -314,6 +346,7 @@ export default {
314
346
 
315
347
  // 打开安装明细
316
348
  async showUserFileModal (row) {
349
+
317
350
  this.useradders = row
318
351
 
319
352
  let http = new HttpResetClass()
@@ -326,6 +359,7 @@ export default {
326
359
  })
327
360
 
328
361
  this.userinfo = res.data
362
+ console.log("12121313",this.userinfo)
329
363
 
330
364
  // 已有表具的 气表信息补充
331
365
  for (const userfile of this.userinfo.userfiles) {
@@ -386,9 +420,13 @@ export default {
386
420
  }
387
421
  }
388
422
  }
389
- if (this.selectdata.f_apply_type === '开发商集体报建' ){
423
+ if (this.selectdata.f_apply_type === '工商户报建' ){
424
+ this.showbutton2=true
425
+ }
426
+ else
390
427
  this.showbutton1=true
391
- this.showbutton2=false
428
+ if (this.selectdata.f_apply_type === '散户报建' ){
429
+ this.showaddress=false
392
430
  }
393
431
  },
394
432
  // 关闭安装明细