apply-clients 3.3.110-220 → 3.3.110-223
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -268,7 +268,7 @@ export default {
|
|
|
268
268
|
}),
|
|
269
269
|
showModal: false,
|
|
270
270
|
applyType: '', // 报建类型
|
|
271
|
-
applyTypes:this.$appdata.getParam("手机报建类型"),
|
|
271
|
+
// applyTypes:this.$appdata.getParam("手机报建类型"),
|
|
272
272
|
applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
|
|
273
273
|
criteriaShow: false,
|
|
274
274
|
// applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
|
|
@@ -328,7 +328,7 @@ export default {
|
|
|
328
328
|
this.$refs.cp.$refs.cri.search()
|
|
329
329
|
},
|
|
330
330
|
searchCondition (args) {
|
|
331
|
-
args.condition
|
|
331
|
+
args.condition = args.condition + `and (f_apply_type !='团购转散户报建' and act.defname!='信息确认' )`
|
|
332
332
|
this.model.search(args.condition, args.model)
|
|
333
333
|
},
|
|
334
334
|
click (row) {
|
|
@@ -65,8 +65,9 @@ export default {
|
|
|
65
65
|
this.show_data.start_activity = this.json_datas.start_activity
|
|
66
66
|
this.show_data.xmlfilename = this.json_datas.workflow_xmlfilename
|
|
67
67
|
|
|
68
|
-
|
|
68
|
+
console.log("查看报警器材料1---------")
|
|
69
69
|
if ((this.show_data.f_apply_type === '报警器报建' || this.show_data.f_apply_type === '工商业报警器报建') && this.show_data.defname === '工程施工' && this.show_data.f_sub_state !='完工' && this.show_data.button.button_name === '完工'){
|
|
70
|
+
console.log("查看报警器材料2---------")
|
|
70
71
|
//判断是否添加报警器材料
|
|
71
72
|
let bjqlag = false
|
|
72
73
|
let datatemp = {
|
|
@@ -84,37 +85,73 @@ export default {
|
|
|
84
85
|
"f_userinfo_code":""
|
|
85
86
|
}
|
|
86
87
|
let numOne = [];
|
|
87
|
-
this.show_data
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
88
|
+
console.log("查看报警器材料3---------",this.show_data)
|
|
89
|
+
console.log("查看报警器材料4---------",this.show_data.onetomany)
|
|
90
|
+
|
|
91
|
+
let http = new HttpResetClass()
|
|
92
|
+
let data = {
|
|
93
|
+
tablename: `t_material_apply`,
|
|
94
|
+
condition: `f_process_id='${this.show_data.f_process_id}'`
|
|
95
|
+
}
|
|
96
|
+
let res = await http.load(
|
|
97
|
+
'POST',
|
|
98
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable?aaa=123`,
|
|
99
|
+
{data: data},
|
|
100
|
+
{resolveMsg: null, rejectMsg: 'onetomany查询失败'}
|
|
101
|
+
)
|
|
102
|
+
res.data.forEach(item => {
|
|
103
|
+
if (item.f_material_name.substr(0,3) === '报警器'){
|
|
104
|
+
var bjname = item.f_material_name.split("-")
|
|
105
|
+
bjqststedata.sid = item.f_bjq_sid
|
|
106
|
+
bjqststedata.f_process_id = item.f_process_id
|
|
107
|
+
bjqststedata.bjqtype = bjname[1]
|
|
108
|
+
//====================================
|
|
109
|
+
bjqlag = true
|
|
110
|
+
datatemp.bjqid = item.id
|
|
111
|
+
datatemp.fprocessid = item.f_process_id
|
|
112
|
+
datatemp.f_bjq_sid = item.f_bjq_sid
|
|
113
|
+
datatemp.f_material_code = item.f_material_code
|
|
114
|
+
datatemp.f_bjq_lng = item.f_bjq_lng
|
|
115
|
+
datatemp.f_bjq_lat = item.f_bjq_lat
|
|
116
|
+
datatemp.f_bjq_gaode_lng = item.f_bjq_gaode_lng
|
|
117
|
+
datatemp.f_bjq_gaode_lat = item.f_bjq_gaode_lng
|
|
118
|
+
datatemp.f_bjq_baidu_lng = item.f_bjq_baidu_lng
|
|
119
|
+
datatemp.f_bjq_baidu_lat = item.f_bjq_baidu_lat
|
|
120
|
+
numOne.push(item.f_bjq_sid)
|
|
121
|
+
}
|
|
109
122
|
})
|
|
123
|
+
// this.show_data.onetomany.forEach(item=>{
|
|
124
|
+
// console.log("查看报警器材料",item)
|
|
125
|
+
// item.rows.forEach(i=>{
|
|
126
|
+
// if (i.f_material_name.substr(0,3) === '报警器'){
|
|
127
|
+
// var bjname = i.f_material_name.split("-")
|
|
128
|
+
// bjqststedata.sid = i.f_bjq_sid
|
|
129
|
+
// bjqststedata.f_process_id = i.f_process_id
|
|
130
|
+
// bjqststedata.bjqtype = bjname[1]
|
|
131
|
+
// //====================================
|
|
132
|
+
// bjqlag = true
|
|
133
|
+
// datatemp.bjqid = i.id
|
|
134
|
+
// datatemp.fprocessid = i.f_process_id
|
|
135
|
+
// datatemp.f_bjq_sid = i.f_bjq_sid
|
|
136
|
+
// datatemp.f_material_code = i.f_material_code
|
|
137
|
+
// datatemp.f_bjq_lng = i.f_bjq_lng
|
|
138
|
+
// datatemp.f_bjq_lat = i.f_bjq_lat
|
|
139
|
+
// datatemp.f_bjq_gaode_lng = i.f_bjq_gaode_lng
|
|
140
|
+
// datatemp.f_bjq_gaode_lat = i.f_bjq_gaode_lng
|
|
141
|
+
// datatemp.f_bjq_baidu_lng = i.f_bjq_baidu_lng
|
|
142
|
+
// datatemp.f_bjq_baidu_lat = i.f_bjq_baidu_lat
|
|
143
|
+
// numOne.push(i.f_bjq_sid)
|
|
144
|
+
// }
|
|
145
|
+
// })
|
|
146
|
+
// })
|
|
110
147
|
if (!bjqlag){
|
|
111
148
|
this.$showMessage('请添加报警器物料信息!!!')
|
|
112
149
|
return
|
|
113
150
|
}
|
|
114
|
-
if (numOne.length > 1){
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}
|
|
151
|
+
// if (numOne.length > 1){
|
|
152
|
+
// this.$showMessage("暂时支持单个报警器物料安装!!!")
|
|
153
|
+
// return
|
|
154
|
+
// }
|
|
118
155
|
datatemp.sqvalue = this.show_data.areaData.sqvalue
|
|
119
156
|
|
|
120
157
|
bjqststedata.f_userinfo_code = this.show_data.f_userinfo_code
|
|
@@ -150,7 +187,7 @@ export default {
|
|
|
150
187
|
let res = await this.$resetpost(
|
|
151
188
|
`${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqadduser`,
|
|
152
189
|
// `ncc/rs/logic/bjqadduser`,
|
|
153
|
-
//
|
|
190
|
+
// `${this.$androidUtil.getProxyUrl()}/rs/logic/bjqadduser`,
|
|
154
191
|
adddata
|
|
155
192
|
)
|
|
156
193
|
if (res.data.code != 200){
|
|
@@ -192,7 +229,7 @@ export default {
|
|
|
192
229
|
let http = new HttpResetClass()
|
|
193
230
|
let restpz = await http.load(
|
|
194
231
|
'POST',
|
|
195
|
-
|
|
232
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,
|
|
196
233
|
{data: dataz},
|
|
197
234
|
{resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
|
|
198
235
|
)
|
|
@@ -652,12 +689,13 @@ export default {
|
|
|
652
689
|
|
|
653
690
|
let data = {
|
|
654
691
|
tablename: 't_area',
|
|
655
|
-
condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
|
|
692
|
+
// condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
|
|
693
|
+
condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
|
|
656
694
|
}
|
|
657
695
|
let http = new HttpResetClass()
|
|
658
696
|
let res = await http.load(
|
|
659
697
|
'POST',
|
|
660
|
-
|
|
698
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
|
|
661
699
|
{data: data},
|
|
662
700
|
{resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
|
|
663
701
|
)
|
|
@@ -676,21 +714,24 @@ export default {
|
|
|
676
714
|
|
|
677
715
|
let data = {
|
|
678
716
|
tablename: 't_street',
|
|
679
|
-
condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
|
|
717
|
+
// condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
|
|
718
|
+
condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
|
|
680
719
|
}
|
|
681
720
|
let f_address_type = this.getLableValue('地址类型')
|
|
682
721
|
|
|
683
722
|
if (f_address_type === '民用市区') {
|
|
684
|
-
data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
|
|
723
|
+
// data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
|
|
724
|
+
data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
|
|
685
725
|
}
|
|
686
726
|
if (f_address_type === '民用乡镇') {
|
|
687
|
-
data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
|
|
727
|
+
// data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
|
|
728
|
+
data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
|
|
688
729
|
}
|
|
689
730
|
|
|
690
731
|
let http = new HttpResetClass()
|
|
691
732
|
let res = await http.load(
|
|
692
733
|
'POST',
|
|
693
|
-
|
|
734
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
|
|
694
735
|
{data: data},
|
|
695
736
|
{resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
|
|
696
737
|
)
|
|
@@ -943,27 +984,6 @@ export default {
|
|
|
943
984
|
}
|
|
944
985
|
})
|
|
945
986
|
},
|
|
946
|
-
async getDesignerPeople () {
|
|
947
|
-
let data = {
|
|
948
|
-
source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
|
|
949
|
-
userid: Vue.user.id
|
|
950
|
-
}
|
|
951
|
-
|
|
952
|
-
let http = new HttpResetClass()
|
|
953
|
-
let res = await http.load(
|
|
954
|
-
'POST',
|
|
955
|
-
`${this.$androidUtil.getProxyUrl()}/rs/search`,
|
|
956
|
-
{data: data},
|
|
957
|
-
{resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
|
|
958
|
-
)
|
|
959
|
-
|
|
960
|
-
return res.data.map(item => {
|
|
961
|
-
return {
|
|
962
|
-
label: item.name,
|
|
963
|
-
value: item.id
|
|
964
|
-
}
|
|
965
|
-
})
|
|
966
|
-
},
|
|
967
987
|
// 获取片区
|
|
968
988
|
async getSliceArea () {
|
|
969
989
|
let data = {
|
|
@@ -1250,7 +1270,7 @@ export default {
|
|
|
1250
1270
|
}
|
|
1251
1271
|
}
|
|
1252
1272
|
},
|
|
1253
|
-
async getDesignerPeople () {
|
|
1273
|
+
async 'getDesignerPeople' () {
|
|
1254
1274
|
let data = {
|
|
1255
1275
|
source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
|
|
1256
1276
|
userid: this.$login.f.id
|
|
@@ -1278,21 +1298,6 @@ export default {
|
|
|
1278
1298
|
this.pcdChange()
|
|
1279
1299
|
this.streetChange()
|
|
1280
1300
|
},
|
|
1281
|
-
// 合同金额失去焦点
|
|
1282
|
-
async 'contractMoneyChange' (index) {
|
|
1283
|
-
let data = {
|
|
1284
|
-
operator: '+',
|
|
1285
|
-
num1: this.show_data.f_contract_money || 0,
|
|
1286
|
-
num2: this.getLableValue('追加金额') || 0
|
|
1287
|
-
}
|
|
1288
|
-
let res = await this.$resetpost(
|
|
1289
|
-
`${this.$androidUtil.getProxyUrl()}/rs/logic/compute`,
|
|
1290
|
-
{data: data},
|
|
1291
|
-
{resolveMsg: null, rejectMsg: '金额计算失败！！！'}
|
|
1292
|
-
)
|
|
1293
|
-
|
|
1294
|
-
this.setLabelValue('应交金额', res.data)
|
|
1295
|
-
},
|
|
1296
1301
|
// 街道失去焦点
|
|
1297
1302
|
async 'streetChange' (index) {
|
|
1298
1303
|
if (isEmpty(this.show_data.f_street)) {
|
|
@@ -1420,31 +1420,66 @@ export default {
|
|
|
1420
1420
|
"f_userinfo_code":""
|
|
1421
1421
|
}
|
|
1422
1422
|
let numOne = [];
|
|
1423
|
-
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
1427
|
-
|
|
1428
|
-
|
|
1429
|
-
|
|
1430
|
-
|
|
1431
|
-
|
|
1432
|
-
|
|
1433
|
-
|
|
1434
|
-
|
|
1435
|
-
|
|
1436
|
-
|
|
1437
|
-
|
|
1438
|
-
|
|
1423
|
+
|
|
1424
|
+
let http = new HttpResetClass()
|
|
1425
|
+
let data = {
|
|
1426
|
+
tablename: `t_material_apply`,
|
|
1427
|
+
condition: `f_process_id='${this.show_data.f_process_id}'`
|
|
1428
|
+
}
|
|
1429
|
+
let res = await http.load(
|
|
1430
|
+
'POST',
|
|
1431
|
+
`rs/sql/singleTable`,
|
|
1432
|
+
{data: data},
|
|
1433
|
+
{resolveMsg: null, rejectMsg: 'onetomany查询失败'}
|
|
1434
|
+
)
|
|
1435
|
+
res.data.forEach(item => {
|
|
1436
|
+
if (item.f_material_name.substr(0,3) === '报警器'){
|
|
1437
|
+
var bjname = item.f_material_name.split("-")
|
|
1438
|
+
bjqststedata.sid = item.f_bjq_sid
|
|
1439
|
+
bjqststedata.f_process_id = item.f_process_id
|
|
1440
|
+
bjqststedata.bjqtype = bjname[1]
|
|
1441
|
+
//====================================
|
|
1442
|
+
bjqlag = true
|
|
1443
|
+
datatemp.bjqid = item.id
|
|
1444
|
+
datatemp.fprocessid = item.f_process_id
|
|
1445
|
+
datatemp.f_bjq_sid = item.f_bjq_sid
|
|
1446
|
+
datatemp.f_material_code = item.f_material_code
|
|
1447
|
+
datatemp.f_bjq_lng = item.f_bjq_lng
|
|
1448
|
+
datatemp.f_bjq_lat = item.f_bjq_lat
|
|
1449
|
+
datatemp.f_bjq_gaode_lng = item.f_bjq_gaode_lng
|
|
1450
|
+
datatemp.f_bjq_gaode_lat = item.f_bjq_gaode_lng
|
|
1451
|
+
datatemp.f_bjq_baidu_lng = item.f_bjq_baidu_lng
|
|
1452
|
+
datatemp.f_bjq_baidu_lat = item.f_bjq_baidu_lat
|
|
1453
|
+
numOne.push(item.f_bjq_sid)
|
|
1454
|
+
}
|
|
1439
1455
|
})
|
|
1456
|
+
|
|
1457
|
+
// this.show_data.onetomany.forEach(item=>{
|
|
1458
|
+
// console.log("查看报警器材料",item)
|
|
1459
|
+
// item.rows.forEach(i=>{
|
|
1460
|
+
// if (i.f_material_name.substr(0,3) === '报警器'){
|
|
1461
|
+
// var bjname = i.f_material_name.split("-")
|
|
1462
|
+
// bjqststedata.sid = i.f_bjq_sid
|
|
1463
|
+
// bjqststedata.f_process_id = i.f_process_id
|
|
1464
|
+
// bjqststedata.bjqtype = bjname[1]
|
|
1465
|
+
// //====================================
|
|
1466
|
+
// bjqlag = true
|
|
1467
|
+
// datatemp.bjqid = i.id
|
|
1468
|
+
// datatemp.fprocessid = i.f_process_id
|
|
1469
|
+
// datatemp.f_bjq_sid = i.f_bjq_sid
|
|
1470
|
+
// datatemp.f_material_code = i.f_material_code
|
|
1471
|
+
// numOne.push(i.f_bjq_sid)
|
|
1472
|
+
// }
|
|
1473
|
+
// })
|
|
1474
|
+
// })
|
|
1440
1475
|
if (!bjqlag){
|
|
1441
1476
|
this.$showMessage('请添加报警器物料信息!!!')
|
|
1442
1477
|
return
|
|
1443
1478
|
}
|
|
1444
|
-
if (numOne.length > 1){
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
}
|
|
1479
|
+
// if (numOne.length > 1){
|
|
1480
|
+
// this.$showMessage("暂时支持单个报警器物料安装!!!")
|
|
1481
|
+
// return
|
|
1482
|
+
// }
|
|
1448
1483
|
datatemp.sqvalue = this.show_data.areaData.sqvalue
|
|
1449
1484
|
datatemp.f_bjq_baidu_lng = this.show_data.templatlng.baidutemplng
|
|
1450
1485
|
datatemp.f_bjq_baidu_lat = this.show_data.templatlng.baidutemplat
|