safecheck-client 3.0.34-45 → 3.0.34-48
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +1 -1
- package/src/components/android/QRCode/QRCodeBinding.vue +290 -290
- package/src/components/android/QRCode/QRCodePage.vue +212 -212
- package/src/components/rongcheng/AddPlanItem.vue +319 -315
- 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 -906
- 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 -233
- package/src/components/rongcheng/PhoneUpUserinfo.vue +1328 -1328
- package/src/components/rongcheng/SafecheckOrderV.vue +2533 -2524
- package/src/components/rongcheng/SafecheckOrderVCli.vue +2641 -2632
- package/src/filiale/tongchuan/pc/PaperDefectMain.vue +1 -1
- package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +57 -59
- package/src/filiale/weinan/pc/checkUserList.vue +34 -113
- package/src/main.js +33 -33
- package/src/rongcheng.js +316 -316
@@ -653,7 +653,7 @@
|
|
653
653
|
}
|
654
654
|
defectIdStr = `(${defectIds.join(',')})`
|
655
655
|
let http = new HttpResetClass()
|
656
|
-
let sql = `update t_devices_items set f_deal_dispose = '自行整改'
|
656
|
+
let sql = `update t_devices_items set f_deal_dispose = '自行整改' where id in ${defectIdStr}`
|
657
657
|
http.load('POST', 'rs/logic/runSQL', { data: { sql: sql } },
|
658
658
|
{ resolveMsg: null, rejectMsg: null }).then(()=>{
|
659
659
|
this.showModal3 = false
|
@@ -56,6 +56,10 @@
|
|
56
56
|
</div>
|
57
57
|
<div class="form-group col-sm-4" >
|
58
58
|
<button class="button_new" style="margin-right: 10px" @click="$parent.$parent.showUserCondition()">更多条件</button>
|
59
|
+
<export-excel-safe :data="$parent.$parent.searchData"
|
60
|
+
:field="$parent.$parent.excelHeaders"
|
61
|
+
:choose-col="true"
|
62
|
+
sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ" template-name='安检筛选用户信息导出'></export-excel-safe>
|
59
63
|
<button class="button_search" style="margin-right: 10px" @click="search()">查询</button>
|
60
64
|
<button class="button_search" style="margin-right: 10px" @click="$parent.$parent.createAndSend()">下发</button>
|
61
65
|
</div>
|
@@ -111,7 +115,7 @@
|
|
111
115
|
placeholder='请选择'
|
112
116
|
style="width:60%;text-align: center"
|
113
117
|
:disabled-days-of-week="[]"
|
114
|
-
:format="'yyyy-MM-dd'"
|
118
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
115
119
|
:show-rest-button="reset"
|
116
120
|
:value.sync="model.f_check_start"
|
117
121
|
v-model="model.f_check_start">
|
@@ -123,7 +127,7 @@
|
|
123
127
|
placeholder='请选择'
|
124
128
|
:disabled-days-of-week="[]"
|
125
129
|
style="width:60%;text-align: center"
|
126
|
-
:format="'yyyy-MM-dd'"
|
130
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
127
131
|
:show-rest-button="reset"
|
128
132
|
:value.sync="model.f_check_end"
|
129
133
|
v-model="model.f_check_end">
|
@@ -269,7 +273,31 @@ import {toStandardDateString} from "../../../components/Util";
|
|
269
273
|
export default {
|
270
274
|
title: '计划管理',
|
271
275
|
data() {
|
276
|
+
let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
|
277
|
+
"orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
|
278
|
+
"f_usertype": "''",
|
279
|
+
"month": "''",
|
280
|
+
"SafeCheckSX": 'this.SafeCheckSX',
|
281
|
+
"SafeCheckCQ": "''",
|
282
|
+
"startday":"''",
|
283
|
+
"endday":"''"})
|
284
|
+
model.SafeCheckSX = '1 = 1'
|
272
285
|
return {
|
286
|
+
searchData: {
|
287
|
+
condition: "1=1",
|
288
|
+
orderitem: "f_residential_area,f_building,f_unit,f_floor,f_room",
|
289
|
+
SafeCheckSX:""
|
290
|
+
},
|
291
|
+
excelHeaders: {
|
292
|
+
'f_userinfo_code': '用户编号',
|
293
|
+
'f_user_name': '用户姓名',
|
294
|
+
'f_user_type': '用户类型',
|
295
|
+
'f_residential_area': '小区名称',
|
296
|
+
'f_last_check_date': '最后一次安检日期',
|
297
|
+
'f_last_check_state': '最后一次安检状态',
|
298
|
+
'f_address': '详细地址'
|
299
|
+
},
|
300
|
+
model: model,
|
273
301
|
createPlan:{
|
274
302
|
f_safecheck_type:"年度普检",
|
275
303
|
checker:"",
|
@@ -285,14 +313,6 @@ export default {
|
|
285
313
|
yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
|
286
314
|
monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
|
287
315
|
showCreatePlan:false,
|
288
|
-
model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
|
289
|
-
"orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
|
290
|
-
"f_usertype": "''",
|
291
|
-
"month": "''",
|
292
|
-
"SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
|
293
|
-
"SafeCheckCQ": "''",
|
294
|
-
"startday":"''",
|
295
|
-
"endday":"''"}),
|
296
316
|
a:'1',
|
297
317
|
opt:[{label:"测试",value:"测试"}],
|
298
318
|
showCondtion:false,
|
@@ -357,6 +377,7 @@ export default {
|
|
357
377
|
f_filialeid:this.userlogin.orgid,
|
358
378
|
f_subscribe_date:'',
|
359
379
|
condition:this.model.condition,
|
380
|
+
SafeCheckSX: this.model.SafeCheckSX,
|
360
381
|
switchCheckAll:true,
|
361
382
|
checkAll:this.checkAll,
|
362
383
|
param:this.checkes,
|
@@ -398,66 +419,42 @@ export default {
|
|
398
419
|
this.excelUserCondtion=true
|
399
420
|
},
|
400
421
|
selfSearch (args) {
|
401
|
-
|
402
|
-
//tag)
|
403
|
-
// 判断时间和状态匹配条件
|
404
|
-
let f_last_check_state = ''
|
405
|
-
|
406
|
-
if(args.model.f_last_check_state.length > 0){
|
422
|
+
if(args.model.f_last_check_state.length > 0) {
|
407
423
|
let zzcon = ''
|
408
|
-
if(
|
424
|
+
if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
|
409
425
|
this.$showMessage("选择安检状态时,需要选择安检时间区间!")
|
410
426
|
return
|
411
427
|
}
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
if(i
|
417
|
-
zzcon +=
|
418
|
-
}else{
|
419
|
-
zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state ='' ${lscon} ) or `
|
428
|
+
this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
429
|
+
for (let i = 0; i < args.model.f_last_check_state.length; i++) {
|
430
|
+
if (args.model.f_last_check_state[i] == '未检') {
|
431
|
+
zzcon += ' tcp.ruhu is null '
|
432
|
+
if (i != args.model.f_last_check_state.length - 1) {
|
433
|
+
zzcon += ' or'
|
420
434
|
}
|
421
|
-
} else{
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
435
|
+
} else if (args.model.f_last_check_state[i] == '入户') {
|
436
|
+
zzcon += `tcp.ruhu > 0`
|
437
|
+
if (i != args.model.f_last_check_state.length - 1) {
|
438
|
+
zzcon += ' or'
|
439
|
+
}
|
440
|
+
} else if (args.model.f_last_check_state[i] == '拒检') {
|
441
|
+
zzcon += `(tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang >= 0) `
|
442
|
+
if (i != args.model.f_last_check_state.length - 1) {
|
443
|
+
zzcon += ' or'
|
444
|
+
}
|
445
|
+
} else if (args.model.f_last_check_state[i] == '到访不遇') {
|
446
|
+
zzcon += `(tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0) `
|
447
|
+
if (i != args.model.f_last_check_state.length - 1) {
|
448
|
+
zzcon += ' or'
|
428
449
|
}
|
429
450
|
}
|
430
451
|
}
|
431
452
|
args.condition += `and ( ${zzcon} )`
|
432
|
-
}else if(args.model.f_last_check_state.length == 0 && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
|
433
|
-
let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
|
434
|
-
lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
|
435
|
-
args.condition += lscon
|
436
453
|
}else{
|
437
|
-
|
454
|
+
//无条件
|
455
|
+
this.model.SafeCheckSX = ` 1 != 1 `
|
438
456
|
}
|
439
|
-
|
440
|
-
// if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
|
441
|
-
// if (args.model.f_last_check_state == '未检'){
|
442
|
-
// var lscon = args.model.f_check_start ? ` or ua.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
|
443
|
-
// lscon += lscon ? (args.model.f_check_end ? ` or ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
|
444
|
-
// args.condition +=`and (ua.f_last_check_state is null or ua.f_last_check_state ='' ${lscon} ) `
|
445
|
-
// }else {
|
446
|
-
// var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
|
447
|
-
// lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
|
448
|
-
// args.condition += `and ua.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
|
449
|
-
// }
|
450
|
-
//
|
451
|
-
// }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )) {
|
452
|
-
// var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
|
453
|
-
// lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
|
454
|
-
// args.condition += lscon
|
455
|
-
// }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
|
456
|
-
// this.$showMessage("选择安检状态时,需要选择安检时间区间!")
|
457
|
-
// return
|
458
|
-
// }else{
|
459
|
-
// console.log('这块无条件')
|
460
|
-
// }
|
457
|
+
this.searchData.SafeCheckSX = this.model.SafeCheckSX
|
461
458
|
let condition1=`(ui.f_last_check_date is null or ui.f_last_check_date ='')`
|
462
459
|
let arge = args.condition.replace('从未安检',condition1)
|
463
460
|
args.condition = arge
|
@@ -517,6 +514,7 @@ export default {
|
|
517
514
|
this.cancel()
|
518
515
|
this.checkes=[]
|
519
516
|
this.checkAll=false
|
517
|
+
this.searchData.condition = args.condition
|
520
518
|
this.model.search(args.condition, args.model, args.condValue)
|
521
519
|
},
|
522
520
|
showUserCondition(){
|
@@ -120,51 +120,6 @@
|
|
120
120
|
<input type="text" class="input_search" v-model="model.f_unit"
|
121
121
|
style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
|
122
122
|
</div>
|
123
|
-
<!-- <div class="form-group col-sm-4" >-->
|
124
|
-
<!-- <label class="font_normal_body">开户起始:</label>-->
|
125
|
-
<!-- <datepicker-->
|
126
|
-
<!-- placeholder='请选择'-->
|
127
|
-
<!-- style="width:60%"-->
|
128
|
-
<!-- :disabled-days-of-week="[]"-->
|
129
|
-
<!-- :format="'yyyy-MM-dd'"-->
|
130
|
-
<!-- :show-rest-button="reset"-->
|
131
|
-
<!-- :value.sync="model.f_startfile_time"-->
|
132
|
-
<!-- v-model="model.f_startfile_time"-->
|
133
|
-
<!-- condition="ui.f_createfile_date >= '{} 00:00:00'">-->
|
134
|
-
<!-- </datepicker>-->
|
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%"-->
|
142
|
-
<!-- :format="'yyyy-MM-dd'"-->
|
143
|
-
<!-- :show-rest-button="reset"-->
|
144
|
-
<!-- :value.sync="model.f_endfile_time"-->
|
145
|
-
<!-- v-model="model.f_endfile_time"-->
|
146
|
-
<!-- condition="ui.f_createfile_date <= '{} 00:00:00'">-->
|
147
|
-
<!-- </datepicker>-->
|
148
|
-
<!-- </div>-->
|
149
|
-
<!-- <div class="form-group col-sm-4" >-->
|
150
|
-
<!-- <label class="font_normal_body">表 箱 号:</label>-->
|
151
|
-
<!-- <input type="text" class="input_search" v-model="model.f_metertitles"-->
|
152
|
-
<!-- style="width: 60%" placeholder="请选择" condition="uf.f_metertitles='{}'">-->
|
153
|
-
<!-- </div>-->
|
154
|
-
<!-- <div class="form-group col-sm-4" >-->
|
155
|
-
<!-- <label class="font_normal_body">抄 表 册:</label>-->
|
156
|
-
<!-- <v-select-->
|
157
|
-
<!-- class="select select_list"-->
|
158
|
-
<!-- :value.sync="model.f_meter_book_num"-->
|
159
|
-
<!-- v-model="model.f_meter_book_num"-->
|
160
|
-
<!-- :options='$parent.$parent.cbc'-->
|
161
|
-
<!-- placeholder='请选择'-->
|
162
|
-
<!-- condition="uf.f_meter_book_num='{}'"-->
|
163
|
-
<!-- close-on-select-->
|
164
|
-
<!-- value-single-->
|
165
|
-
<!-- >-->
|
166
|
-
<!-- </v-select>-->
|
167
|
-
<!-- </div>-->
|
168
123
|
<div class="form-group col-sm-4" >
|
169
124
|
<label class="font_normal_body">派发情况:</label>
|
170
125
|
<v-select
|
@@ -194,21 +149,6 @@
|
|
194
149
|
>
|
195
150
|
</v-select>
|
196
151
|
</div>
|
197
|
-
<!-- <div class="form-group col-sm-4" >-->
|
198
|
-
<!-- <label class="font_normal_body">安检情况:</label>-->
|
199
|
-
<!-- <v-select-->
|
200
|
-
<!-- class="select select_list"-->
|
201
|
-
<!-- :value.sync="model.checkState"-->
|
202
|
-
<!-- v-model="model.checkState"-->
|
203
|
-
<!-- :options='$parent.$parent.checkStateList'-->
|
204
|
-
<!-- placeholder='请选择'-->
|
205
|
-
<!-- condition="{}"-->
|
206
|
-
<!-- :search="false"-->
|
207
|
-
<!-- close-on-select-->
|
208
|
-
<!-- value-single-->
|
209
|
-
<!-- >-->
|
210
|
-
<!-- </v-select>-->
|
211
|
-
<!-- </div>-->
|
212
152
|
<div class="form-group col-sm-4" >
|
213
153
|
<label class="font_normal_body">安检片区:</label>
|
214
154
|
<v-select
|
@@ -223,31 +163,16 @@
|
|
223
163
|
>
|
224
164
|
</v-select>
|
225
165
|
</div>
|
226
|
-
<!--<div class="form-group col-sm-4" >
|
227
|
-
<label class="font_normal_body">入户情况:</label>
|
228
|
-
<v-select
|
229
|
-
class="select select_list"
|
230
|
-
:value.sync="model.f_hasHousehold"
|
231
|
-
v-model="model.f_hasHousehold"
|
232
|
-
:options='$parent.$parent.hasHousehold'
|
233
|
-
placeholder='请选择'
|
234
|
-
close-on-select
|
235
|
-
:search="false"
|
236
|
-
value-single
|
237
|
-
>
|
238
|
-
</v-select>
|
239
|
-
</div>-->
|
240
166
|
<div class="form-group col-sm-4" >
|
241
167
|
<label class="font_normal_body">安检起始:</label>
|
242
168
|
<datepicker
|
243
169
|
placeholder='请选择'
|
244
170
|
style="width:60%;text-align: center"
|
245
171
|
:disabled-days-of-week="[]"
|
246
|
-
:format="'yyyy-MM-dd'"
|
172
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
247
173
|
:show-rest-button="reset"
|
248
174
|
:value.sync="model.f_check_start"
|
249
|
-
v-model="model.f_check_start"
|
250
|
-
condition="ui.f_last_check_date >='{} 00:00:00'">
|
175
|
+
v-model="model.f_check_start">
|
251
176
|
</datepicker>
|
252
177
|
</div>
|
253
178
|
<div class="form-group col-sm-4" >
|
@@ -256,11 +181,10 @@
|
|
256
181
|
placeholder='请选择'
|
257
182
|
:disabled-days-of-week="[]"
|
258
183
|
style="width:60%;text-align: center"
|
259
|
-
:format="'yyyy-MM-dd'"
|
184
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
260
185
|
:show-rest-button="reset"
|
261
186
|
:value.sync="model.f_check_end"
|
262
|
-
v-model="model.f_check_end"
|
263
|
-
condition="ui.f_last_check_date <='{} 00:00:00'">
|
187
|
+
v-model="model.f_check_end">
|
264
188
|
</datepicker>
|
265
189
|
</div>
|
266
190
|
|
@@ -339,18 +263,20 @@
|
|
339
263
|
import Vue from "vue";
|
340
264
|
|
341
265
|
export default {
|
342
|
-
name: "
|
266
|
+
name: "checkUserList",
|
343
267
|
title: '计划管理',
|
344
268
|
data() {
|
269
|
+
let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
|
270
|
+
"orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
|
271
|
+
"f_usertype": "''",
|
272
|
+
"month": "''",
|
273
|
+
"SafeCheckSX": 'this.SafeCheckSX',
|
274
|
+
"SafeCheckCQ": "''",
|
275
|
+
"startday":"''",
|
276
|
+
"endday":"''"})
|
277
|
+
model.SafeCheckSX = '1 = 1'
|
345
278
|
return {
|
346
|
-
model:
|
347
|
-
"orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
|
348
|
-
"f_usertype": "''",
|
349
|
-
"month": "''",
|
350
|
-
"SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
|
351
|
-
"SafeCheckCQ": "''",
|
352
|
-
"startday":"''",
|
353
|
-
"endday":"''"}),
|
279
|
+
model: model,
|
354
280
|
a:'1',
|
355
281
|
opt:[{label:"测试",value:"测试"}],
|
356
282
|
showCondtion:false,
|
@@ -361,7 +287,6 @@
|
|
361
287
|
meter_gasbrand:[],//气表品牌
|
362
288
|
hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
|
363
289
|
yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
|
364
|
-
checkStateList:[{label:"全部",value:""},{label:"两年内已检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())<=730"},{label:"两年内未检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())>730"},{label:"从未安检",value:"从未安检"}],
|
365
290
|
hasResidentialArea:[{label:"全部",value:""},{label:"有名称",value:"有名称"},{label:"无名称",value:"无名称"}],
|
366
291
|
sliceArea:[],
|
367
292
|
meterbooks:[],
|
@@ -462,38 +387,33 @@
|
|
462
387
|
this.excelUserCondtion=true
|
463
388
|
},
|
464
389
|
selfSearch (args) {
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
if (args.model.f_last_check_state == '未检'){
|
472
|
-
args.condition +=
|
473
|
-
}else
|
474
|
-
args.condition += `and
|
390
|
+
if(args.model.f_last_check_state) {
|
391
|
+
if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
|
392
|
+
this.$showMessage("选择安检状态时,需要选择安检时间区间!")
|
393
|
+
return
|
394
|
+
}
|
395
|
+
this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
396
|
+
if (args.model.f_last_check_state == '未检') {
|
397
|
+
args.condition += ' and tcp.ruhu is null '
|
398
|
+
} else if (args.model.f_last_check_state == '入户') {
|
399
|
+
args.condition += ` and tcp.ruhu > 0`
|
400
|
+
} else if (args.model.f_last_check_state == '拒检') {
|
401
|
+
args.condition += ` and tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang = 0 `
|
402
|
+
} else if (args.model.f_last_check_state == '到访不遇') {
|
403
|
+
args.condition += ` and tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0 `
|
475
404
|
}
|
405
|
+
}else{
|
406
|
+
//无条件
|
407
|
+
this.model.SafeCheckSX = ` 1 != 1 `
|
476
408
|
}
|
477
|
-
|
478
|
-
// (ua.f_residential_area is null or ua.f_residential_area ='')
|
409
|
+
args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
|
479
410
|
if (args.model.f_residential_area == "无名称"){
|
480
411
|
args.condition +=" and (ua.f_residential_area is null or ua.f_residential_area ='')"
|
481
412
|
}else if (args.model.f_residential_area == "有名称"){
|
482
413
|
args.condition +=" and (ua.f_residential_area is not null and ua.f_residential_area !='')"
|
483
414
|
}
|
484
415
|
console.log('查询条件',args)
|
485
|
-
/*if(args.model.f_hasHousehold=='已入户'){
|
486
|
-
args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
|
487
|
-
}else if(args.model.f_hasHousehold=='未入户'){
|
488
|
-
args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
|
489
|
-
}*/
|
490
416
|
if(args.model.checkBook){
|
491
|
-
/* let arr=args.model.checkBook.split('-')
|
492
|
-
if(arr[1] == '用户'){
|
493
|
-
args.condition +=` and ua.f_check_book_id=${arr[0]}`
|
494
|
-
}else{
|
495
|
-
args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
|
496
|
-
}*/
|
497
417
|
let uas = []
|
498
418
|
let areas = []
|
499
419
|
for (let item of args.model.checkBook) {
|
@@ -680,6 +600,7 @@
|
|
680
600
|
f_filialeid:this.userlogin.orgid,
|
681
601
|
f_subscribe_date:'',
|
682
602
|
condition:this.model.condition,
|
603
|
+
SafeCheckSX: this.model.SafeCheckSX,
|
683
604
|
switchCheckAll:true,
|
684
605
|
checkAll:this.checkAll,
|
685
606
|
param:this.checkes,
|
package/src/main.js
CHANGED
@@ -1,33 +1,33 @@
|
|
1
|
-
import Vue from 'vue'
|
2
|
-
import App from './App'
|
3
|
-
import { all } from 'vue-client'
|
4
|
-
import { system } from 'system-clients'
|
5
|
-
import safecheck from './
|
6
|
-
import echarts from 'echarts'
|
7
|
-
// import safecheck from './rongcheng'
|
8
|
-
|
9
|
-
all()
|
10
|
-
// 验证码开关赋值
|
11
|
-
var Verificationfalg = false
|
12
|
-
system(Verificationfalg)
|
13
|
-
// system()
|
14
|
-
safecheck(
|
15
|
-
// safecheck('rizhao')
|
16
|
-
require('./bootstrap/less/bootstrap.less')
|
17
|
-
require('./expandcss.less')
|
18
|
-
|
19
|
-
Vue.prototype.$echarts = echarts
|
20
|
-
Vue.android = false
|
21
|
-
|
22
|
-
Vue.url = '/SafeCheck/rs/'
|
23
|
-
if(Vue.android)
|
24
|
-
Vue.url = Vue.staticUrl
|
25
|
-
Vue.interval = 1*60*1000
|
26
|
-
Vue.nopic = 'file:///android_asset/nopic.png'
|
27
|
-
Vue.mapSetup = false
|
28
|
-
|
29
|
-
/* eslint-disable no-new */
|
30
|
-
new Vue({
|
31
|
-
el: 'body',
|
32
|
-
components: { App }
|
33
|
-
})
|
1
|
+
import Vue from 'vue'
|
2
|
+
import App from './App'
|
3
|
+
import { all } from 'vue-client'
|
4
|
+
import { system } from 'system-clients'
|
5
|
+
import safecheck from './rongcheng'
|
6
|
+
import echarts from 'echarts'
|
7
|
+
// import safecheck from './rongcheng'
|
8
|
+
|
9
|
+
all()
|
10
|
+
// 验证码开关赋值
|
11
|
+
var Verificationfalg = false
|
12
|
+
system(Verificationfalg)
|
13
|
+
// system()
|
14
|
+
safecheck()
|
15
|
+
// safecheck('rizhao')
|
16
|
+
require('./bootstrap/less/bootstrap.less')
|
17
|
+
require('./expandcss.less')
|
18
|
+
|
19
|
+
Vue.prototype.$echarts = echarts
|
20
|
+
Vue.android = false
|
21
|
+
|
22
|
+
Vue.url = '/SafeCheck/rs/'
|
23
|
+
if(Vue.android)
|
24
|
+
Vue.url = Vue.staticUrl
|
25
|
+
Vue.interval = 1*60*1000
|
26
|
+
Vue.nopic = 'file:///android_asset/nopic.png'
|
27
|
+
Vue.mapSetup = false
|
28
|
+
|
29
|
+
/* eslint-disable no-new */
|
30
|
+
new Vue({
|
31
|
+
el: 'body',
|
32
|
+
components: { App }
|
33
|
+
})
|