safecheck-client 3.0.35-5 → 3.0.35-51
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +1 -1
- package/src/bootstrap/less/pager.less +76 -76
- package/src/components/NewDefectList/DefectListNew.vue +617 -617
- package/src/components/NewDefectList/DefectPaperNew.vue +3 -3
- package/src/components/Util/SafecheckUpload.vue +4 -0
- package/src/components/android/CheckPlanDown.vue +1 -1
- package/src/components/android/CivilCurrentCreate.vue +56 -41
- package/src/components/android/NoCivilCurrentCreate.vue +10 -0
- package/src/components/android/PaperFeedback.vue +1 -1
- package/src/components/android/PhoneUpUserinfo.vue +25 -6
- package/src/components/android/PhoneotherInfo.vue +0 -14
- package/src/components/android/PhoneotherInfov3.vue +118 -0
- package/src/components/android/SafecheckDevices.vue +1298 -1298
- package/src/components/android/SafecheckOrderV.vue +2 -529
- package/src/components/pc/AddPlanItemYyChange.vue +743 -0
- package/src/components/pc/NewCheckpaper.vue +1998 -1943
- package/src/components/pc/SecurityCheckLedger.vue +133 -0
- package/src/components/pc/SecurityCheckList.vue +160 -0
- package/src/components/pc/SecurityCheckManage.vue +106 -0
- package/src/components/planmanage/PlanManage.vue +47 -2
- package/src/components/report/CheckPlanAreaList.vue +25 -5
- package/src/components/rongcheng/AddPlanItem.vue +1 -1
- package/src/components/rongcheng/AspiratedAreaPlan.vue +1 -0
- package/src/components/rongcheng/AspiratedPaperFeedbackm.vue +4 -0
- package/src/components/rongcheng/AspiratedUserInfo.vue +12 -4
- package/src/components/rongcheng/CheckSearchUser.vue +1 -1
- package/src/components/rongcheng/SafecheckOrderV.vue +1 -1
- package/src/components/rongcheng/SafecheckUserInfo.vue +12 -12
- package/src/filiale/bayan/android/AddPlanItem.vue +450 -430
- package/src/filiale/bayan/android/CheckPlanDown.vue +249 -249
- package/src/filiale/bayan/android/CurrentCreate.vue +10 -0
- package/src/filiale/bayan/android/PhoneUpUserinfo.vue +908 -905
- package/src/filiale/bayan/android/SafecheckOrderV.vue +76 -20
- package/src/filiale/bayan/android/SafecheckUserInfo.vue +4 -0
- package/src/filiale/bayan/pc/DefectPaperNew.vue +22 -1
- package/src/filiale/bayan/pc/PlanManage.vue +962 -962
- package/src/filiale/bayan/pc/SelectCheckPlan.vue +6 -1
- package/src/filiale/dexin/pc/DefectListNew.vue +643 -0
- package/src/filiale/dexin/pc/DefectMainNew.vue +63 -0
- package/src/filiale/dexin/pc/DefectPaperNew.vue +1066 -0
- package/src/filiale/dexin/pc.js +1 -0
- package/src/filiale/huaran/android/CheckPlanDown.vue +212 -0
- package/src/filiale/huaran/android.js +1 -0
- package/src/filiale/huaran/pc/PaperList.vue +22 -1
- package/src/filiale/huaran/pc/PlanManage.vue +66 -7
- package/src/filiale/huaran/pc/checkUserList.vue +55 -22
- package/src/filiale/huaran/pc.js +1 -0
- package/src/filiale/jiaxian/android/SafecheckOrderV.vue +2807 -2807
- package/src/filiale/qianneng/android/SafecheckOrderV.vue +2785 -2785
- package/src/filiale/qianneng/android/SwitchValve.vue +1 -0
- package/src/filiale/rizhao/pc/NewCheckpaper.vue +9 -4
- package/src/filiale/shanxian/android/AddPlanItem.vue +447 -447
- package/src/filiale/shanxian/android/SafecheckOrderV.vue +2979 -2979
- package/src/filiale/shanxian/pc/SelectCheckPlan.vue +21 -0
- package/src/filiale/shanxian/pc/checkUserList.vue +700 -700
- package/src/filiale/siyang/android/PaperFeedback.vue +1514 -0
- package/src/filiale/siyang/android.js +1 -0
- package/src/filiale/siyang/pc/CheckSearchUser.vue +1035 -1035
- package/src/filiale/siyang/pc/checkUserList.vue +123 -148
- package/src/filiale/tianke/pc/DefectListNew.vue +10 -3
- package/src/filiale/tongchuan/android/SafecheckOrderV.vue +3 -3
- package/src/filiale/tongchuan/pc/CheckSearchUser.vue +5 -13
- package/src/filiale/tongchuan/pc/PaperDefectMain.vue +1060 -1060
- package/src/filiale/weinan/android/PaperFeedback.vue +34 -8
- package/src/filiale/weinan/android/SafecheckOrderV.vue +2 -1
- package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +735 -735
- package/src/filiale/weinan/pc/CheckDetail.vue +278 -278
- package/src/filiale/weinan/pc/NewCheckpaper.vue +20 -0
- package/src/filiale/weinan/pc/checkUserList.vue +712 -712
- package/src/filiale/xilan/android/CurrentCreate.vue +1053 -1067
- package/src/filiale/xilan/android.js +0 -1
- package/src/filiale/xilan/pc/PaperList.vue +795 -0
- package/src/filiale/xilan/pc.js +13 -12
- package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue +642 -642
- package/src/filiale/zhongsheng/android/SafecheckDevices.vue +4 -4
- package/src/filiale/zhongsheng/pc/CheckPlanAreaList.vue +33 -1
- package/src/safecheck-android.js +1 -0
- package/src/safecheck.js +12 -0
- package/src/filiale/xilan/android/AddPlanItem.vue +0 -461
|
@@ -13,6 +13,19 @@
|
|
|
13
13
|
v-model="model.f_checker_id">
|
|
14
14
|
</role-selector-safe>
|
|
15
15
|
</div>
|
|
16
|
+
<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
|
|
17
|
+
<label class="font_normal_body">安检员状态</label>
|
|
18
|
+
<v-select
|
|
19
|
+
:value.sync="model.f_checker_state"
|
|
20
|
+
:options='$parent.$parent.checkertates'
|
|
21
|
+
placeholder='安检员状态'
|
|
22
|
+
close-on-select
|
|
23
|
+
style="width:60% "
|
|
24
|
+
class="select select_list"
|
|
25
|
+
v-model='model.f_checker_state'
|
|
26
|
+
>
|
|
27
|
+
</v-select>
|
|
28
|
+
</div>
|
|
16
29
|
<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
|
|
17
30
|
<label class="font_normal_body">计划起始</label>
|
|
18
31
|
<datepicker
|
|
@@ -167,6 +180,7 @@
|
|
|
167
180
|
}, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
|
|
168
181
|
model.f_filialeids = '('+this.$login.f.orgid+')'
|
|
169
182
|
return {
|
|
183
|
+
checkertates: [{label: '在职', value: '在职'}, {label: '离职', value: '离职'}],
|
|
170
184
|
excelHeaders:{
|
|
171
185
|
'f_checker': '安检员',
|
|
172
186
|
'plannum': '计划总数',
|
|
@@ -232,6 +246,13 @@
|
|
|
232
246
|
condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
|
|
233
247
|
condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
|
|
234
248
|
}
|
|
249
|
+
if (this.$refs.paged.$refs.cri.model.f_checker_state !=''){
|
|
250
|
+
condition3 += ` AND tu.state= '${this.$refs.paged.$refs.cri.model.f_checker_state}' `
|
|
251
|
+
condition2 += ` AND tu.state= '${this.$refs.paged.$refs.cri.model.f_checker_state}' `
|
|
252
|
+
}else{
|
|
253
|
+
condition3 += ` AND tu.state= '在职' `
|
|
254
|
+
condition2 += ` AND tu.state= '在职' `
|
|
255
|
+
}
|
|
235
256
|
this.model.f_start_time=this.f_start_time
|
|
236
257
|
this.model.f_end_time=this.f_end_time
|
|
237
258
|
this.model.condition1=condition1
|