apply-clients 4.1.77 → 4.1.80
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 +2 -2
- package/src/components/product/Function/InstallInfoSelect.vue +3 -3
- package/src/components/product/Process/ExplorationSelect.vue +3 -3
- package/src/components/product/Process/Processes/InstallationDetails.vue +18 -10
- package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue +17 -18
- package/src/components/product/Process/Processes/chargeManagement.vue +1 -1
- package/src/components/product/Supervisory/SupervisoryList.vue +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apply-clients",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.80",
|
|
4
4
|
"description": "报建前端模块",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"sinon-chai": "^2.8.0",
|
|
93
93
|
"style": "0.0.3",
|
|
94
94
|
"style-loader": "^0.20.3",
|
|
95
|
-
"system-clients": "3.1
|
|
95
|
+
"system-clients": "3.2.1-11",
|
|
96
96
|
"system-phone": "1.1.18",
|
|
97
97
|
"url-loader": "^0.5.7",
|
|
98
98
|
"vue-client": "1.24.39",
|
|
@@ -7,13 +7,13 @@
|
|
|
7
7
|
<div class="form-group col-sm-5">
|
|
8
8
|
<label class="font_normal_body">项目名称:</label>
|
|
9
9
|
<input type="text" class="input_search" v-model="model.f_entry_name"
|
|
10
|
-
v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name
|
|
10
|
+
v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="form-group col-sm-4">
|
|
13
13
|
<label class="font_normal_body">报建编号：</label>
|
|
14
14
|
<input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
|
|
15
15
|
v-on:keyup.enter="$parent.$parent.search()"
|
|
16
|
-
condition="f_apply_num
|
|
16
|
+
condition="f_apply_num like '%{}%'">
|
|
17
17
|
</div>
|
|
18
18
|
<div class="form-group col-sm-3 button-range">
|
|
19
19
|
<button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
<label class="font_normal_body">合同编号：</label>
|
|
32
32
|
<input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
|
|
33
33
|
v-on:keyup.enter="$parent.$parent.search()"
|
|
34
|
-
condition="f_contract_number
|
|
34
|
+
condition="f_contract_number like '%{}%'">
|
|
35
35
|
</div>
|
|
36
36
|
<div class="form-group col-sm-4">
|
|
37
37
|
<label class="font_normal_body">报建类型：</label>
|
|
@@ -7,13 +7,13 @@
|
|
|
7
7
|
<div class="form-group col-sm-4">
|
|
8
8
|
<label class="font_normal_body">项目名称:</label>
|
|
9
9
|
<input type="text" class="input_search" v-model="model.f_entry_name"
|
|
10
|
-
v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name
|
|
10
|
+
v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="form-group col-sm-3">
|
|
13
13
|
<label class="font_normal_body">报建编号：</label>
|
|
14
14
|
<input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
|
|
15
15
|
v-on:keyup.enter="$parent.$parent.search()"
|
|
16
|
-
condition="f_apply_num
|
|
16
|
+
condition="f_apply_num like '%{}%'">
|
|
17
17
|
</div>
|
|
18
18
|
<div class="form-group col-sm-5 button-range">
|
|
19
19
|
<button class="button_new button_spacing" style="width: max-content"
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
<label class="font_normal_body">合同编号：</label>
|
|
35
35
|
<input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
|
|
36
36
|
v-on:keyup.enter="$parent.$parent.search()"
|
|
37
|
-
condition="
|
|
37
|
+
condition="f_contract_number like '%{}%'">
|
|
38
38
|
</div>
|
|
39
39
|
<div class="form-group col-sm-3">
|
|
40
40
|
<label class="font_normal_body">报建类型：</label>
|
|
@@ -197,7 +197,7 @@
|
|
|
197
197
|
class="select select_list"
|
|
198
198
|
:value.sync="item.f_install_person"
|
|
199
199
|
v-model="item.f_install_person"
|
|
200
|
-
:options="
|
|
200
|
+
:options="installpersons"
|
|
201
201
|
:disable="mark === 1"
|
|
202
202
|
:valueSingle="true"></input-select>
|
|
203
203
|
</div>
|
|
@@ -253,6 +253,7 @@ export default {
|
|
|
253
253
|
meterbrands: [], // 气表品牌
|
|
254
254
|
useradders: null,
|
|
255
255
|
userinfo: {},
|
|
256
|
+
installpersons:[],
|
|
256
257
|
getfield: {
|
|
257
258
|
'f_address': '地址',
|
|
258
259
|
'f_meternumber': '表号',
|
|
@@ -271,6 +272,7 @@ export default {
|
|
|
271
272
|
ready () {
|
|
272
273
|
this.search()
|
|
273
274
|
this.getMeterbrands()
|
|
275
|
+
this.installperson()
|
|
274
276
|
},
|
|
275
277
|
methods: {
|
|
276
278
|
// 追加表具
|
|
@@ -430,6 +432,21 @@ export default {
|
|
|
430
432
|
}
|
|
431
433
|
}
|
|
432
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
|
+
},
|
|
433
450
|
// 关闭安装明细
|
|
434
451
|
closeUserFile() {
|
|
435
452
|
this.showUserFile = false
|
|
@@ -464,15 +481,6 @@ export default {
|
|
|
464
481
|
}
|
|
465
482
|
return data
|
|
466
483
|
},
|
|
467
|
-
// 安装人
|
|
468
|
-
installperson() {
|
|
469
|
-
return this.$login.f.f_installman.map(item => {
|
|
470
|
-
return {
|
|
471
|
-
label: item.name,
|
|
472
|
-
value: item.name
|
|
473
|
-
}
|
|
474
|
-
})
|
|
475
|
-
},
|
|
476
484
|
// 表向
|
|
477
485
|
aroundmeters() {
|
|
478
486
|
return this.$appdata.getParam('左右表')
|
|
@@ -694,26 +694,25 @@
|
|
|
694
694
|
</div>
|
|
695
695
|
</div>
|
|
696
696
|
<div class="form-group col-sm-6">
|
|
697
|
-
<label class="col-sm-4 control-label"
|
|
697
|
+
<label class="col-sm-4 control-label">用户类型：</label>
|
|
698
698
|
<div class="col-sm-7">
|
|
699
699
|
<input-select
|
|
700
700
|
class="select select_list"
|
|
701
|
-
:value.sync="
|
|
702
|
-
v-model="userinfo.
|
|
703
|
-
:options="
|
|
704
|
-
:disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'
|
|
701
|
+
:value.sync="userinfo.f_user_nature"
|
|
702
|
+
v-model="userinfo.f_user_nature"
|
|
703
|
+
:options="getUserType"
|
|
704
|
+
:disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
|
|
705
705
|
:valueSingle="true"></input-select>
|
|
706
706
|
</div>
|
|
707
707
|
</div>
|
|
708
708
|
<div class="form-group col-sm-6">
|
|
709
|
-
<label class="col-sm-4 control-label"
|
|
709
|
+
<label class="col-sm-4 control-label">证件类型：</label>
|
|
710
710
|
<div class="col-sm-7">
|
|
711
711
|
<input-select
|
|
712
712
|
class="select select_list"
|
|
713
|
-
:value.sync="userinfo.
|
|
714
|
-
v-model="userinfo.
|
|
715
|
-
:options="
|
|
716
|
-
:disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
|
|
713
|
+
:value.sync="userinfo.f_credentials"
|
|
714
|
+
v-model="userinfo.f_credentials"
|
|
715
|
+
:options="credentialsList"
|
|
717
716
|
:valueSingle="true"></input-select>
|
|
718
717
|
</div>
|
|
719
718
|
</div>
|
|
@@ -1075,12 +1074,12 @@ export default {
|
|
|
1075
1074
|
resolveMsg: null,
|
|
1076
1075
|
rejectMsg: null
|
|
1077
1076
|
})
|
|
1078
|
-
if (resparent.data[i].defname === '营业厅建档' && resparent.data[i].state === '结束')
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1077
|
+
// if (resparent.data[i].defname === '营业厅建档' && resparent.data[i].state === '结束')
|
|
1078
|
+
// // let http3 = new HttpResetClass()
|
|
1079
|
+
// await http.load('POST', 'rs/logic/parentprocess', {data: {processid: resparent.data[i].processid, defname: resparent.data[i].defname}}, {
|
|
1080
|
+
// resolveMsg: null,
|
|
1081
|
+
// rejectMsg: null
|
|
1082
|
+
// })
|
|
1084
1083
|
}
|
|
1085
1084
|
for (let i = 0; i < this.selectedData.length; i++) {
|
|
1086
1085
|
let data = {
|
|
@@ -1349,7 +1348,7 @@ export default {
|
|
|
1349
1348
|
rejectMsg: null
|
|
1350
1349
|
})
|
|
1351
1350
|
this.$showMessage("删除成功")
|
|
1352
|
-
this.selectdata = res.data
|
|
1351
|
+
// this.selectdata = res.data
|
|
1353
1352
|
} catch (e) {
|
|
1354
1353
|
this.$showAlert(e.data, 'danger', 3000)
|
|
1355
1354
|
}
|
|
@@ -1376,7 +1375,7 @@ export default {
|
|
|
1376
1375
|
this.$showAlert(e.data, 'danger', 3000)
|
|
1377
1376
|
}
|
|
1378
1377
|
this.search()
|
|
1379
|
-
|
|
1378
|
+
this.$dispatch('breakControl', this.selectdata)
|
|
1380
1379
|
},
|
|
1381
1380
|
async unqualcheck(row) {
|
|
1382
1381
|
if (isEmpty(this.cv.f_void_remarks)) {
|
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
<div class="form-group col-sm-12" :class="charge.f_charge_money ? '':'has-error'">
|
|
114
114
|
<label class="col-sm-2 control-label">收费金额：</label>
|
|
115
115
|
<div class="col-sm-10">
|
|
116
|
-
<input type="
|
|
116
|
+
<input type="input"
|
|
117
117
|
class="form-control input_view"
|
|
118
118
|
style="width: 100%"
|
|
119
119
|
placeholder="0.00"
|
|
@@ -7,19 +7,19 @@
|
|
|
7
7
|
<div class="form-group col-sm-4">
|
|
8
8
|
<label class="font_normal_body">项目名称:</label>
|
|
9
9
|
<input type="text" class="input_search" v-model="model.f_entry_name"
|
|
10
|
-
v-on:keyup.enter="search" condition=" f_entry_name
|
|
10
|
+
v-on:keyup.enter="search" condition=" f_entry_name like '%{}%' " placeholder='请输入'>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="form-group col-sm-3">
|
|
13
13
|
<label class="font_normal_body">报建编号：</label>
|
|
14
14
|
<input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
|
|
15
15
|
v-on:keyup.enter="search"
|
|
16
|
-
condition="f_apply_num
|
|
16
|
+
condition="f_apply_num like '%{}%'">
|
|
17
17
|
</div>
|
|
18
18
|
<div class="form-group col-sm-3">
|
|
19
19
|
<label class="font_normal_body">合同编号：</label>
|
|
20
20
|
<input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
|
|
21
21
|
v-on:keyup.enter="search"
|
|
22
|
-
condition="f_contract_number
|
|
22
|
+
condition="f_contract_number like '%{}%'">
|
|
23
23
|
</div>
|
|
24
24
|
<div class="form-group col-sm-2 button-range">
|
|
25
25
|
<button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
|