safecheck-client 3.0.34-52 → 3.0.34-53
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +1 -1
- package/src/App.vue +31 -31
- package/src/components/rongcheng/AddPlanItem.vue +319 -319
- package/src/components/rongcheng/AspiratedPaperFeedbackm.vue +1045 -1045
- package/src/components/rongcheng/AspiratedPaperMessage.vue +1378 -1378
- package/src/components/rongcheng/AspiratedUserInfo.vue +399 -399
- package/src/components/rongcheng/CheckSearchUser.vue +932 -932
- package/src/components/rongcheng/PaperListNPSQ.vue +455 -455
- package/src/components/rongcheng/PaperListSQ.vue +444 -444
- package/src/components/rongcheng/PaperStatem.vue +419 -419
- package/src/components/rongcheng/PhoneDevicesInfo.vue +248 -248
- package/src/components/rongcheng/PhoneUpUserinfo.vue +1236 -1328
- package/src/components/rongcheng/SafecheckOrderV.vue +2533 -2533
- package/src/components/rongcheng/SafecheckOrderVCli.vue +2641 -2641
- package/src/filiale/bayan/pc/PaperList.vue +900 -899
- package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +20 -5
- package/src/filiale/weinan/pc/CheckDetail.vue +11 -11
- package/src/filiale/weinan/pc/checkUserList.vue +20 -5
- package/src/main.js +2 -2
- package/src/rongcheng.js +316 -316
|
@@ -133,6 +133,18 @@
|
|
|
133
133
|
v-model="model.f_check_end">
|
|
134
134
|
</datepicker>
|
|
135
135
|
</div>
|
|
136
|
+
<div class="form-group col-sm-4" >
|
|
137
|
+
<label class="font_normal_body">入户截止:</label>
|
|
138
|
+
<datepicker
|
|
139
|
+
placeholder='请选择'
|
|
140
|
+
:disabled-days-of-week="[]"
|
|
141
|
+
style="width:60%;text-align: center"
|
|
142
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
143
|
+
:show-rest-button="reset"
|
|
144
|
+
:value.sync="model.f_ruhu_end"
|
|
145
|
+
v-model="model.f_ruhu_end">
|
|
146
|
+
</datepicker>
|
|
147
|
+
</div>
|
|
136
148
|
|
|
137
149
|
</div>
|
|
138
150
|
</div>
|
|
@@ -419,12 +431,15 @@ export default {
|
|
|
419
431
|
this.excelUserCondtion=true
|
|
420
432
|
},
|
|
421
433
|
selfSearch (args) {
|
|
422
|
-
if(args.model.f_last_check_state.length
|
|
434
|
+
if(args.model.f_last_check_state.length == 1 && args.model.f_last_check_state[0] == '入户' && args.model.f_ruhu_end) {
|
|
435
|
+
args.condition += `and DATEADD(YEAR, 2, CAST(ruhuend.f_offsite_time AS datetime)) < '${args.model.f_ruhu_end}'`
|
|
436
|
+
}
|
|
437
|
+
if(args.model.f_last_check_state.length > 0 && Util.isEmpty(args.model.f_ruhu_end) && (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end))) {
|
|
438
|
+
this.$showMessage("选择安检状态时，需要选择安检时间区间！")
|
|
439
|
+
return
|
|
440
|
+
}
|
|
441
|
+
if(args.model.f_last_check_state.length > 0 && Util.isEmpty(args.model.f_ruhu_end)) {
|
|
423
442
|
let zzcon = ''
|
|
424
|
-
if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
|
|
425
|
-
this.$showMessage("选择安检状态时，需要选择安检时间区间！")
|
|
426
|
-
return
|
|
427
|
-
}
|
|
428
443
|
this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
|
429
444
|
for (let i = 0; i < args.model.f_last_check_state.length; i++) {
|
|
430
445
|
if (args.model.f_last_check_state[i] == '未检') {
|
|
@@ -220,42 +220,42 @@ methods:{
|
|
|
220
220
|
//
|
|
221
221
|
if( this.f_state){
|
|
222
222
|
if(this.f_state=='入户'){
|
|
223
|
-
args.condition=args.condition+" and i.f_state='已检' and f_last_check_state='入户'"
|
|
223
|
+
args.condition=args.condition+" and i.f_state='已检' and i.f_last_check_state='入户'"
|
|
224
224
|
}else if(this.f_state=='未入户'){
|
|
225
225
|
if(this.f_noruhu && this.f_noruhu.length==1){
|
|
226
226
|
if(this.f_noruhu[0]=='复访不遇'){
|
|
227
|
-
args.condition += "and i.f_state='已检' and f_last_check_state='到访不遇' and f_check_version > 1 "
|
|
227
|
+
args.condition += "and i.f_state='已检' and i.f_last_check_state='到访不遇' and i.f_check_version > 1 "
|
|
228
228
|
}else{
|
|
229
|
-
args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and f_last_check_state='${this.f_noruhu[0]}'`
|
|
229
|
+
args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and i.f_last_check_state='${this.f_noruhu[0]}'`
|
|
230
230
|
}
|
|
231
231
|
}else if(this.f_noruhu && this.f_noruhu.length==2){
|
|
232
232
|
if(this.f_noruhu.indexOf('未检')!=-1){
|
|
233
233
|
//
|
|
234
234
|
if(this.f_noruhu.indexOf('到访不遇')!=-1){
|
|
235
|
-
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='到访不遇'))"
|
|
235
|
+
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state='到访不遇'))"
|
|
236
236
|
}else if(this.f_noruhu.indexOf('复访不遇')!=-1) {
|
|
237
|
-
args.condition=args.condition + " and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state = '到访不遇' AND f_check_version >2))"
|
|
237
|
+
args.condition=args.condition + " and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state = '到访不遇' AND i.f_check_version >2))"
|
|
238
238
|
}else{
|
|
239
|
-
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='拒检'))"
|
|
239
|
+
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and i.f_last_check_state='拒检'))"
|
|
240
240
|
}
|
|
241
241
|
|
|
242
242
|
}else{
|
|
243
243
|
if(this.f_noruhu.indexOf('复访不遇')!=-1){
|
|
244
244
|
if(this.f_noruhu.indexOf('到访不遇')!=-1){
|
|
245
|
-
args.condition=args.condition + " and (i.f_state='已检' and (f_last_check_state='到访不遇'))"
|
|
245
|
+
args.condition=args.condition + " and (i.f_state='已检' and (i.f_last_check_state='到访不遇'))"
|
|
246
246
|
}else{
|
|
247
|
-
args.condition=args.condition + " and i.f_state='已检' and ((f_last_check_state='到访不遇' and f_check_version >2) or f_last_check_state='拒检' )"
|
|
247
|
+
args.condition=args.condition + " and i.f_state='已检' and ((i.f_last_check_state='到访不遇' and f_check_version >2) or i.f_last_check_state='拒检' )"
|
|
248
248
|
}
|
|
249
249
|
}else{
|
|
250
|
-
args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
|
|
250
|
+
args.condition=args.condition+" and (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检'))"
|
|
251
251
|
}
|
|
252
252
|
}
|
|
253
253
|
}else{
|
|
254
254
|
if(this.f_noruhu.indexOf('未检')!=-1){
|
|
255
|
-
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检')))"
|
|
255
|
+
args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检')))"
|
|
256
256
|
}
|
|
257
257
|
else{
|
|
258
|
-
args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
|
|
258
|
+
args.condition=args.condition+" and (i.f_state='已检' and (i.f_last_check_state='到访不遇' or i.f_last_check_state='拒检'))"
|
|
259
259
|
}
|
|
260
260
|
}
|
|
261
261
|
|
|
@@ -187,6 +187,18 @@
|
|
|
187
187
|
v-model="model.f_check_end">
|
|
188
188
|
</datepicker>
|
|
189
189
|
</div>
|
|
190
|
+
<div class="form-group col-sm-4" >
|
|
191
|
+
<label class="font_normal_body">入户截止:</label>
|
|
192
|
+
<datepicker
|
|
193
|
+
placeholder='请选择'
|
|
194
|
+
:disabled-days-of-week="[]"
|
|
195
|
+
style="width:60%;text-align: center"
|
|
196
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
197
|
+
:show-rest-button="reset"
|
|
198
|
+
:value.sync="model.f_ruhu_end"
|
|
199
|
+
v-model="model.f_ruhu_end">
|
|
200
|
+
</datepicker>
|
|
201
|
+
</div>
|
|
190
202
|
|
|
191
203
|
</div>
|
|
192
204
|
</div>
|
|
@@ -387,11 +399,14 @@
|
|
|
387
399
|
this.excelUserCondtion=true
|
|
388
400
|
},
|
|
389
401
|
selfSearch (args) {
|
|
390
|
-
if(args.model.f_last_check_state) {
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
402
|
+
if( args.model.f_last_check_state == '入户' && args.model.f_ruhu_end) {
|
|
403
|
+
args.condition += `and DATEADD(YEAR, 2, CAST(ruhuend.f_offsite_time AS datetime)) < '${args.model.f_ruhu_end}'`
|
|
404
|
+
}
|
|
405
|
+
if(args.model.f_last_check_state && Util.isEmpty(args.model.f_ruhu_end) && (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end))) {
|
|
406
|
+
this.$showMessage("选择安检状态时，需要选择安检时间区间！")
|
|
407
|
+
return
|
|
408
|
+
}
|
|
409
|
+
if(args.model.f_last_check_state && Util.isEmpty(args.model.f_ruhu_end)) {
|
|
395
410
|
this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
|
396
411
|
if (args.model.f_last_check_state == '未检') {
|
|
397
412
|
args.condition += ' and tcp.ruhu is null '
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import App from './App'
|
|
3
3
|
import { all } from 'vue-client'
|
|
4
4
|
import { system } from 'system-clients'
|
|
5
|
-
import safecheck from './
|
|
5
|
+
import safecheck from './safecheck'
|
|
6
6
|
import echarts from 'echarts'
|
|
7
7
|
// import safecheck from './rongcheng'
|
|
8
8
|
|
|
@@ -11,7 +11,7 @@ all()
|
|
|
11
11
|
var Verificationfalg = false
|
|
12
12
|
system(Verificationfalg)
|
|
13
13
|
// system()
|
|
14
|
-
safecheck()
|
|
14
|
+
safecheck('bayan')
|
|
15
15
|
// safecheck('rizhao')
|
|
16
16
|
require('./bootstrap/less/bootstrap.less')
|
|
17
17
|
require('./expandcss.less')
|