apply-clients 3.4.20 → 3.4.22
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/build/dev-server.js +2 -2
- package/index.html +33 -33
- package/package.json +1 -1
- package/src/components/android/Process/AppExplorationUser.vue +13 -9
- package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue +57 -68
- package/src/filiale/guangxi/pc/ApplyCharge/chargeManagement.vue +674 -0
- package/src/filiale/guangxi/pc/Process/ExplorationSelect.vue +4 -0
- package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue +72 -47
- package/src/filiale/guangxi/pc.js +1 -0
- package/src/main.js +3 -3
package/build/dev-server.js
CHANGED
|
@@ -8,8 +8,8 @@ var compiler = webpack(config)
|
|
|
8
8
|
// var proxy = httpProxy.createProxyServer()
|
|
9
9
|
// var ldap = 'http://121.36.79.201:8400'
|
|
10
10
|
// var applyinstall = 'http://121.36.79.201:8400'
|
|
11
|
-
var ldap = 'http://
|
|
12
|
-
var applyinstall = 'http://
|
|
11
|
+
var ldap = 'http://117.33.181.102:8400'
|
|
12
|
+
var applyinstall = 'http://117.33.181.102:8400'
|
|
13
13
|
|
|
14
14
|
var proxyTable = {
|
|
15
15
|
'/rs/logic/getSaleInitData': {
|
package/index.html
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
<!DOCTYPE html>
|
|
2
|
-
<html lang="zh-CN">
|
|
3
|
-
<head>
|
|
4
|
-
<meta charset="utf-8">
|
|
5
|
-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
6
|
-
<META HTTP-EQUIV="pragma" CONTENT="no-cache">
|
|
7
|
-
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
|
|
8
|
-
<META HTTP-EQUIV="expires" CONTENT="0">
|
|
9
|
-
<title>报建系统</title>
|
|
10
|
-
<script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
|
|
11
|
-
<!--引入UI组件库（1.1版本） -->
|
|
12
|
-
<script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
|
|
13
|
-
<style media="screen">
|
|
14
|
-
/*url(./static/newmainbg.jpg)*/
|
|
15
|
-
|
|
16
|
-
body {
|
|
17
|
-
font-size:16px !important;
|
|
18
|
-
width: 100%;
|
|
19
|
-
background: #7f8eaf no-repeat center bottom;
|
|
20
|
-
background-size: cover;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
body .loginbg {
|
|
24
|
-
width: 100%;
|
|
25
|
-
height: 100%;
|
|
26
|
-
background: url(./static/loginbg.jpg) no-repeat center top;
|
|
27
|
-
}
|
|
28
|
-
</style>
|
|
29
|
-
</head>
|
|
30
|
-
<body id="bodymain" class="themeOne">
|
|
31
|
-
<app></app>
|
|
32
|
-
</body>
|
|
33
|
-
</html>
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html lang="zh-CN">
|
|
3
|
+
<head>
|
|
4
|
+
<meta charset="utf-8">
|
|
5
|
+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
6
|
+
<META HTTP-EQUIV="pragma" CONTENT="no-cache">
|
|
7
|
+
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
|
|
8
|
+
<META HTTP-EQUIV="expires" CONTENT="0">
|
|
9
|
+
<title>报建系统</title>
|
|
10
|
+
<script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
|
|
11
|
+
<!--引入UI组件库（1.1版本） -->
|
|
12
|
+
<script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
|
|
13
|
+
<style media="screen">
|
|
14
|
+
/*url(./static/newmainbg.jpg)*/
|
|
15
|
+
|
|
16
|
+
body {
|
|
17
|
+
font-size:16px !important;
|
|
18
|
+
width: 100%;
|
|
19
|
+
background: #7f8eaf no-repeat center bottom;
|
|
20
|
+
background-size: cover;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
body .loginbg {
|
|
24
|
+
width: 100%;
|
|
25
|
+
height: 100%;
|
|
26
|
+
background: url(./static/loginbg.jpg) no-repeat center top;
|
|
27
|
+
}
|
|
28
|
+
</style>
|
|
29
|
+
</head>
|
|
30
|
+
<body id="bodymain" class="themeOne">
|
|
31
|
+
<android-app></android-app>
|
|
32
|
+
</body>
|
|
33
|
+
</html>
|
package/package.json
CHANGED
|
@@ -163,6 +163,10 @@
|
|
|
163
163
|
<p class="col-xs-3 text-left font"><b>地  址：</b></p>
|
|
164
164
|
<p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
|
|
165
165
|
</div>
|
|
166
|
+
<div class="col-xs-12" v-if="row.f_order_date != null ">
|
|
167
|
+
<p class="col-xs-3 text-left font"><b>预约日期：</b></p>
|
|
168
|
+
<p class="col-xs-9 text-left input-font">{{ row.f_order_date }}</p>
|
|
169
|
+
</div>
|
|
166
170
|
<div class="col-xs-12">
|
|
167
171
|
<p class="col-xs-3 text-left font"><b>报建日期：</b></p>
|
|
168
172
|
<p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
|
|
@@ -266,13 +270,13 @@ export default {
|
|
|
266
270
|
orgid: Vue.user.orgid
|
|
267
271
|
},
|
|
268
272
|
}),
|
|
269
|
-
applytype:[],
|
|
273
|
+
// applytype:[],
|
|
270
274
|
showModal: false,
|
|
271
|
-
applyType: '', // 报建类型
|
|
272
|
-
applyTypes:[],
|
|
273
|
-
|
|
275
|
+
// applyType: '', // 报建类型
|
|
276
|
+
// applyTypes:[],
|
|
277
|
+
applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'}],
|
|
274
278
|
criteriaShow: false,
|
|
275
|
-
|
|
279
|
+
applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
|
|
276
280
|
defnames: [{label: '全部', value: ''}],
|
|
277
281
|
applyNatures: [{label: '全部', value: ''}], // 报建性质
|
|
278
282
|
laterList: [
|
|
@@ -286,8 +290,8 @@ export default {
|
|
|
286
290
|
this.search()
|
|
287
291
|
//this.$refs.cp.$refs.cri.model.defname='报装缴费'
|
|
288
292
|
//this.$refs.cp.$refs.cri.model.defname='合同签订'
|
|
289
|
-
this.applytype =[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]// 所有报建类型
|
|
290
|
-
|
|
293
|
+
// this.applytype =[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]// 所有报建类型
|
|
294
|
+
// this.applyTypes=this.$appdata.getParam("手机报建类型")
|
|
291
295
|
|
|
292
296
|
},
|
|
293
297
|
methods: {
|
|
@@ -433,8 +437,8 @@ export default {
|
|
|
433
437
|
},
|
|
434
438
|
computed: {
|
|
435
439
|
appDefnames () {
|
|
436
|
-
|
|
437
|
-
let list = this.$appdata.getParam('手机节点')
|
|
440
|
+
let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'},{label: '工程施工', value: '工程施工'},{label: '工程派工', value: '工程派工'},{label: '点火派单', value: '点火派单'}]
|
|
441
|
+
// let list = this.$appdata.getParam('手机节点')
|
|
438
442
|
return `(${list.map(item => `'${item.value}'`).toString()})`
|
|
439
443
|
}
|
|
440
444
|
}
|
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
<tr>
|
|
6
6
|
<th class="textNoLineBreak">序号</th>
|
|
7
7
|
<th class="textNoLineBreak">材料名称</th>
|
|
8
|
-
<th class="textNoLineBreak">材料型号</th>
|
|
9
8
|
<th class="textNoLineBreak">材料单位</th>
|
|
9
|
+
<th class="textNoLineBreak">材料单价</th>
|
|
10
10
|
<th class="textNoLineBreak">材料数量</th>
|
|
11
|
-
<th class="textNoLineBreak"
|
|
12
|
-
<th class="textNoLineBreak"
|
|
11
|
+
<th class="textNoLineBreak">材料金额</th>
|
|
12
|
+
<th class="textNoLineBreak">材料备注</th>
|
|
13
13
|
<th class="textNoLineBreak">
|
|
14
14
|
<button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
|
|
15
15
|
</button>
|
|
@@ -25,19 +25,19 @@
|
|
|
25
25
|
<nobr>{{row.f_material_name}}</nobr>
|
|
26
26
|
</td>
|
|
27
27
|
<td style="text-align: center;">
|
|
28
|
-
<nobr>{{row.
|
|
28
|
+
<nobr>{{row.f_material_unit}}</nobr>
|
|
29
29
|
</td>
|
|
30
30
|
<td style="text-align: center;">
|
|
31
|
-
<nobr>{{row.
|
|
31
|
+
<nobr>{{row.f_material_price}}</nobr>
|
|
32
32
|
</td>
|
|
33
33
|
<td style="text-align: center;">
|
|
34
34
|
<nobr>{{row.f_material_number}}</nobr>
|
|
35
35
|
</td>
|
|
36
36
|
<td style="text-align: center;">
|
|
37
|
-
<nobr>{{row.
|
|
37
|
+
<nobr>{{row.f_material_money}}</nobr>
|
|
38
38
|
</td>
|
|
39
39
|
<td style="text-align: center;">
|
|
40
|
-
<nobr>{{row.
|
|
40
|
+
<nobr>{{row.f_material_remarks}}</nobr>
|
|
41
41
|
</td>
|
|
42
42
|
<td style="text-align: center;">
|
|
43
43
|
<button type="button" class="button_search button_spacing"
|
|
@@ -91,13 +91,13 @@
|
|
|
91
91
|
/>
|
|
92
92
|
</div>
|
|
93
93
|
</div>
|
|
94
|
-
<div class="form-group col-sm-6" :class="[item.
|
|
95
|
-
<label class="col-sm-4 control-label"
|
|
94
|
+
<div class="form-group col-sm-6" :class="[item.f_material_price ? '' : 'has-error']">
|
|
95
|
+
<label class="col-sm-4 control-label">材料单价：</label>
|
|
96
96
|
<div class="col-sm-8">
|
|
97
97
|
<input class="form-control input_view" style="" type="text"
|
|
98
|
-
placeholder="
|
|
99
|
-
v-model="item.
|
|
100
|
-
:value="item.
|
|
98
|
+
placeholder="材料单价"
|
|
99
|
+
v-model="item.f_material_price"
|
|
100
|
+
:value="item.f_material_price"
|
|
101
101
|
/>
|
|
102
102
|
</div>
|
|
103
103
|
</div>
|
|
@@ -122,22 +122,22 @@
|
|
|
122
122
|
</div>
|
|
123
123
|
</div>
|
|
124
124
|
<div class="form-group col-sm-6">
|
|
125
|
-
<label class="col-sm-4 control-label"
|
|
125
|
+
<label class="col-sm-4 control-label">材料金额：</label>
|
|
126
126
|
<div class="col-sm-8">
|
|
127
127
|
<input class="form-control input_view" style="" type="text"
|
|
128
|
-
placeholder="
|
|
129
|
-
v-model="item.
|
|
130
|
-
:value="item.
|
|
128
|
+
placeholder="材料金额"
|
|
129
|
+
v-model="item.f_material_money"
|
|
130
|
+
:value="item.f_material_money"
|
|
131
131
|
/>
|
|
132
132
|
</div>
|
|
133
133
|
</div>
|
|
134
134
|
<div class="form-group col-sm-6">
|
|
135
|
-
<label class="col-sm-4 control-label"
|
|
135
|
+
<label class="col-sm-4 control-label">材料备注：</label>
|
|
136
136
|
<div class="col-sm-8">
|
|
137
137
|
<input class="form-control input_view" style=""
|
|
138
|
-
placeholder="
|
|
139
|
-
v-model="item.
|
|
140
|
-
:value.sync="item.
|
|
138
|
+
placeholder="材料备注"
|
|
139
|
+
v-model="item.f_material_remarks"
|
|
140
|
+
:value.sync="item.f_material_remarks"
|
|
141
141
|
/>
|
|
142
142
|
</div>
|
|
143
143
|
</div>
|
|
@@ -171,18 +171,6 @@
|
|
|
171
171
|
|
|
172
172
|
</div>
|
|
173
173
|
</div>
|
|
174
|
-
<div class="form-group col-sm-6">
|
|
175
|
-
<label class="col-sm-4 control-label"></label>
|
|
176
|
-
<div class="col-sm-8">
|
|
177
|
-
|
|
178
|
-
</div>
|
|
179
|
-
</div>
|
|
180
|
-
<div class="form-group col-sm-6">
|
|
181
|
-
<label class="col-sm-4 control-label"></label>
|
|
182
|
-
<div class="col-sm-8">
|
|
183
|
-
|
|
184
|
-
</div>
|
|
185
|
-
</div>
|
|
186
174
|
<div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
|
|
187
175
|
<app-qrcode-reader :istype = fmaterialname :index = i v-show="isShow[i]"></app-qrcode-reader>
|
|
188
176
|
</div>
|
|
@@ -223,13 +211,13 @@
|
|
|
223
211
|
showMaterialModal: false,
|
|
224
212
|
materials: [
|
|
225
213
|
{
|
|
226
|
-
material:
|
|
227
|
-
f_material_name:
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
f_material_number:
|
|
231
|
-
|
|
232
|
-
|
|
214
|
+
material:'',
|
|
215
|
+
f_material_name:'',
|
|
216
|
+
f_material_unit:'',
|
|
217
|
+
f_material_price:'',
|
|
218
|
+
f_material_number:'',
|
|
219
|
+
f_material_money:'',
|
|
220
|
+
f_material_remarks:''
|
|
233
221
|
}
|
|
234
222
|
],
|
|
235
223
|
meterialOptions: [],
|
|
@@ -246,7 +234,7 @@
|
|
|
246
234
|
async getOnetoManyData () {
|
|
247
235
|
let http = new HttpResetClass()
|
|
248
236
|
let data = {
|
|
249
|
-
tablename: `
|
|
237
|
+
tablename: `t_material_detail`,
|
|
250
238
|
condition: `f_process_id='${this.selectdata.f_process_id}'`
|
|
251
239
|
}
|
|
252
240
|
let res = await http.load(
|
|
@@ -262,13 +250,13 @@
|
|
|
262
250
|
this.title = '新增'
|
|
263
251
|
this.materials = [
|
|
264
252
|
{
|
|
265
|
-
material:
|
|
266
|
-
f_material_name:
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
f_material_number:
|
|
270
|
-
|
|
271
|
-
|
|
253
|
+
material:'',
|
|
254
|
+
f_material_name:'',
|
|
255
|
+
f_material_unit:'',
|
|
256
|
+
f_material_price:'',
|
|
257
|
+
f_material_number:'',
|
|
258
|
+
f_material_money:'',
|
|
259
|
+
f_material_remarks:''
|
|
272
260
|
}
|
|
273
261
|
],
|
|
274
262
|
this.showMaterialModal = true
|
|
@@ -280,13 +268,13 @@
|
|
|
280
268
|
},
|
|
281
269
|
pushMaterial() {
|
|
282
270
|
this.materials.push({
|
|
283
|
-
material:
|
|
284
|
-
f_material_name:
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
f_material_number:
|
|
288
|
-
|
|
289
|
-
|
|
271
|
+
material:'',
|
|
272
|
+
f_material_name:'',
|
|
273
|
+
f_material_unit:'',
|
|
274
|
+
f_material_price:'',
|
|
275
|
+
f_material_number:'',
|
|
276
|
+
f_material_money:'',
|
|
277
|
+
f_material_remarks:''
|
|
290
278
|
})
|
|
291
279
|
this.isShow.push(false)
|
|
292
280
|
},
|
|
@@ -305,7 +293,7 @@
|
|
|
305
293
|
|
|
306
294
|
this.meterialOptions = res.data.map(item => {
|
|
307
295
|
return {
|
|
308
|
-
'label': `${item.f_material_name}--${item.
|
|
296
|
+
'label': `${item.f_material_name}--${item.f_material_unit}--${item.f_material_price}`,
|
|
309
297
|
'value': item
|
|
310
298
|
}
|
|
311
299
|
})
|
|
@@ -315,10 +303,10 @@
|
|
|
315
303
|
console.log("dddd", this.materials[index].material)
|
|
316
304
|
let material = this.materials[index].material
|
|
317
305
|
this.materials[index].f_material_name = material.f_material_name
|
|
318
|
-
this.materials[index].f_material_style = material.f_material_style
|
|
319
306
|
this.materials[index].f_material_unit = material.f_material_unit
|
|
307
|
+
this.materials[index].f_material_price = material.f_material_price
|
|
320
308
|
this.materials[index].f_material_number = material.f_material_number
|
|
321
|
-
this.materials[index].
|
|
309
|
+
this.materials[index].f_material_money = material.f_material_money
|
|
322
310
|
if (material.f_material_name === "报警器-汉威") {
|
|
323
311
|
this.isShow[index] = true
|
|
324
312
|
} else {
|
|
@@ -330,9 +318,10 @@
|
|
|
330
318
|
async addMaterial() {
|
|
331
319
|
this.title = '新增'
|
|
332
320
|
let data = {
|
|
333
|
-
|
|
321
|
+
selectdata: this.selectdata,
|
|
334
322
|
f_operator_id: Vue.user.id,
|
|
335
323
|
f_operator: Vue.user.name,
|
|
324
|
+
f_department_name:Vue.user.f_department_name,
|
|
336
325
|
f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
|
|
337
326
|
f_orgid: Vue.user.orgid,
|
|
338
327
|
f_orgname: Vue.user.orgs,
|
|
@@ -377,12 +366,12 @@
|
|
|
377
366
|
this.materials = [
|
|
378
367
|
{
|
|
379
368
|
material: '',
|
|
380
|
-
f_material_name:
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
f_material_number:
|
|
384
|
-
|
|
385
|
-
|
|
369
|
+
f_material_name:row.f_material_name,
|
|
370
|
+
f_material_unit:row.f_material_unit,
|
|
371
|
+
f_material_price:row.f_material_price,
|
|
372
|
+
f_material_number:row.f_material_number,
|
|
373
|
+
f_material_money:row.f_material_money,
|
|
374
|
+
f_material_remarks: row.f_material_remarks
|
|
386
375
|
}
|
|
387
376
|
]
|
|
388
377
|
this.showMaterialModal = true
|
|
@@ -390,11 +379,11 @@
|
|
|
390
379
|
async updateConfirm() {
|
|
391
380
|
let data = this.row
|
|
392
381
|
data.f_material_name = this.materials[0].f_material_name
|
|
393
|
-
data.f_material_style = this.materials[0].f_material_style
|
|
394
382
|
data.f_material_unit = this.materials[0].f_material_unit
|
|
383
|
+
data.f_material_price = this.materials[0].f_material_price
|
|
395
384
|
data.f_material_number = this.materials[0].f_material_number
|
|
396
|
-
data.
|
|
397
|
-
data.
|
|
385
|
+
data.f_material_money = this.materials[0].f_material_money
|
|
386
|
+
data.f_material_remarks = this.materials[0].f_material_remarks
|
|
398
387
|
|
|
399
388
|
//报警器流程 设备编号检验
|
|
400
389
|
await this.bjqCheck()
|
|
@@ -405,7 +394,7 @@
|
|
|
405
394
|
let http = new HttpResetClass()
|
|
406
395
|
let res = await http.load(
|
|
407
396
|
'POST',
|
|
408
|
-
`${this.$androidUtil.getProxyUrl()}/rs/entity/
|
|
397
|
+
`${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_detail`,
|
|
409
398
|
data
|
|
410
399
|
)
|
|
411
400
|
this.closeMaterials()
|