apply-clients 3.3.110-222 → 3.3.110-225

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.3.110-222",
3
+ "version": "3.3.110-225",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -271,8 +271,8 @@ export default {
271
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
- // applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
275
- applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
274
+ applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
275
+ // applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
276
276
  defnames: [{label: '全部', value: ''}],
277
277
  applyNatures: [{label: '全部', value: ''}], // 报建性质
278
278
  laterList: [
@@ -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.onetomany.forEach(item=>{
88
- item.rows.forEach(i=>{
89
- if (i.f_material_name.substr(0,3) === '报警器'){
90
- var bjname = i.f_material_name.split("-")
91
- bjqststedata.sid = i.f_bjq_sid
92
- bjqststedata.f_process_id = i.f_process_id
93
- bjqststedata.bjqtype = bjname[1]
94
- //====================================
95
- bjqlag = true
96
- datatemp.bjqid = i.id
97
- datatemp.fprocessid = i.f_process_id
98
- datatemp.f_bjq_sid = i.f_bjq_sid
99
- datatemp.f_material_code = i.f_material_code
100
- datatemp.f_bjq_lng = i.f_bjq_lng
101
- datatemp.f_bjq_lat = i.f_bjq_lat
102
- datatemp.f_bjq_gaode_lng = i.f_bjq_gaode_lng
103
- datatemp.f_bjq_gaode_lat = i.f_bjq_gaode_lat
104
- datatemp.f_bjq_baidu_lng = i.f_bjq_baidu_lng
105
- datatemp.f_bjq_baidu_lat = i.f_bjq_baidu_lat
106
- numOne.push(i.f_bjq_sid)
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
- this.$showMessage("暂时支持单个报警器物料安装!!!")
116
- return
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
- // `/rs/logic/bjqadduser`,
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()
@@ -128,6 +128,7 @@
128
128
  placeholder="材料编号"
129
129
  v-model="item.f_bjq_sid"
130
130
  :value="item.f_bjq_sid"
131
+ @input="sycronizedCode(i,item.f_bjq_sid)"
131
132
  />
132
133
  </div>
133
134
  </div>
@@ -143,7 +144,6 @@
143
144
  </div>
144
145
 
145
146
  </div>
146
-
147
147
  </article>
148
148
  <footer slot="modal-footer" class="modal-footer">
149
149
  <template v-if="mark !== 1">
@@ -269,6 +269,7 @@
269
269
  this.materials[index].f_material_style = material.f_material_style
270
270
  this.materials[index].f_material_unit = material.f_material_unit
271
271
  this.materials[index].f_material_number = material.f_material_number
272
+ this.materials[index].f_material_code = material.f_material_code
272
273
  },
273
274
  // 新增材料
274
275
  async addMaterial() {
@@ -280,7 +281,7 @@
280
281
  f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
281
282
  f_orgid: Vue.user.orgid,
282
283
  f_orgname: Vue.user.orgs,
283
- materials: this.materials
284
+ materials: this.materials
284
285
  }
285
286
  let http = new HttpResetClass()
286
287
  let res = await http.load(
@@ -315,7 +316,8 @@
315
316
  f_material_style: row.f_material_style,
316
317
  f_material_unit: row.f_material_unit,
317
318
  f_material_number: row.f_material_number,
318
- f_material_code: row.f_material_code
319
+ f_material_code: row.f_material_code,
320
+ f_bjq_sid: row.f_bjq_sid
319
321
  }
320
322
  ]
321
323
  this.showMaterialModal = true
@@ -327,6 +329,7 @@
327
329
  data.f_material_unit = this.materials[0].f_material_unit
328
330
  data.f_material_number = this.materials[0].f_material_number
329
331
  data.f_material_code = this.materials[0].f_material_code
332
+ data.f_bjq_sid = this.materials[0].f_bjq_sid
330
333
  let http = new HttpResetClass()
331
334
  let res = await http.load(
332
335
  'POST',
@@ -335,6 +338,10 @@
335
338
  )
336
339
  this.closeMaterials()
337
340
  },
341
+ sycronizedCode(index,val){
342
+ console.log("看看:",index,val)
343
+ this.materials[index].f_material_code = val
344
+ },
338
345
  closeMaterials() {
339
346
  this.getOnetoManyData()
340
347
  this.showMaterialModal = false
@@ -43,21 +43,25 @@
43
43
  </h4>
44
44
  <table border="1" width="100%">
45
45
  <tr>
46
- <td colspan="2" style="border: none">
47
- 开票日期:{{ new Date().Format('yyyy年MM月dd日') }}
48
- </td>
49
- <td colspan="2" style="border: none">
50
- 收据编码:{{ charge.f_charge_number }}
51
- </td>
52
- <td colspan="2" style="border: none">
53
- 状态:{{ charge.f_charge_status }}
54
- </td>
46
+
47
+ <td style="width: 17%">开票日期</td>
48
+ <td colspan="4" style="width: 33%">{{ new Date().Format('yyyy年MM月dd日') }}</td>
49
+ </tr>
50
+ <tr>
51
+ <td style="width: 17%">收据编码</td>
52
+ <td colspan="4" style="width: 33%">{{ charge.f_charge_number }}</td>
53
+ </tr>
54
+ <tr>
55
+ <td style="width: 17%">状态</td>
56
+ <td colspan="4" style="width: 33%">{{ charge.f_charge_status }}</td>
55
57
  </tr>
56
58
  <tr>
57
59
  <td style="width: 17%">用户姓名</td>
58
- <td colspan="2" style="width: 33%">{{ selectdata.f_user_name }}</td>
60
+ <td colspan="4" style="width: 33%">{{ selectdata.f_user_name }}</td>
61
+ </tr>
62
+ <tr>
59
63
  <td style="width: 17%">用户编号</td>
60
- <td colspan="2" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
64
+ <td colspan="4" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
61
65
  </tr>
62
66
  <tr>
63
67
  <td>用户地址</td>
@@ -65,21 +69,27 @@
65
69
  </tr>
66
70
  <tr>
67
71
  <td>收款项目</td>
68
- <td colspan="2">{{ charge.f_payment_term }}</td>
72
+ <td colspan="4">{{ charge.f_payment_term }}</td>
73
+ </tr>
74
+ <tr>
69
75
  <td>收款方式</td>
70
76
  <td colspan="2">{{ charge.f_payment_method }}</td>
71
77
  </tr>
72
78
  <tr>
73
79
  <td>金额</td>
74
- <td colspan="2">{{ charge.f_charge_money }}</td>
80
+ <td colspan="4">{{ charge.f_charge_money }}</td>
81
+ </tr>
82
+ <tr>
75
83
  <td>金额大写</td>
76
- <td colspan="2">{{ charge.f_amount_words }}</td>
84
+ <td colspan="4">{{ charge.f_amount_words }}</td>
77
85
  </tr>
78
86
  <tr>
79
87
  <td>收款人</td>
80
- <td colspan="2">{{ charge.f_charge_collectors }}</td>
88
+ <td colspan="4">{{ charge.f_charge_collectors }}</td>
89
+ </tr>
90
+ <tr>
81
91
  <td>销售方(章)</td>
82
- <td colspan="2"></td>
92
+ <td colspan="4"></td>
83
93
  </tr>
84
94
  <tr>
85
95
  <td>备&emsp;&emsp;注</td>
@@ -121,6 +121,7 @@
121
121
  placeholder="材料编号"
122
122
  v-model="item.f_bjq_sid"
123
123
  :value="item.f_bjq_sid"
124
+ @input="sycronizedCode(i,item.f_bjq_sid)"
124
125
  />
125
126
  </div>
126
127
  </div>
@@ -241,7 +242,7 @@
241
242
 
242
243
  this.meterialOptions = res.data.map(item => {
243
244
  return {
244
- 'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}--${item.f_material_price}`,
245
+ 'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}--${item.f_material_code}`,
245
246
  'value': item
246
247
  }
247
248
  })
@@ -254,6 +255,7 @@
254
255
  this.materials[index].f_material_style = material.f_material_style
255
256
  this.materials[index].f_material_unit = material.f_material_unit
256
257
  this.materials[index].f_material_number = material.f_material_number
258
+ this.materials[index].f_material_code = material.f_material_code
257
259
  },
258
260
  // 新增材料
259
261
  async addMaterial () {
@@ -300,7 +302,8 @@
300
302
  f_material_style:row.f_material_style,
301
303
  f_material_unit:row.f_material_unit,
302
304
  f_material_number:row.f_material_number,
303
- f_material_code:row.f_material_code
305
+ f_material_code:row.f_material_code,
306
+ f_bjq_sid: row.f_bjq_sid
304
307
  }
305
308
  ]
306
309
  this.showMaterialModal = true
@@ -312,12 +315,17 @@
312
315
  data.f_material_unit = this.materials[0].f_material_unit
313
316
  data.f_material_number = this.materials[0].f_material_number
314
317
  data.f_material_code = this.materials[0].f_material_code
318
+ data.f_bjq_sid = this.materials[0].f_bjq_sid
315
319
  let res = await this.$resetpost(
316
320
  `rs/entity/t_material_apply`,
317
321
  data
318
322
  )
319
323
  this.closeMaterials()
320
324
  },
325
+ sycronizedCode(index,val){
326
+ console.log("看看:",index,val)
327
+ this.materials[index].f_material_code = val
328
+ },
321
329
  closeMaterials () {
322
330
  this.getOnetoManyData()
323
331
  this.showMaterialModal = false
@@ -1420,31 +1420,66 @@ export default {
1420
1420
  "f_userinfo_code":""
1421
1421
  }
1422
1422
  let numOne = [];
1423
- this.show_data.onetomany.forEach(item=>{
1424
- item.rows.forEach(i=>{
1425
- if (i.f_material_name.substr(0,3) === '报警器'){
1426
- var bjname = i.f_material_name.split("-")
1427
- bjqststedata.sid = i.f_bjq_sid
1428
- bjqststedata.f_process_id = i.f_process_id
1429
- bjqststedata.bjqtype = bjname[1]
1430
- //====================================
1431
- bjqlag = true
1432
- datatemp.bjqid = i.id
1433
- datatemp.fprocessid = i.f_process_id
1434
- datatemp.f_bjq_sid = i.f_bjq_sid
1435
- datatemp.f_material_code = i.f_material_code
1436
- numOne.push(i.f_bjq_sid)
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
- this.$showMessage("暂时支持单个报警器物料安装!!!")
1446
- return
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