safecheck-client 4.0.0-8 → 4.0.0-80
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 +2 -2
- package/src/components/NewDefectList/DefectListNew.vue +11 -11
- package/src/components/NewDefectList/DefectPaperNew.vue +44 -44
- package/src/components/Util/ImgSelfSafePlus.vue +13 -3
- package/src/components/android/AndroidDefectDeal.vue +1 -1
- package/src/components/android/AndroidDefectDealBeforeSafe.vue +1 -1
- package/src/components/android/AndroidDefectDetails.vue +725 -0
- package/src/components/android/BlackUserOnLine.vue +2 -2
- package/src/components/android/Insurance/PhoneInsurancePurchase.vue +1 -1
- package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue +4 -4
- package/src/components/android/NewCheckpaperAndroid.vue +28 -21
- package/src/components/android/PaperFeedback.vue +15 -13
- package/src/components/android/PaperFeedbackTemp.vue +2 -2
- package/src/components/android/PhoneUpUserinfo.vue +20 -0
- package/src/components/android/RelieveRestrict.vue +1 -1
- package/src/components/android/Restriction.vue +1 -1
- package/src/components/android/SafecheckDevices.vue +47 -2
- package/src/components/android/SafecheckOrderV.vue +2 -2
- package/src/components/android/SealBind.vue +392 -0
- package/src/components/android/SealManage.vue +250 -0
- package/src/components/inspections/inspectionFeedback.vue +2 -2
- package/src/components/paper/PaperList.vue +360 -332
- package/src/components/pc/AddToCheckBook.vue +100 -23
- package/src/components/pc/CheckBook.vue +2 -0
- package/src/components/pc/CheckBookDetails.vue +6 -39
- package/src/components/pc/CheckBookEntry.vue +6 -7
- package/src/components/pc/CheckBookList.vue +61 -72
- package/src/components/pc/CheckBookSearchArea.vue +20 -24
- package/src/components/pc/CheckBookSearchUser.vue +139 -84
- package/src/components/pc/CheckBookSearchUserList.vue +1 -2
- package/src/components/pc/CheckBookUser.vue +276 -44
- package/src/components/pc/NewCheckpaper.vue +14 -8
- package/src/components/pc/NewCheckpaperTemp.vue +5 -5
- package/src/components/pc/PaperDefectMain.vue +1 -0
- package/src/components/planmanage/PlanManage.vue +825 -821
- package/src/components/planmanage/checkPlanList.vue +28 -0
- package/src/components/planmanage/checkUserList.vue +346 -346
- package/src/components/querycheckpaper/CheckSearchUser.vue +68 -68
- package/src/components/report/CheckPlanAreaList.vue +266 -266
- package/src/components/rongcheng/AspPaperFeedback.vue +1 -1
- package/src/components/rongcheng/PaperFeedback.vue +2 -2
- package/src/components/safecheck/queryManage/CheckBookAll.vue +2 -2
- package/src/filiale/ancheng/android/PaperFeedback.vue +2 -2
- package/src/filiale/ankangyihua/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/baiyin/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/bayan/android/PaperFeedback.vue +2 -2
- package/src/filiale/fugou/pc/PaperDefectMain.vue +1 -1
- package/src/filiale/hanzhong/android/PaperFeedback.vue +2 -2
- package/src/filiale/huatong/android/PaperFeedback.vue +2 -2
- package/src/filiale/huayin/android/PaperFeedback.vue +2 -2
- package/src/filiale/huayin/android/SafecheckOrderV.vue +1 -1
- package/src/filiale/jiaocheng/android/PaperFeedback.vue +2 -2
- package/src/filiale/jingyang/android/PaperFeedback.vue +2 -2
- package/src/filiale/jinhong/android/CurrentCreate.vue +1195 -0
- package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue +438 -363
- package/src/filiale/jinhong/android/PhoneInsuranceRecordList.vue +346 -0
- package/src/filiale/jinhong/android.js +3 -1
- package/src/filiale/jinhong/pc/CheckPlanAreaList.vue +511 -0
- package/src/filiale/jinhong/pc/CheckSearchUser.vue +1094 -0
- package/src/filiale/jinhong/pc/DefectListNew.vue +663 -0
- package/src/filiale/jinhong/pc/DefectPaperNew.vue +1100 -0
- package/src/filiale/jinhong/pc/PaperList.vue +823 -0
- package/src/filiale/jinhong/pc/PlanManage.vue +909 -0
- package/src/filiale/jinhong/pc/checkUserList.vue +776 -0
- package/src/filiale/jinhong/pc.js +11 -0
- package/src/filiale/kelai/android/AndroidDefectDeal.vue +2 -2
- package/src/filiale/kelai/android/PaperFeedback.vue +2 -2
- package/src/filiale/kelai/android/RelieveRestrict.vue +1 -1
- package/src/filiale/kelai/android/SafecheckOrderV.vue +1 -1
- package/src/filiale/kelai/pc/FaultLimitGas/FaultLimitGasPaper.vue +1 -1
- package/src/filiale/meihekou/android/AreaPlan.vue +569 -0
- package/src/filiale/meihekou/android/CheckPlanList.vue +198 -0
- package/src/filiale/meihekou/android/CheckPlanListArea.vue +190 -0
- package/src/filiale/meihekou/android/CurrentCreate.vue +1090 -0
- package/src/filiale/meihekou/android/MeterReading.vue +106 -0
- package/src/filiale/meihekou/android/PaperFeedback.vue +1538 -0
- package/src/filiale/meihekou/android/PhoneInsurancePurchaseDetail.vue +293 -0
- package/src/filiale/meihekou/android/PhoneUpUserinfo.vue +1276 -0
- package/src/filiale/meihekou/android/SafecheckOrderV.vue +2407 -0
- package/src/filiale/meihekou/android/SafecheckUserInfo.vue +787 -0
- package/src/filiale/meihekou/android.js +21 -0
- package/src/filiale/meihekou/pc.js +12 -0
- package/src/filiale/pingxiang/android/PaperFeedback.vue +2 -2
- package/src/filiale/qianneng/android/PaperFeedback.vue +2 -2
- package/src/filiale/qingjian/pc/NewCheckpaper.vue +5 -11
- package/src/filiale/rizhao/android/PaperFeedback.vue +2 -2
- package/src/filiale/rongchuang/android/PaperFeedback.vue +2 -2
- package/src/filiale/shanggao/android/PaperFeedback.vue +2 -2
- package/src/filiale/shanxian/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/shanxian/android/PaperFeedback.vue +2 -2
- package/src/filiale/shexian/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/shexian/android/PaperFeedback.vue +2 -2
- package/src/filiale/shimen/android/PaperFeedback.vue +2 -2
- package/src/filiale/tongchuan/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/tongchuan/android/PaperFeedback.vue +2 -2
- package/src/filiale/weinan/android/SafecheckOrderV.vue +3 -3
- package/src/filiale/wenxi/android/PaperFeedback.vue +3 -3
- package/src/filiale/wuan/android/PaperFeedback.vue +2 -2
- package/src/filiale/wuhai/android/PaperFeedback.vue +2 -2
- package/src/filiale/xiangyuanzhongai/android/PhoneUpUserinfo.vue +1249 -0
- package/src/filiale/xiangyuanzhongai/android/SafecheckDevices.vue +20 -1
- package/src/filiale/xiangyuanzhongai/android/SafecheckOrderV.vue +2282 -0
- package/src/filiale/xiangyuanzhongai/android/SafecheckUserInfo.vue +786 -0
- package/src/filiale/xiangyuanzhongai/android.js +3 -0
- package/src/filiale/xiangyuanzhongai/pc/DefectDeal.vue +1007 -0
- package/src/filiale/xiangyuanzhongai/pc/PaperList.vue +795 -0
- package/src/filiale/xiangyuanzhongai/pc.js +2 -0
- package/src/filiale/yangchunboneng/android/PaperFeedback.vue +2 -2
- package/src/filiale/yongzhou/android/PaperFeedback.vue +2 -2
- package/src/filiale/yuansheng/android/AndroidDefectDeal.vue +1 -1
- package/src/filiale/yuansheng/android/PaperFeedback.vue +2 -2
- package/src/filiale/yunchengminsheng/android/DailyworkloadQuery.vue +2 -2
- package/src/filiale/yunchengminsheng/android/PhoneSellInfo.vue +113 -0
- package/src/filiale/yunchengminsheng/android/SafecheckOrderV.vue +4 -2
- package/src/filiale/yunchengminsheng/android/SafecheckUserInfo.vue +1 -1
- package/src/filiale/yunchengminsheng/android.js +1 -0
- package/src/filiale/yunchengminsheng/pc/NewCheckpaper.vue +16 -5
- package/src/filiale/zhongsheng/android/PaperFeedback.vue +2 -2
- package/src/filiale/zhoukou/android/PaperFeedback.vue +2 -2
- package/src/main.js +1 -1
- package/src/safecheck-android.js +3 -0
@@ -1,26 +1,26 @@
|
|
1
1
|
<template>
|
2
2
|
<div id='AddTobook'>
|
3
3
|
<div class="auto select-overspread">
|
4
|
+
<button class="button_new" style="margin-right: 10px" @click="showUploadCodeCondition()">导入编号</button>
|
4
5
|
<validator name='v'>
|
5
6
|
<ul class="nav nav-tabs">
|
6
7
|
<p class="bg-info text-center" style="padding: 8px;">{{tabstitles[$parent.$refs.tabs.active]}}</p>
|
7
8
|
</ul>
|
8
|
-
<div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;"
|
9
|
+
<div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;">
|
9
10
|
<div class="row" style="text-align: center">
|
10
|
-
|
11
11
|
<div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
|
12
|
-
<label class="font_normal_body" style="width: 26%;"
|
12
|
+
<label class="font_normal_body" style="width: 26%;">目标安检册</label>
|
13
13
|
<input type="text" v-model="model.f_check_book_num" v-show="false"
|
14
14
|
v-validate:f_check_book_num='{required: true }'>
|
15
15
|
<v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
|
16
|
-
:options='checkbook' placeholder='
|
16
|
+
:options='checkbook' placeholder='安检册'
|
17
17
|
:value-single="true" :search="true"
|
18
18
|
style="width:60%"
|
19
19
|
close-on-select></v-select>
|
20
20
|
</div>
|
21
21
|
</div>
|
22
22
|
</div>
|
23
|
-
<div class="row"
|
23
|
+
<div class="row" >
|
24
24
|
<div style="float:right;margin-top: 250px;margin-right: 20px;">
|
25
25
|
<button @click="confirm()" class="btn button_search" style="width: 70px" :disabled='!$v.valid'>
|
26
26
|
<span class="glyphicon glyphicon-floppy-disk"></span>保存
|
@@ -29,8 +29,23 @@
|
|
29
29
|
</div>
|
30
30
|
</validator>
|
31
31
|
</div>
|
32
|
+
<modal :show.sync="excelUserCondtion" width="500px" v-ref:modal1 >
|
33
|
+
<div slot="modal-header" class="modal-header">
|
34
|
+
<h4 class="modal-title">
|
35
|
+
导入用户编号
|
36
|
+
</h4>
|
37
|
+
</div>
|
38
|
+
<div slot="modal-body" class="modal-body">
|
39
|
+
<div class="row">
|
40
|
+
<file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
|
41
|
+
action="api/af-safecheck/file/uploadFile" tagname="安检册导入" v-ref:file :headers="headers" multiple></file-upload>
|
42
|
+
<img src="../../assets/anjince.png" style="width: 100%"/>
|
43
|
+
</div>
|
44
|
+
</div>
|
45
|
+
<footer slot="modal-footer" class="modal-footer">
|
46
|
+
</footer>
|
47
|
+
</modal>
|
32
48
|
</div>
|
33
|
-
|
34
49
|
</template>
|
35
50
|
|
36
51
|
<script>
|
@@ -45,16 +60,17 @@
|
|
45
60
|
model:{
|
46
61
|
f_check_book_num:''
|
47
62
|
},
|
63
|
+
excelUserCondtion:false,
|
48
64
|
checkbook: [],
|
49
65
|
checkbooks:[],
|
50
|
-
tabstitles:['
|
66
|
+
tabstitles:['请选择用户添加到安检册内']
|
51
67
|
}
|
52
68
|
},
|
53
69
|
created () {
|
54
70
|
},
|
55
71
|
ready () {
|
56
72
|
// this.close()
|
57
|
-
new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy',{data: {
|
73
|
+
new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999',{data: {
|
58
74
|
items: 'id,f_check_book_name,f_check_book_type,f_user_type',
|
59
75
|
tablename: 't_check_book',
|
60
76
|
condition: `1=1`,
|
@@ -69,10 +85,17 @@
|
|
69
85
|
value:item.id
|
70
86
|
})
|
71
87
|
})
|
72
|
-
this.checkbook = this.checkbooks
|
88
|
+
this.checkbook = this.checkbooks
|
73
89
|
})
|
74
90
|
},
|
75
91
|
methods: {
|
92
|
+
cancel(){
|
93
|
+
this.showCondtion=false
|
94
|
+
this.excelUserCondtion=false
|
95
|
+
},
|
96
|
+
showUploadCodeCondition(){
|
97
|
+
this.excelUserCondtion=true
|
98
|
+
},
|
76
99
|
selectbook(val){
|
77
100
|
|
78
101
|
},
|
@@ -82,7 +105,7 @@
|
|
82
105
|
|
83
106
|
confirm () {
|
84
107
|
if (!this.model.f_check_book_num){
|
85
|
-
this.$showMessage('
|
108
|
+
this.$showMessage('请选择目标安检册')
|
86
109
|
return
|
87
110
|
}
|
88
111
|
console.log(this.$parent.$refs.tabs.active)
|
@@ -90,6 +113,7 @@
|
|
90
113
|
console.log(this.$parent.bookAll)
|
91
114
|
console.log(this.$parent.bookCondition)
|
92
115
|
let userCondition = ''
|
116
|
+
let f_userinfo_ids = "'"
|
93
117
|
if(this.$parent.bookAll){
|
94
118
|
if(!this.$parent.bookCondition){
|
95
119
|
this.$showMessage("请先查询")
|
@@ -98,13 +122,27 @@
|
|
98
122
|
userCondition = this.$parent.bookCondition
|
99
123
|
}
|
100
124
|
}else if(this.$parent.bookList.length > 0){
|
101
|
-
|
102
|
-
|
125
|
+
if(this.$parent.$refs.tabs.active ===0){
|
126
|
+
for(let i = 0;i<this.$parent.bookList.length;i++){
|
127
|
+
if(i === this.$parent.bookList.length-1){
|
128
|
+
f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "'"
|
129
|
+
}else{
|
130
|
+
f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "','"
|
131
|
+
}
|
132
|
+
}
|
133
|
+
userCondition ='tui.f_userinfo_id in (' + f_userinfo_ids+ ')'
|
134
|
+
}
|
135
|
+
if(this.$parent.$refs.tabs.active ===1){
|
136
|
+
|
137
|
+
}
|
138
|
+
if(this.$parent.$refs.tabs.active ===2){
|
139
|
+
|
140
|
+
}
|
103
141
|
}else{
|
104
|
-
this.$showMessage(this.$parent.$refs.tabs.active===
|
142
|
+
this.$showMessage(this.$parent.$refs.tabs.active===3?'请选择用户':'请选择')
|
105
143
|
return;
|
106
144
|
}
|
107
|
-
if(this.$parent.$refs.tabs.active ===
|
145
|
+
if(this.$parent.$refs.tabs.active ===1){
|
108
146
|
new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
|
109
147
|
f_check_book_type:'小区',condition:userCondition}},
|
110
148
|
{resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
|
@@ -120,7 +158,27 @@
|
|
120
158
|
this.$showMessage("添加失败")
|
121
159
|
}
|
122
160
|
})
|
123
|
-
}else{
|
161
|
+
}else if(this.$parent.$refs.tabs.active ===0){
|
162
|
+
new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {
|
163
|
+
f_check_book_id: this.model.f_check_book_num,
|
164
|
+
f_check_book_type:'用户',
|
165
|
+
booklist:this.$parent.bookList,
|
166
|
+
condition:userCondition
|
167
|
+
}},
|
168
|
+
{resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
|
169
|
+
if(res && res.data){
|
170
|
+
this.model.f_check_book_num = ""
|
171
|
+
this.$showMessage("本次成功添加"+this.$parent.bookList.length+"个用户",['confirm']).then(res=>{
|
172
|
+
if(res==='confirm'){
|
173
|
+
console.log("刷新了")
|
174
|
+
bus.$emit('fresh-area')
|
175
|
+
}
|
176
|
+
})
|
177
|
+
}else{
|
178
|
+
this.$showMessage("添加失败")
|
179
|
+
}
|
180
|
+
})
|
181
|
+
} else{
|
124
182
|
new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
|
125
183
|
f_check_book_type:'单位',condition:userCondition}},
|
126
184
|
{resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
|
@@ -140,17 +198,36 @@
|
|
140
198
|
}
|
141
199
|
},
|
142
200
|
watch:{
|
143
|
-
'$parent.$refs.tabs.active'(val){
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
}
|
201
|
+
// '$parent.$refs.tabs.active'(val){
|
202
|
+
// if(val =='0'){
|
203
|
+
// this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
|
204
|
+
// }else{
|
205
|
+
// this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
|
206
|
+
// }
|
207
|
+
// this.model.f_check_book_num = ''
|
208
|
+
// }
|
151
209
|
},
|
152
210
|
computed: {
|
153
211
|
|
212
|
+
},
|
213
|
+
events: {
|
214
|
+
onFileUpload: function (file, res) {
|
215
|
+
if ( this.model.f_check_book_num==''){
|
216
|
+
this.$showMessage("请先选择目标安检册")
|
217
|
+
return
|
218
|
+
}
|
219
|
+
let data = {
|
220
|
+
f_check_book_id: this.model.f_check_book_num,
|
221
|
+
filepath: res.f_downloadpath
|
222
|
+
}
|
223
|
+
new HttpResetClass().load('POST','/api/af-safecheck/logic/checkbookImport', {data: data}, {
|
224
|
+
resolveMsg: '导入成功!',
|
225
|
+
rejectMsg: '导入失败'
|
226
|
+
}).then((res) => {
|
227
|
+
this.excelUserCondtion = false
|
228
|
+
})
|
229
|
+
},
|
230
|
+
|
154
231
|
}
|
155
232
|
}
|
156
233
|
</script>
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<validator name='v'>
|
4
4
|
<form class="form-horizontal" novalidate>
|
5
5
|
<ul class="nav nav-tabs" style="margin-bottom: 10px">
|
6
|
-
<li class="active"><a href="#"
|
6
|
+
<li class="active"><a href="#">安检册信息</a></li>
|
7
7
|
</ul>
|
8
8
|
<div class="row" style="margin-top: 10px">
|
9
9
|
<div class="col-sm-12 form-group" style="margin: 0">
|
@@ -38,43 +38,10 @@
|
|
38
38
|
close-on-select></v-select>
|
39
39
|
</div>
|
40
40
|
<div class="form-group col-sm-6" style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
|
41
|
-
<label class="font_normal_body"
|
41
|
+
<label class="font_normal_body">安检册名称</label>
|
42
42
|
<input type="text" class="input_search" v-model="checkBook.f_check_book_name"
|
43
43
|
style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
|
44
44
|
</div>
|
45
|
-
<div class="form-group col-sm-6" style="margin-top: 20px">
|
46
|
-
<label class="font_normal_body">执行日期</label>
|
47
|
-
<datepicker
|
48
|
-
:value.sync="checkBook.f_run_date"
|
49
|
-
style="width: 60%"
|
50
|
-
:format="'yyyy-MM-dd'"
|
51
|
-
v-model="checkBook.f_run_date"
|
52
|
-
>
|
53
|
-
</datepicker>
|
54
|
-
</div>
|
55
|
-
<div class="form-group col-sm-6" style="margin-top: 20px">
|
56
|
-
<label class="font_normal_body">执行周期</label>
|
57
|
-
<input type="number" class="input_search" v-model="checkBook.f_around_time"
|
58
|
-
style="width: 60%" >
|
59
|
-
</div>
|
60
|
-
<div class="form-group col-sm-6" style="margin-top: 20px">
|
61
|
-
<label class="font_normal_body">周期单位</label>
|
62
|
-
<v-select :value.sync="checkBook.f_around_unit" v-model='checkBook.f_around_unit'
|
63
|
-
:value-single="true" style="width: 60%"
|
64
|
-
class="select_list select"
|
65
|
-
:options='aroundUnit' placeholder=''
|
66
|
-
close-on-select></v-select>
|
67
|
-
</div>
|
68
|
-
|
69
|
-
|
70
|
-
<!-- <div class="form-group col-sm-6" style="margin-top: 20px">-->
|
71
|
-
<!-- <label class="font_normal_body">自动下发</label>-->
|
72
|
-
<!-- <v-select :value.sync="checkBook.f_is_auto" v-model='checkBook.f_is_auto'-->
|
73
|
-
<!-- :value-single="true" style="width: 60%"-->
|
74
|
-
<!-- class="select_list select"-->
|
75
|
-
<!-- :options='autos' placeholder=''-->
|
76
|
-
<!-- close-on-select></v-select>-->
|
77
|
-
<!-- </div>-->
|
78
45
|
</div>
|
79
46
|
</form>
|
80
47
|
<div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
|
@@ -150,7 +117,7 @@ export default {
|
|
150
117
|
},
|
151
118
|
confirm () {
|
152
119
|
if(!this.checkBook.f_check_book_name){
|
153
|
-
this.$showMessage('
|
120
|
+
this.$showMessage('请填写安检册名称')
|
154
121
|
return
|
155
122
|
}
|
156
123
|
// if(!this.checkBook.f_check_book_type){
|
@@ -168,15 +135,15 @@ export default {
|
|
168
135
|
console.log('checkbook', this.checkBook)
|
169
136
|
let http = new HttpResetClass()
|
170
137
|
http.load('POST', 'api/af-safecheck/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
|
171
|
-
{resolveMsg: '
|
138
|
+
{resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
|
172
139
|
if (res.data.code === 200) {
|
173
|
-
this.$showMessage('
|
140
|
+
this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
|
174
141
|
if (res==='confirm'){
|
175
142
|
bus.$emit('fresh-main')
|
176
143
|
}
|
177
144
|
})
|
178
145
|
}else{
|
179
|
-
this.$showMessage('
|
146
|
+
this.$showMessage('保存安检册信息失败')
|
180
147
|
}
|
181
148
|
})
|
182
149
|
},
|
@@ -2,15 +2,15 @@
|
|
2
2
|
<div id='checkbookEntry' class="flex-row binary">
|
3
3
|
<div class="binary-left">
|
4
4
|
<tabset v-ref:tabs :close="false" class="nav-tabss">
|
5
|
-
<tab header="小区查询">
|
6
|
-
<check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>
|
7
|
-
</tab>
|
8
|
-
<tab header="单位查询">
|
9
|
-
<check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>
|
10
|
-
</tab>
|
11
5
|
<tab header="用户查询">
|
12
6
|
<check-book-search-user @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-user>
|
13
7
|
</tab>
|
8
|
+
<!-- <tab header="小区查询">-->
|
9
|
+
<!-- <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>-->
|
10
|
+
<!-- </tab>-->
|
11
|
+
<!-- <tab header="单位查询">-->
|
12
|
+
<!-- <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>-->
|
13
|
+
<!-- </tab>-->
|
14
14
|
</tabset>
|
15
15
|
</div>
|
16
16
|
<div class="binary-right">
|
@@ -38,7 +38,6 @@
|
|
38
38
|
methods: {
|
39
39
|
setBookList(val){
|
40
40
|
console.log("555555")
|
41
|
-
// console.log("66666",val)
|
42
41
|
this.bookList = val
|
43
42
|
},
|
44
43
|
setBookAll(val){
|
@@ -16,41 +16,41 @@
|
|
16
16
|
</role-selector-safe>
|
17
17
|
</div>
|
18
18
|
<div :class="$parent.$parent.style">
|
19
|
-
<label class="font_normal_body"
|
19
|
+
<label class="font_normal_body">安检册名称</label>
|
20
20
|
<v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
|
21
21
|
:value-single="true" style="width: 60%"
|
22
22
|
class="select_list select"
|
23
|
-
:options='$parent.$parent.checkBooks' placeholder='
|
23
|
+
:options='$parent.$parent.checkBooks' placeholder='安检册名称'
|
24
24
|
close-on-select
|
25
25
|
condition="tcb.id ='{}'"></v-select>
|
26
26
|
</div>
|
27
|
-
<!-- <div :class="$parent.$parent.style">-->
|
28
|
-
<!-- <label class="font_normal_body">表册类型</label>-->
|
29
|
-
<!-- <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
|
30
|
-
<!-- :value-single="true" style="width: 60%"-->
|
31
|
-
<!-- class="select_list select"-->
|
32
|
-
<!-- :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
|
33
|
-
<!-- close-on-select-->
|
34
|
-
<!-- condition="tcb.f_check_book_type ='{}'"></v-select>-->
|
35
|
-
<!-- </div>-->
|
36
|
-
<!-- <div :class="$parent.$parent.style">-->
|
37
|
-
<!-- <label class="font_normal_body">用户类型</label>-->
|
38
|
-
<!-- <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
|
39
|
-
<!-- :value-single="true" style="width: 60%"-->
|
40
|
-
<!-- class="select_list select"-->
|
41
|
-
<!-- :options='$parent.$parent.userTypes' placeholder='用户类型'-->
|
42
|
-
<!-- close-on-select-->
|
43
|
-
<!-- condition="tcb.f_user_type ='{}'"></v-select>-->
|
44
|
-
<!-- </div>-->
|
27
|
+
<!-- <div :class="$parent.$parent.style">-->
|
28
|
+
<!-- <label class="font_normal_body">表册类型</label>-->
|
29
|
+
<!-- <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
|
30
|
+
<!-- :value-single="true" style="width: 60%"-->
|
31
|
+
<!-- class="select_list select"-->
|
32
|
+
<!-- :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
|
33
|
+
<!-- close-on-select-->
|
34
|
+
<!-- condition="tcb.f_check_book_type ='{}'"></v-select>-->
|
35
|
+
<!-- </div>-->
|
36
|
+
<!-- <div :class="$parent.$parent.style">-->
|
37
|
+
<!-- <label class="font_normal_body">用户类型</label>-->
|
38
|
+
<!-- <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
|
39
|
+
<!-- :value-single="true" style="width: 60%"-->
|
40
|
+
<!-- class="select_list select"-->
|
41
|
+
<!-- :options='$parent.$parent.userTypes' placeholder='用户类型'-->
|
42
|
+
<!-- close-on-select-->
|
43
|
+
<!-- condition="tcb.f_user_type ='{}'"></v-select>-->
|
44
|
+
<!-- </div>-->
|
45
45
|
<div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
|
46
46
|
<button type="button" class="button_search button_spacing" @click="search()">查询</button>
|
47
|
-
<button type="button" class="button_new button_spacing" @click="$parent.$parent.add()"
|
48
|
-
<button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true"
|
47
|
+
<button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
|
48
|
+
<button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
|
49
49
|
<div style="float: right" class="button_spacing"
|
50
50
|
v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
|
51
51
|
:class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
|
52
52
|
@click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
|
53
|
-
|
53
|
+
</div>
|
54
54
|
|
55
55
|
|
56
56
|
</div>
|
@@ -69,26 +69,26 @@
|
|
69
69
|
</role-selector-safe>
|
70
70
|
</div>
|
71
71
|
<div :class="$parent.$parent.style">
|
72
|
-
<label class="font_normal_body"
|
72
|
+
<label class="font_normal_body">安检册名</label>
|
73
73
|
<v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
|
74
74
|
:value-single="true" style="width: 60%"
|
75
75
|
class="select_list select"
|
76
|
-
:options='$parent.$parent.checkBooks' placeholder='
|
76
|
+
:options='$parent.$parent.checkBooks' placeholder='安检册名称'
|
77
77
|
close-on-select
|
78
78
|
condition="tcb.id ='{}'"></v-select>
|
79
79
|
</div>
|
80
80
|
<div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
|
81
81
|
<button type="button" class="button_search button_spacing" @click="search()">查询</button>
|
82
|
-
<button type="button" class="button_new button_spacing" @click="$parent.$parent.add()"
|
83
|
-
<button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true"
|
82
|
+
<button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
|
83
|
+
<button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
|
84
84
|
<div style="float: right" class="button_spacing"
|
85
85
|
v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
|
86
86
|
:class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
|
87
87
|
@click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
|
88
|
-
<!-- <div style="float: right" class="button_spacing"-->
|
89
|
-
<!-- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
|
90
|
-
<!-- @click="$parent.$parent.hidden()">-->
|
91
|
-
<!-- </div>-->
|
88
|
+
<!-- <div style="float: right" class="button_spacing"-->
|
89
|
+
<!-- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
|
90
|
+
<!-- @click="$parent.$parent.hidden()">-->
|
91
|
+
<!-- </div>-->
|
92
92
|
</div>
|
93
93
|
|
94
94
|
</div>
|
@@ -102,11 +102,11 @@
|
|
102
102
|
<nobr>所属安检员</nobr>
|
103
103
|
</th>
|
104
104
|
<th>
|
105
|
-
<nobr
|
105
|
+
<nobr>安检册名称</nobr>
|
106
106
|
</th>
|
107
|
-
<!-- <th>-->
|
108
|
-
<!-- <nobr
|
109
|
-
<!-- </th>-->
|
107
|
+
<!-- <th>-->
|
108
|
+
<!-- <nobr>安检册类型</nobr>-->
|
109
|
+
<!-- </th>-->
|
110
110
|
<th>
|
111
111
|
<nobr>用户类型</nobr>
|
112
112
|
</th>
|
@@ -116,15 +116,8 @@
|
|
116
116
|
<th>
|
117
117
|
<nobr>创建人</nobr>
|
118
118
|
</th>
|
119
|
-
|
120
|
-
<th>
|
121
|
-
<nobr>执行日期</nobr>
|
122
|
-
</th>
|
123
|
-
<th>
|
124
|
-
<nobr>执行周期</nobr>
|
125
|
-
</th>
|
126
119
|
<th>
|
127
|
-
<nobr
|
120
|
+
<nobr>用户数量</nobr>
|
128
121
|
</th>
|
129
122
|
<th>
|
130
123
|
<nobr>已下发</nobr>
|
@@ -132,38 +125,36 @@
|
|
132
125
|
<th>
|
133
126
|
<nobr>未下发</nobr>
|
134
127
|
</th>
|
135
|
-
<th>
|
128
|
+
<!-- <th>
|
136
129
|
<nobr>已检</nobr>
|
137
130
|
</th>
|
138
131
|
<th>
|
139
132
|
<nobr>未检</nobr>
|
140
|
-
</th
|
141
|
-
<!-- <th v-show="$parent.$parent.$parent.showCaoZuo">-->
|
142
|
-
<!-- <nobr>操作</nobr>-->
|
143
|
-
<!-- </th>-->
|
133
|
+
</th>-->
|
134
|
+
<!-- <th v-show="$parent.$parent.$parent.showCaoZuo">-->
|
135
|
+
<!-- <nobr>操作</nobr>-->
|
136
|
+
<!-- </th>-->
|
144
137
|
</tr>
|
145
138
|
</template>
|
146
139
|
<template partial='body'>
|
147
140
|
<td style="text-align: center;">{{ row.f_checker_name }}</td>
|
148
141
|
<td style="text-align: center;">{{ row.f_check_book_name }}</td>
|
149
|
-
<!-- <td style="text-align: center;">{{ row.f_check_book_type }}</td>-->
|
142
|
+
<!-- <td style="text-align: center;">{{ row.f_check_book_type }}</td>-->
|
150
143
|
<td style="text-align: center;">{{ row.f_user_type }}</td>
|
151
144
|
<td style="text-align: center;">{{ row.f_create_date }}</td>
|
152
145
|
<td style="text-align: center;">{{ row.f_create_person }}</td>
|
153
|
-
<td style="text-align: center;">{{
|
154
|
-
<td style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
|
155
|
-
<td style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.f_user_type==='民用'?row.num2:row.num3}}</b></button></td>
|
146
|
+
<td style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num}}</b></button></td>
|
156
147
|
<td style="text-align: center;">{{ row.xiafa }}</td>
|
157
148
|
<td style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
|
158
|
-
<td style="text-align: center;">{{ row.yijian }}</td>
|
159
|
-
<td style="text-align: center;">{{ row.weijian }}</td
|
160
|
-
<!-- <td v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
|
149
|
+
<!-- <td style="text-align: center;">{{ row.yijian }}</td>
|
150
|
+
<td style="text-align: center;">{{ row.weijian }}</td>-->
|
151
|
+
<!-- <td v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
|
161
152
|
</template>
|
162
153
|
</data-grid>
|
163
154
|
</criteria-paged>
|
164
155
|
<modal :show.sync="showModal" :backdrop="false" id="checkbookEntryShow">
|
165
156
|
<article slot="modal-body" class="modal-body">
|
166
|
-
<check-book-entry v-if="showModal" @select-changed="selectedEntry"></check-book-entry>
|
157
|
+
<check-book-entry v-if="showModal" @select-changed="selectedEntry" :showtype="showtype"></check-book-entry>
|
167
158
|
</article>
|
168
159
|
<footer slot="modal-footer">
|
169
160
|
</footer>
|
@@ -268,7 +259,7 @@ export default {
|
|
268
259
|
},
|
269
260
|
freshCheckBook () {
|
270
261
|
this.checkBooks = []
|
271
|
-
new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
|
262
|
+
new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999`, {
|
272
263
|
data: {
|
273
264
|
items: 'id,f_check_book_name',
|
274
265
|
tablename: 't_check_book',
|
@@ -278,10 +269,10 @@ export default {
|
|
278
269
|
}, {resolveMsg: null, rejectMsg: null}).then(res => {
|
279
270
|
this.checkBooks.push({label: '全部', value: ''})
|
280
271
|
res.data.forEach(ress => {
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
272
|
+
this.checkBooks.push({
|
273
|
+
label: ress.f_check_book_name,
|
274
|
+
value: ress.id
|
275
|
+
})
|
285
276
|
})
|
286
277
|
})
|
287
278
|
},
|
@@ -298,12 +289,12 @@ export default {
|
|
298
289
|
//tag
|
299
290
|
let http = new HttpResetClass()
|
300
291
|
http.load('POST', 'api/af-safecheck/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
|
301
|
-
{resolveMsg: '
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
292
|
+
{resolveMsg: '更新安检册信息成功', rejectMsg: '保存安检册信息成功'}).then(res=>{
|
293
|
+
if (res.data.code===200){
|
294
|
+
this.$showMessage('修改成功')
|
295
|
+
this.showModal = false
|
296
|
+
this.checkBook= {}
|
297
|
+
}
|
307
298
|
})
|
308
299
|
},
|
309
300
|
cancel () {
|
@@ -318,9 +309,7 @@ export default {
|
|
318
309
|
// //tag
|
319
310
|
this.$parent.showItem = false
|
320
311
|
this.$parent.showItemUser = false
|
321
|
-
|
322
|
-
args.condition += ` and f_orgid in ${this.model.f_filialeids}`
|
323
|
-
}
|
312
|
+
args.condition += ` and f_orgid in ${this.model.f_filialeids}`
|
324
313
|
args.condition += ` and tcb.f_user_type ='${this.showtype}' `
|
325
314
|
return this.model.search(args.condition, args.model)
|
326
315
|
},
|
@@ -334,9 +323,9 @@ export default {
|
|
334
323
|
let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
|
335
324
|
let delCheckBook= `delete from t_check_book where id ='${val.id}'`
|
336
325
|
await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
|
337
|
-
{resolveMsg: null, rejectMsg: '
|
326
|
+
{resolveMsg: null, rejectMsg: '删除安检册失败'})
|
338
327
|
await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delCheckBook}},
|
339
|
-
{resolveMsg: null, rejectMsg: '
|
328
|
+
{resolveMsg: null, rejectMsg: '删除安检册失败'})
|
340
329
|
this.$showMessage('删除成功')
|
341
330
|
this.$refs.paged.$refs.criteria.search()
|
342
331
|
}catch (e) {
|