apply-clients 3.3.110-222 → 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
|
@@ -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){
|
|
@@ -1233,6 +1270,27 @@ export default {
|
|
|
1233
1270
|
}
|
|
1234
1271
|
}
|
|
1235
1272
|
},
|
|
1273
|
+
async 'getDesignerPeople' () {
|
|
1274
|
+
let data = {
|
|
1275
|
+
source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
|
|
1276
|
+
userid: this.$login.f.id
|
|
1277
|
+
}
|
|
1278
|
+
|
|
1279
|
+
let http = new HttpResetClass()
|
|
1280
|
+
let res = await http.load(
|
|
1281
|
+
'POST',
|
|
1282
|
+
`rs/search`,
|
|
1283
|
+
{data: data},
|
|
1284
|
+
{resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
|
|
1285
|
+
)
|
|
1286
|
+
|
|
1287
|
+
return res.data.map(item => {
|
|
1288
|
+
return {
|
|
1289
|
+
label: item.name,
|
|
1290
|
+
value: item.id
|
|
1291
|
+
}
|
|
1292
|
+
})
|
|
1293
|
+
},
|
|
1236
1294
|
// 申请节点初始化
|
|
1237
1295
|
'applyReadyEvent' () {
|
|
1238
1296
|
this.addressInitialization()
|
|
@@ -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
|