safecheck-client 4.0.0-50 → 4.0.0-53
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 +1 -1
- package/src/components/android/AndroidDefectDetails.vue +416 -324
- package/src/components/android/SafecheckDevices.vue +1 -0
- package/src/filiale/meihekou/android/CheckPlanList.vue +1 -1
- package/src/filiale/meihekou/android/CheckPlanListArea.vue +1 -1
- package/src/filiale/meihekou/android/SafecheckOrderV.vue +1 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "safecheck-client",
|
|
3
3
|
"//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
|
|
4
|
-
"version": "4.0.0-
|
|
4
|
+
"version": "4.0.0-53",
|
|
5
5
|
"description": "安检模块 前端组件",
|
|
6
6
|
"author": "丁新 <417755458@qq.com>",
|
|
7
7
|
"license": "ISC",
|
|
@@ -1,95 +1,95 @@
|
|
|
1
1
|
<style scoped>
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
.bg {
|
|
3
|
+
background-color: blue;
|
|
4
|
+
height: 1px;
|
|
5
|
+
border: 0;
|
|
6
|
+
}
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
.app-row {
|
|
9
|
+
background-color: white;
|
|
10
|
+
padding: 10px 10px 0 10px;
|
|
11
|
+
border-bottom: 1px solid rgba(235, 235, 235, 0.5);
|
|
12
|
+
}
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
.search_input {
|
|
15
|
+
border: 0;
|
|
16
|
+
outline: none;
|
|
17
|
+
}
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
.font {
|
|
20
|
+
font: 15px PingFang-SC-Medium;
|
|
21
|
+
color: #666666;
|
|
22
|
+
}
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
.input-font {
|
|
25
|
+
font: 15px PingFang-SC-Medium;
|
|
26
|
+
color: #333333;
|
|
27
|
+
}
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
29
|
+
.btn-font {
|
|
30
|
+
font: 600 16px PingFang-SC-Bold;
|
|
31
|
+
color: #499EDF;
|
|
32
|
+
}
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
.btn-color {
|
|
35
|
+
background-color: #FFFFFF;
|
|
36
|
+
border-radius: 10px;
|
|
37
|
+
border: 1px solid #499EDF;
|
|
38
|
+
}
|
|
39
39
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
.app-text {
|
|
41
|
+
font-size: 12px;
|
|
42
|
+
}
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
.panel-self {
|
|
45
|
+
border-radius: 10px;
|
|
46
|
+
border: 1px solid #499EDF;
|
|
47
|
+
background-color: #F8F8F8;
|
|
48
|
+
}
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
.yybtn-color {
|
|
51
|
+
background-color: #499edf;
|
|
52
|
+
border-radius: 4px;
|
|
53
|
+
border: 1px solid #499EDF;
|
|
54
|
+
color: #FFFFFF;
|
|
55
|
+
font: 14px PingFang-SC-Bold;
|
|
56
|
+
}
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
58
|
+
.qxbtn-color {
|
|
59
|
+
background-color: #FFFFFF;
|
|
60
|
+
border-radius: 4px;
|
|
61
|
+
color: #499edf;
|
|
62
|
+
font: 14px PingFang-SC-Bold;
|
|
63
|
+
border: 1px solid #499EDF;
|
|
64
|
+
}
|
|
65
65
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
66
|
+
.button_shrink_top {
|
|
67
|
+
width: 35px;
|
|
68
|
+
height: 35px;
|
|
69
|
+
background-size: 100%;
|
|
70
|
+
background-image: url("../../../static/newStyle/stretch_top.png")
|
|
71
|
+
}
|
|
72
72
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
73
|
+
.button_shrink_bottom {
|
|
74
|
+
width: 35px;
|
|
75
|
+
height: 35px;
|
|
76
|
+
background-size: 100%;
|
|
77
|
+
background-image: url("../../../static/newStyle/stretch_bottom.png")
|
|
78
|
+
}
|
|
79
79
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
80
|
+
.button_shrink_left {
|
|
81
|
+
width: 35px;
|
|
82
|
+
height: 35px;
|
|
83
|
+
background-size: 100%;
|
|
84
|
+
background-image: url("../../../static/newStyle/stretch_left.png")
|
|
85
|
+
}
|
|
86
86
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
87
|
+
.button_shrink_right {
|
|
88
|
+
width: 35px;
|
|
89
|
+
height: 35px;
|
|
90
|
+
background-size: 100%;
|
|
91
|
+
background-image: url("../../../static/newStyle/stretch_right.png")
|
|
92
|
+
}
|
|
93
93
|
</style>
|
|
94
94
|
<template>
|
|
95
95
|
<div style="height: auto;width: 100%">
|
|
@@ -178,6 +178,60 @@
|
|
|
178
178
|
v-model="model.f_user_type" condition="f_user_type = '{}'" close-on-select
|
|
179
179
|
clear-button></v-select>
|
|
180
180
|
</div>
|
|
181
|
+
|
|
182
|
+
<div class="row app-row">
|
|
183
|
+
<div class="col-xs-4">
|
|
184
|
+
<img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
185
|
+
<label class="font text-left">处理人：</label>
|
|
186
|
+
</div>
|
|
187
|
+
<div class="col-xs-8">
|
|
188
|
+
<input class="search_input input-font"
|
|
189
|
+
v-model=model.f_repairman condition="f_repairman like '%{}%'"/>
|
|
190
|
+
</div>
|
|
191
|
+
</div>
|
|
192
|
+
<div class="row app-row">
|
|
193
|
+
<div class="col-xs-4">
|
|
194
|
+
<img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
195
|
+
<label class="font text-left">处理时间：</label>
|
|
196
|
+
</div>
|
|
197
|
+
<div class="col-xs-8">
|
|
198
|
+
<datepicker id="startDate" placeholder="处理开始日期"
|
|
199
|
+
style="width: 60%!important;"
|
|
200
|
+
v-model="model.sq_startDate"
|
|
201
|
+
:value.sync="model.sq_startDate"
|
|
202
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
|
203
|
+
:show-reset-button="true"
|
|
204
|
+
condition="f_repair_date >= '{}'">
|
|
205
|
+
</datepicker>
|
|
206
|
+
</div>
|
|
207
|
+
</div>
|
|
208
|
+
<div class="row app-row">
|
|
209
|
+
<div class="col-xs-4">
|
|
210
|
+
<img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
211
|
+
<label class="font text-left">处理时间：</label>
|
|
212
|
+
</div>
|
|
213
|
+
<div class="col-xs-8">
|
|
214
|
+
<datepicker id="endDate" placeholder="处理结束日期"
|
|
215
|
+
style="width: 60%!important;"
|
|
216
|
+
v-model="model.sq_endDate"
|
|
217
|
+
:value.sync="model.sq_endDate"
|
|
218
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
219
|
+
:show-reset-button="true"
|
|
220
|
+
condition="f_repair_date<= '{}'">
|
|
221
|
+
</datepicker>
|
|
222
|
+
</div>
|
|
223
|
+
</div>
|
|
224
|
+
<div class="row app-row">
|
|
225
|
+
<div class="col-xs-4">
|
|
226
|
+
<img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
|
|
227
|
+
<label class="font text-left">处理状态：</label>
|
|
228
|
+
</div>
|
|
229
|
+
<div class="col-xs-8">
|
|
230
|
+
<v-select :value.sync="model.is_repair" class="input-font"
|
|
231
|
+
:options='$parent.$parent.is_repairs' placeholder='处理状态' :value-single="true"
|
|
232
|
+
v-model="is_repair" close-on-select clear-button></v-select>
|
|
233
|
+
</div>
|
|
234
|
+
</div>
|
|
181
235
|
<div class="row text-center" style="margin-top: 20px;">
|
|
182
236
|
<button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
|
|
183
237
|
@click="$parent.$parent.selfSearch">查询
|
|
@@ -231,6 +285,18 @@
|
|
|
231
285
|
<p class="panel-title col-xs-5 text-left font"><b>隐患原因:</b></p>
|
|
232
286
|
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_value }}</p>
|
|
233
287
|
</div>
|
|
288
|
+
<div class="col-xs-12">
|
|
289
|
+
<p class="panel-title col-xs-5 text-left font"><b>处理人:</b></p>
|
|
290
|
+
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_repairman }}</p>
|
|
291
|
+
</div>
|
|
292
|
+
<div class="col-xs-12">
|
|
293
|
+
<p class="panel-title col-xs-5 text-left font"><b>处理时间:</b></p>
|
|
294
|
+
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_repair_date }}</p>
|
|
295
|
+
</div>
|
|
296
|
+
<div class="col-xs-12">
|
|
297
|
+
<p class="panel-title col-xs-5 text-left font"><b>处理状态:</b></p>
|
|
298
|
+
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_repair_date == '****-**-** **:**:**' ? '未处理' : '已处理' }}</p>
|
|
299
|
+
</div>
|
|
234
300
|
<div class="col-xs-12">
|
|
235
301
|
<p class="panel-title col-xs-5 text-left font"><b>备注:</b></p>
|
|
236
302
|
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_comments }}</p>
|
|
@@ -240,10 +306,10 @@
|
|
|
240
306
|
style="background-color:#499edf;float: right"
|
|
241
307
|
@click="$parent.$parent.$parent.openshowModal(row)">查看
|
|
242
308
|
</button>
|
|
243
|
-
<!-- <button type="button" name="button" class="btn btn-primary"-->
|
|
244
|
-
<!-- style="background-color:#499edf;float: right;margin-right:10px;"-->
|
|
245
|
-
<!-- @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
|
|
246
|
-
<!-- </button>-->
|
|
309
|
+
<!-- <button type="button" name="button" class="btn btn-primary"-->
|
|
310
|
+
<!-- style="background-color:#499edf;float: right;margin-right:10px;"-->
|
|
311
|
+
<!-- @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
|
|
312
|
+
<!-- </button>-->
|
|
247
313
|
<!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
|
|
248
314
|
</div>
|
|
249
315
|
</div>
|
|
@@ -363,271 +429,297 @@
|
|
|
363
429
|
</template>
|
|
364
430
|
|
|
365
431
|
<script>
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
432
|
+
import Vue from 'vue'
|
|
433
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
434
|
+
import * as Util from '../Util'
|
|
369
435
|
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
436
|
+
export default {
|
|
437
|
+
title: '隐患明细',
|
|
438
|
+
data() {
|
|
439
|
+
return {
|
|
440
|
+
row:{},
|
|
441
|
+
is_repairs:[{label: '请选择', value: ''},
|
|
442
|
+
{label: '已处理', value: '已处理'},
|
|
443
|
+
{label: '未处理', value: '未处理'}],
|
|
444
|
+
showModal: false,
|
|
445
|
+
showModal1: false,
|
|
446
|
+
showimg: '',
|
|
447
|
+
deal: {
|
|
448
|
+
result: {},
|
|
449
|
+
f_deal_path: '',
|
|
450
|
+
f_other_dealpath1: '',
|
|
451
|
+
f_other_dealpath2: '',
|
|
452
|
+
f_deal_remark: '',
|
|
453
|
+
f_dealsign_path: '', //签名
|
|
454
|
+
f_dealer: Vue.user.name,
|
|
455
|
+
f_dealer_id: Vue.user.id
|
|
456
|
+
},
|
|
457
|
+
user_types: [
|
|
458
|
+
{label: '请选择用户类型', value: ''},
|
|
459
|
+
{label: '民用', value: '民用'},
|
|
460
|
+
{label: '非民用', value: '非民用'}
|
|
461
|
+
],
|
|
462
|
+
f_filialeids: '',
|
|
463
|
+
model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/defectDetails`, 20, {
|
|
464
|
+
condition: 'this.condition',
|
|
465
|
+
f_filialeids: `('${Vue.user.orgid}')`,
|
|
466
|
+
f_checker_id: `'${Vue.user.id}'`
|
|
467
|
+
}),
|
|
468
|
+
criteriaShow: false,
|
|
469
|
+
isNeedDealSign: this.$appdata.getSingleValue('隐患处理是否需要签名') == 'true',
|
|
470
|
+
isCancelLimitGas: this.$appdata.getSingleValue('隐患处理-取消限制购气') == '是',
|
|
471
|
+
deletebacklistisselect: false
|
|
472
|
+
}
|
|
473
|
+
},
|
|
474
|
+
ready() {
|
|
475
|
+
this.selfSearch()
|
|
476
|
+
},
|
|
477
|
+
methods: {
|
|
478
|
+
async deletebacklist() {
|
|
479
|
+
////tag)
|
|
480
|
+
let http = new HttpResetClass()
|
|
481
|
+
////tag
|
|
482
|
+
let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
|
|
483
|
+
data: {
|
|
484
|
+
items: "*",
|
|
485
|
+
tablename: "t_userinfo",
|
|
486
|
+
condition: `f_userinfo_code = ${this.deal.result.f_userinfo_code}`,
|
|
487
|
+
orderitem: "f_userinfo_code"
|
|
488
|
+
}
|
|
489
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
490
|
+
////tag)
|
|
491
|
+
////tag
|
|
492
|
+
let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
|
|
493
|
+
data: {
|
|
494
|
+
"f_operat_type": "取消拉黑",
|
|
495
|
+
"f_state": "有效",
|
|
496
|
+
"f_user_name": this.deal.result.f_user_name,
|
|
497
|
+
"f_comments": '',
|
|
498
|
+
"f_operator": Vue.user.name,
|
|
499
|
+
"f_operatorid": Vue.user.id,
|
|
500
|
+
"f_orgid": Vue.user.orgid,
|
|
501
|
+
"f_orgname": Vue.user.orgs,
|
|
502
|
+
"f_depid": Vue.user.depids,
|
|
503
|
+
"f_depname": Vue.user.deps,
|
|
504
|
+
"f_describe": `${Vue.user.name}对用户${this.deal.result.f_user_name}进行取消拉黑`,
|
|
505
|
+
"f_userinfo_id": {
|
|
506
|
+
"f_userinfo_id": res1.data[0].f_userinfo_id,
|
|
507
|
+
"f_user_state": "正常",
|
|
508
|
+
"version": res1.data[0].version
|
|
509
|
+
},
|
|
510
|
+
"f_limit_times":"",
|
|
511
|
+
"f_limit_value":""
|
|
512
|
+
}
|
|
513
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
514
|
+
},
|
|
515
|
+
// 签名回调
|
|
516
|
+
signCallback(prop, fileName) {
|
|
517
|
+
console.log("签名回调地址" + fileName)
|
|
518
|
+
// HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
|
|
519
|
+
HostApp.__this__.$set('deal.f_dealsign_path', fileName)
|
|
520
|
+
HostApp.__callback__ = null
|
|
521
|
+
HostApp.__this__ = null
|
|
522
|
+
},
|
|
523
|
+
// 用户签名
|
|
524
|
+
sign() {
|
|
525
|
+
if (!this.deal.f_deal_path) {
|
|
526
|
+
this.$showMessage('请先拍摄处理后照片!!!')
|
|
527
|
+
return
|
|
528
|
+
}
|
|
529
|
+
this.delAudioFile('f_dealsign_path', this.deal.f_dealsign_path)
|
|
530
|
+
let prop = 'f_dealsign_path'
|
|
531
|
+
let idx = 'aofeng'
|
|
532
|
+
let fileName
|
|
533
|
+
if (!this.deal.f_dealsign_path) {
|
|
534
|
+
fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
|
|
535
|
+
} else {
|
|
536
|
+
fileName = Util.getFileName(this.deal.f_dealsign_path)
|
|
403
537
|
}
|
|
538
|
+
HostApp.__callback__ = this.signCallback
|
|
539
|
+
HostApp.__this__ = this
|
|
540
|
+
HostApp.getSignature({
|
|
541
|
+
file: fileName,
|
|
542
|
+
requestCode: 111,
|
|
543
|
+
callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
|
|
544
|
+
})
|
|
404
545
|
},
|
|
405
|
-
|
|
406
|
-
|
|
546
|
+
delAudioFile(prop, fileName) {
|
|
547
|
+
if (!fileName)
|
|
548
|
+
return
|
|
549
|
+
else {
|
|
550
|
+
HostApp.delfile(fileName)
|
|
551
|
+
this.deal[prop] = null
|
|
552
|
+
}
|
|
407
553
|
},
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
"f_userinfo_id": res1.data[0].f_userinfo_id,
|
|
438
|
-
"f_user_state": "正常",
|
|
439
|
-
"version": res1.data[0].version
|
|
440
|
-
},
|
|
441
|
-
"f_limit_times":"",
|
|
442
|
-
"f_limit_value":""
|
|
443
|
-
}
|
|
444
|
-
}, {resolveMsg: null, rejectMsg: null})
|
|
445
|
-
},
|
|
446
|
-
// 签名回调
|
|
447
|
-
signCallback(prop, fileName) {
|
|
448
|
-
console.log("签名回调地址" + fileName)
|
|
449
|
-
// HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
|
|
450
|
-
HostApp.__this__.$set('deal.f_dealsign_path', fileName)
|
|
451
|
-
HostApp.__callback__ = null
|
|
452
|
-
HostApp.__this__ = null
|
|
453
|
-
},
|
|
454
|
-
// 用户签名
|
|
455
|
-
sign() {
|
|
456
|
-
if (!this.deal.f_deal_path) {
|
|
457
|
-
this.$showMessage('请先拍摄处理后照片!!!')
|
|
458
|
-
return
|
|
459
|
-
}
|
|
460
|
-
this.delAudioFile('f_dealsign_path', this.deal.f_dealsign_path)
|
|
461
|
-
let prop = 'f_dealsign_path'
|
|
462
|
-
let idx = 'aofeng'
|
|
463
|
-
let fileName
|
|
464
|
-
if (!this.deal.f_dealsign_path) {
|
|
465
|
-
fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
|
|
554
|
+
commitDealDefect() {
|
|
555
|
+
//tag
|
|
556
|
+
//tag)
|
|
557
|
+
// if (!this.deal.f_deal_path) {
|
|
558
|
+
// this.$showMessage('处理后照片必须上传')
|
|
559
|
+
// return
|
|
560
|
+
// }
|
|
561
|
+
if (this.isNeedDealSign && !this.deal.f_dealsign_path) {
|
|
562
|
+
this.$showMessage('签名必须上传')
|
|
563
|
+
return
|
|
564
|
+
}
|
|
565
|
+
if (this.deletebacklistisselect){
|
|
566
|
+
this.deletebacklist()
|
|
567
|
+
}
|
|
568
|
+
this.deal.f_other_dealpath = this.deal.f_deal_path
|
|
569
|
+
HostApp.__this__ = this
|
|
570
|
+
HostApp.logicWithHint({
|
|
571
|
+
'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
|
|
572
|
+
'data': this.deal, 'backresult': 1
|
|
573
|
+
})
|
|
574
|
+
},
|
|
575
|
+
commitCallBack(jo) {
|
|
576
|
+
//tag
|
|
577
|
+
//tag)
|
|
578
|
+
if (jo.state == 'ok') {
|
|
579
|
+
let ress = JSON.parse(jo.result)
|
|
580
|
+
if (ress.code == 200) {
|
|
581
|
+
this.$showMessage(ress.msg)
|
|
582
|
+
this.closeshowModal1()
|
|
466
583
|
} else {
|
|
467
|
-
|
|
584
|
+
this.$showMessage(ress.msg)
|
|
468
585
|
}
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
586
|
+
} else {
|
|
587
|
+
this.$showMessage('本地服务调用失败')
|
|
588
|
+
}
|
|
589
|
+
},
|
|
590
|
+
delfile(prop, fileName) {
|
|
591
|
+
if (fileName == Vue.nopic)
|
|
592
|
+
return
|
|
593
|
+
else {
|
|
594
|
+
HostApp.delfile(fileName)
|
|
595
|
+
this.deal[prop] = Vue.nopic
|
|
596
|
+
}
|
|
597
|
+
},
|
|
598
|
+
openshowModal(val) {
|
|
599
|
+
this.row = val
|
|
600
|
+
this.showModal = true
|
|
601
|
+
},
|
|
602
|
+
closeshowModal() {
|
|
603
|
+
this.showimg = ''
|
|
604
|
+
this.showModal = false
|
|
605
|
+
},
|
|
606
|
+
openshowModal1(val) {
|
|
607
|
+
this.deal.result = val
|
|
608
|
+
//tag
|
|
609
|
+
//tag
|
|
610
|
+
this.deletebacklistisselect = false
|
|
611
|
+
this.showModal1 = true
|
|
612
|
+
},
|
|
613
|
+
closeshowModal1() {
|
|
614
|
+
this.deal = {
|
|
615
|
+
result: {},
|
|
616
|
+
f_deal_path: '',
|
|
617
|
+
f_other_dealpath1: '',
|
|
618
|
+
f_other_dealpath2: '',
|
|
619
|
+
f_deal_remark: '',
|
|
620
|
+
f_dealsign_path: '', //签名
|
|
621
|
+
f_dealer: Vue.user.name,
|
|
622
|
+
f_dealer_id: Vue.user.id
|
|
623
|
+
}
|
|
624
|
+
this.showModal1 = false
|
|
625
|
+
this.selfSearch()
|
|
626
|
+
},
|
|
627
|
+
cameraCallBack(prop, fileName) {
|
|
628
|
+
HostApp.__this__.$set( 'deal.'+prop+'', fileName)
|
|
629
|
+
HostApp.__callback__ = null
|
|
630
|
+
HostApp.__this__ = null
|
|
631
|
+
},
|
|
632
|
+
takePic(prop, title) {
|
|
633
|
+
HostApp.__callback__ = this.cameraCallBack
|
|
634
|
+
HostApp.__this__ = this
|
|
635
|
+
let fileName
|
|
636
|
+
if (!this.deal[prop] || this.deal[prop].includes("nopic.png")) {
|
|
637
|
+
fileName = Util.guid() + '-' + prop + '.jpg'
|
|
638
|
+
} else {
|
|
639
|
+
fileName = Util.getFileName(this.deal[prop])
|
|
640
|
+
}
|
|
641
|
+
//tag
|
|
642
|
+
//tag
|
|
643
|
+
HostApp._open_a_page({
|
|
644
|
+
type: 'boomerang',
|
|
645
|
+
page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
|
|
646
|
+
param: {
|
|
472
647
|
file: fileName,
|
|
473
648
|
requestCode: 111,
|
|
474
|
-
callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
|
|
475
|
-
|
|
476
|
-
},
|
|
477
|
-
delAudioFile(prop, fileName) {
|
|
478
|
-
if (!fileName)
|
|
479
|
-
return
|
|
480
|
-
else {
|
|
481
|
-
HostApp.delfile(fileName)
|
|
482
|
-
this.deal[prop] = null
|
|
483
|
-
}
|
|
484
|
-
},
|
|
485
|
-
commitDealDefect() {
|
|
486
|
-
//tag
|
|
487
|
-
//tag)
|
|
488
|
-
// if (!this.deal.f_deal_path) {
|
|
489
|
-
// this.$showMessage('处理后照片必须上传')
|
|
490
|
-
// return
|
|
491
|
-
// }
|
|
492
|
-
if (this.isNeedDealSign && !this.deal.f_dealsign_path) {
|
|
493
|
-
this.$showMessage('签名必须上传')
|
|
494
|
-
return
|
|
649
|
+
callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
|
|
650
|
+
watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
|
|
495
651
|
}
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
'
|
|
504
|
-
})
|
|
505
|
-
},
|
|
506
|
-
commitCallBack(jo) {
|
|
507
|
-
//tag
|
|
508
|
-
//tag)
|
|
509
|
-
if (jo.state == 'ok') {
|
|
510
|
-
let ress = JSON.parse(jo.result)
|
|
511
|
-
if (ress.code == 200) {
|
|
512
|
-
this.$showMessage(ress.msg)
|
|
513
|
-
this.closeshowModal1()
|
|
514
|
-
} else {
|
|
515
|
-
this.$showMessage(ress.msg)
|
|
516
|
-
}
|
|
517
|
-
} else {
|
|
518
|
-
this.$showMessage('本地服务调用失败')
|
|
652
|
+
})
|
|
653
|
+
},
|
|
654
|
+
selfSearch() {
|
|
655
|
+
|
|
656
|
+
let condition = "1=1 "
|
|
657
|
+
if (this.$refs.paged.$refs.cri.model.f_user_name) {
|
|
658
|
+
if (this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()) {
|
|
659
|
+
condition += " and f_user_name like '" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
|
|
519
660
|
}
|
|
520
|
-
}
|
|
521
|
-
|
|
522
|
-
if (
|
|
523
|
-
|
|
524
|
-
else {
|
|
525
|
-
HostApp.delfile(fileName)
|
|
526
|
-
this.deal[prop] = Vue.nopic
|
|
661
|
+
}
|
|
662
|
+
if (this.$refs.paged.$refs.cri.model.f_userinfo_code) {
|
|
663
|
+
if (this.$refs.paged.$refs.cri.model.f_userinfo_code.toString().trim()) {
|
|
664
|
+
condition += " and f_userinfo_code = '" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "'"
|
|
527
665
|
}
|
|
528
|
-
}
|
|
529
|
-
|
|
530
|
-
this.
|
|
531
|
-
|
|
532
|
-
},
|
|
533
|
-
closeshowModal() {
|
|
534
|
-
this.showimg = ''
|
|
535
|
-
this.showModal = false
|
|
536
|
-
},
|
|
537
|
-
openshowModal1(val) {
|
|
538
|
-
this.deal.result = val
|
|
539
|
-
//tag
|
|
540
|
-
//tag
|
|
541
|
-
this.deletebacklistisselect = false
|
|
542
|
-
this.showModal1 = true
|
|
543
|
-
},
|
|
544
|
-
closeshowModal1() {
|
|
545
|
-
this.deal = {
|
|
546
|
-
result: {},
|
|
547
|
-
f_deal_path: '',
|
|
548
|
-
f_other_dealpath1: '',
|
|
549
|
-
f_other_dealpath2: '',
|
|
550
|
-
f_deal_remark: '',
|
|
551
|
-
f_dealsign_path: '', //签名
|
|
552
|
-
f_dealer: Vue.user.name,
|
|
553
|
-
f_dealer_id: Vue.user.id
|
|
666
|
+
}
|
|
667
|
+
if (this.$refs.paged.$refs.cri.model.f_checker_name) {
|
|
668
|
+
if (this.$refs.paged.$refs.cri.model.f_checker_name.toString().trim()) {
|
|
669
|
+
condition += " and f_checker_name = '" + this.$refs.paged.$refs.cri.model.f_checker_name + "'"
|
|
554
670
|
}
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
HostApp.__this__.$set( 'deal.'+prop+'', fileName)
|
|
560
|
-
HostApp.__callback__ = null
|
|
561
|
-
HostApp.__this__ = null
|
|
562
|
-
},
|
|
563
|
-
takePic(prop, title) {
|
|
564
|
-
HostApp.__callback__ = this.cameraCallBack
|
|
565
|
-
HostApp.__this__ = this
|
|
566
|
-
let fileName
|
|
567
|
-
if (!this.deal[prop] || this.deal[prop].includes("nopic.png")) {
|
|
568
|
-
fileName = Util.guid() + '-' + prop + '.jpg'
|
|
569
|
-
} else {
|
|
570
|
-
fileName = Util.getFileName(this.deal[prop])
|
|
671
|
+
}
|
|
672
|
+
if (this.$refs.paged.$refs.cri.model.f_address) {
|
|
673
|
+
if (this.$refs.paged.$refs.cri.model.f_address.toString().trim()) {
|
|
674
|
+
condition += " and f_address like '%" + this.$refs.paged.$refs.cri.model.f_address + "%'"
|
|
571
675
|
}
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
|
|
577
|
-
param: {
|
|
578
|
-
file: fileName,
|
|
579
|
-
requestCode: 111,
|
|
580
|
-
callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
|
|
581
|
-
watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
|
|
582
|
-
}
|
|
583
|
-
})
|
|
584
|
-
},
|
|
585
|
-
selfSearch() {
|
|
586
|
-
|
|
587
|
-
let condition = "1=1 "
|
|
588
|
-
if (this.$refs.paged.$refs.cri.model.f_user_name) {
|
|
589
|
-
if (this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()) {
|
|
590
|
-
condition += " and f_user_name like '" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
|
|
591
|
-
}
|
|
676
|
+
}
|
|
677
|
+
if (this.$refs.paged.$refs.cri.model.f_start_date) {
|
|
678
|
+
if (this.$refs.paged.$refs.cri.model.f_start_date.toString().trim()) {
|
|
679
|
+
condition += " and f_offsite_time > '" + this.$refs.paged.$refs.cri.model.f_start_date + "'"
|
|
592
680
|
}
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
681
|
+
}
|
|
682
|
+
if (this.$refs.paged.$refs.cri.model.f_end_date) {
|
|
683
|
+
if (this.$refs.paged.$refs.cri.model.f_end_date.toString().trim()) {
|
|
684
|
+
condition += " and f_offsite_time < '" + this.$refs.paged.$refs.cri.model.f_end_date + "'"
|
|
597
685
|
}
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
686
|
+
}
|
|
687
|
+
if (this.$refs.paged.$refs.cri.model.f_user_type) {
|
|
688
|
+
if (this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()) {
|
|
689
|
+
condition += " and f_check_type = '" + this.$refs.paged.$refs.cri.model.f_user_type + "'"
|
|
602
690
|
}
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
691
|
+
}
|
|
692
|
+
if (this.$refs.paged.$refs.cri.model.f_repairman) {
|
|
693
|
+
if (this.$refs.paged.$refs.cri.model.f_repairman.toString().trim()) {
|
|
694
|
+
condition += " and f_repairman like '%" + this.$refs.paged.$refs.cri.model.f_repairman + "%'"
|
|
607
695
|
}
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
696
|
+
}
|
|
697
|
+
if (this.$refs.paged.$refs.cri.model.sq_endDate) {
|
|
698
|
+
if (this.$refs.paged.$refs.cri.model.sq_endDate.toString().trim()) {
|
|
699
|
+
condition += " and f_repair_date <= '" + this.$refs.paged.$refs.cri.model.sq_endDate + "'"
|
|
612
700
|
}
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
701
|
+
}
|
|
702
|
+
if (this.$refs.paged.$refs.cri.model.sq_startDate) {
|
|
703
|
+
if (this.$refs.paged.$refs.cri.model.sq_startDate.toString().trim()) {
|
|
704
|
+
condition += " and f_repair_date >= '" + this.$refs.paged.$refs.cri.model.sq_startDate + "'"
|
|
617
705
|
}
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
706
|
+
}
|
|
707
|
+
if (this.$refs.paged.$refs.cri.model.is_repair) {
|
|
708
|
+
if (this.$refs.paged.$refs.cri.model.is_repair == '已处理') {
|
|
709
|
+
condition += " and f_repair_date != '****-**-** **:**:**'"
|
|
710
|
+
}else if (this.$refs.paged.$refs.cri.model.is_repair == '未处理'){
|
|
711
|
+
condition += " and f_repair_date = '****-**-** **:**:**'"
|
|
622
712
|
}
|
|
713
|
+
}
|
|
623
714
|
|
|
624
|
-
//tag
|
|
625
|
-
this.model.search(condition)
|
|
626
|
-
},
|
|
627
715
|
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
716
|
+
//tag
|
|
717
|
+
this.model.search(condition)
|
|
718
|
+
},
|
|
719
|
+
|
|
720
|
+
hidden() {
|
|
721
|
+
this.criteriaShow = !this.criteriaShow
|
|
631
722
|
}
|
|
632
723
|
}
|
|
724
|
+
}
|
|
633
725
|
</script>
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
</p>
|
|
107
107
|
</div>
|
|
108
108
|
<div class="col-xs-6">
|
|
109
|
-
<p class="panel-title col-xs-5 text-left font"><b
|
|
109
|
+
<p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
|
|
110
110
|
<p class="panel-title col-xs-7 text-left input-font">{{ row.jujian }}
|
|
111
111
|
</p>
|
|
112
112
|
</div>
|
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
</p>
|
|
114
114
|
</div>
|
|
115
115
|
<div class="col-xs-6">
|
|
116
|
-
<p class="panel-title col-xs-5 text-left font"><b
|
|
116
|
+
<p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
|
|
117
117
|
<p class="panel-title col-xs-7 text-left input-font">{{ row.jujian }}
|
|
118
118
|
</p>
|
|
119
119
|
</div>
|
|
@@ -319,7 +319,7 @@
|
|
|
319
319
|
computed: {
|
|
320
320
|
actionEnabled: {
|
|
321
321
|
get() {
|
|
322
|
-
return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '
|
|
322
|
+
return (this.role == 'inspect' && (this.item.f_last_check_state == '到访不遇' || this.item.f_last_check_state == '拒检' || this.item.f_approved == '不通过' )) || (this.role == 'inspect' && this.item.f_state !='已检' && this.item.f_complete !='已完成' && this.item.f_complete !='已传' )
|
|
323
323
|
}
|
|
324
324
|
}
|
|
325
325
|
},
|