safecheck-client 3.0.33-24 → 3.0.33-25
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 +3 -3
- package/src/filiale/fugou/pc/CheckBook.vue +2 -0
- package/src/filiale/fugou/pc/CheckBookList.vue +2 -2
- package/src/filiale/fugou/pc/CheckBookSearchUser.vue +17 -2
- package/src/filiale/fugou/pc/CheckBookUser.vue +47 -44
- package/src/filiale/fugou/pc/PlanManage.vue +1 -1
- package/src/filiale/fugou/pc/checkUserList.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": "3.0.33-
|
|
4
|
+
"version": "3.0.33-25",
|
|
5
5
|
"description": "安检模块 前端组件",
|
|
6
6
|
"author": "丁新 <417755458@qq.com>",
|
|
7
7
|
"license": "ISC",
|
|
@@ -103,13 +103,13 @@
|
|
|
103
103
|
"sketch-vue3": "^1.0.0",
|
|
104
104
|
"style": "0.0.3",
|
|
105
105
|
"style-loader": "^0.20.3",
|
|
106
|
-
"system-clients": "3.
|
|
106
|
+
"system-clients": "3.3.5",
|
|
107
107
|
"system-phone": "1.2.100",
|
|
108
108
|
"telephone-clients": "1.1.27",
|
|
109
109
|
"terser-webpack-plugin-legacy": "^1.2.5",
|
|
110
110
|
"url-loader": "^0.5.7",
|
|
111
111
|
"vue-amap": "0.5.10",
|
|
112
|
-
"vue-client": "1.
|
|
112
|
+
"vue-client": "1.25.8",
|
|
113
113
|
"vue-hot-reload-api": "^1.2.0",
|
|
114
114
|
"vue-html-loader": "^1.0.0",
|
|
115
115
|
"vue-loader": "^8.2.1",
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
<nobr>创建人</nobr>
|
|
118
118
|
</th>
|
|
119
119
|
<th>
|
|
120
|
-
<nobr
|
|
120
|
+
<nobr>用户数量</nobr>
|
|
121
121
|
</th>
|
|
122
122
|
<th>
|
|
123
123
|
<nobr>已下发</nobr>
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
<td style="text-align: center;">{{ row.f_user_type }}</td>
|
|
144
144
|
<td style="text-align: center;">{{ row.f_create_date }}</td>
|
|
145
145
|
<td style="text-align: center;">{{ row.f_create_person }}</td>
|
|
146
|
-
<td style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.
|
|
146
|
+
<td style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num2}}</b></button></td>
|
|
147
147
|
<td style="text-align: center;">{{ row.xiafa }}</td>
|
|
148
148
|
<td style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
|
|
149
149
|
<td style="text-align: center;">{{ row.yijian }}</td>
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
<v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
|
|
77
77
|
:options='$parent.$parent.meterbooks' placeholder='安检册'
|
|
78
78
|
:value-single="true"
|
|
79
|
-
condition="
|
|
79
|
+
condition="f_check_book_name='{}'"
|
|
80
80
|
style="width:60%"
|
|
81
81
|
close-on-select></v-select>
|
|
82
82
|
</div>
|
|
@@ -194,6 +194,18 @@
|
|
|
194
194
|
close-on-select>
|
|
195
195
|
</v-select>
|
|
196
196
|
</div>
|
|
197
|
+
<div class="col-sm-3 form-group">
|
|
198
|
+
<label class="font_normal_body">开户时间</label>
|
|
199
|
+
<datepicker
|
|
200
|
+
:value.sync="$parent.$parent.f_open_date"
|
|
201
|
+
placeholder='开户时间' style="width:60%"
|
|
202
|
+
:disabled-days-of-week="[]"
|
|
203
|
+
:format="'yyyy-MM-dd'"
|
|
204
|
+
:select-month="true"
|
|
205
|
+
v-model='model.f_open_date'
|
|
206
|
+
:show-rest-button="reset">
|
|
207
|
+
</datepicker>
|
|
208
|
+
</div>
|
|
197
209
|
</div>
|
|
198
210
|
</div>
|
|
199
211
|
</criteria>
|
|
@@ -294,7 +306,7 @@ export default {
|
|
|
294
306
|
f_filialeid: this.$login.f.orgid,
|
|
295
307
|
f_orgid: '',
|
|
296
308
|
invoiceuse: [{label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
|
|
297
|
-
model: new PagedList('
|
|
309
|
+
model: new PagedList('rs/sql/mb_peopleList', 20),
|
|
298
310
|
f_orgstr: this.$login.f.orgid,
|
|
299
311
|
// 要操作的用户
|
|
300
312
|
rowsdata: [],
|
|
@@ -419,6 +431,9 @@ export default {
|
|
|
419
431
|
let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
|
|
420
432
|
args.condition = `${args.condition} ` + f_orgstr
|
|
421
433
|
// args.condition += ` and f_orgid = ${this.f_orgstr}`
|
|
434
|
+
if(args.model.f_open_date){
|
|
435
|
+
args.condition += ` and f_open_date <='${args.model.f_open_date}' `
|
|
436
|
+
}
|
|
422
437
|
this.condition = args.condition
|
|
423
438
|
this.$parent.condition = this.condition
|
|
424
439
|
this.model.search(args.condition, args.model)
|
|
@@ -4,36 +4,47 @@
|
|
|
4
4
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
6
|
<div class="row">
|
|
7
|
-
<div class="form-group col-sm-3"
|
|
7
|
+
<div class="form-group col-sm-3">
|
|
8
8
|
<label class="font_normal_body">客户编号</label>
|
|
9
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
9
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
10
|
+
placeholder='客户编号'
|
|
10
11
|
condition="f_userinfo_code = '{}'" @keyup.enter="search()">
|
|
11
12
|
</div>
|
|
12
|
-
<div class="form-group col-sm-2 button-range"
|
|
13
|
-
<button class="button_search" style="margin-right: 10px"
|
|
13
|
+
<div class="form-group col-sm-2 button-range">
|
|
14
|
+
<button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
|
|
14
15
|
|
|
15
16
|
</div>
|
|
16
17
|
</div>
|
|
17
18
|
</div>
|
|
18
19
|
</criteria>
|
|
19
|
-
<data-grid :model="model" class="table_sy"
|
|
20
|
-
<template partial='head'
|
|
20
|
+
<data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
|
|
21
|
+
<template partial='head'>
|
|
21
22
|
<tr>
|
|
22
|
-
<th
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
<th
|
|
26
|
-
|
|
23
|
+
<th>
|
|
24
|
+
<nobr>序号</nobr>
|
|
25
|
+
</th>
|
|
26
|
+
<th>
|
|
27
|
+
<nobr>用户编号</nobr>
|
|
28
|
+
</th>
|
|
29
|
+
<th>
|
|
30
|
+
<nobr>用户姓名</nobr>
|
|
31
|
+
</th>
|
|
32
|
+
<th>
|
|
33
|
+
<nobr>用户电话</nobr>
|
|
34
|
+
</th>
|
|
35
|
+
<th>
|
|
36
|
+
<nobr>用户地址</nobr>
|
|
37
|
+
</th>
|
|
27
38
|
|
|
28
39
|
</tr>
|
|
29
40
|
</template>
|
|
30
|
-
<template partial='body'
|
|
31
|
-
<tr
|
|
32
|
-
<td style="text-align:center;">{{$index+1}}</td>
|
|
33
|
-
|
|
34
|
-
<td style="text-align:center">{{row.f_user_name}}</td>
|
|
35
|
-
<td style="text-align:center">{{row.f_user_phone}}</td>
|
|
36
|
-
<td style="text-align:center">{{row.f_address}}</td>
|
|
41
|
+
<template partial='body'>
|
|
42
|
+
<tr>
|
|
43
|
+
<td style="text-align:center;">{{ $index + 1 }}</td>
|
|
44
|
+
<td style="text-align:center">{{ row.f_userinfo_code }}</td>
|
|
45
|
+
<td style="text-align:center">{{ row.f_user_name }}</td>
|
|
46
|
+
<td style="text-align:center">{{ row.f_user_phone }}</td>
|
|
47
|
+
<td style="text-align:center">{{ row.f_address }}</td>
|
|
37
48
|
</tr>
|
|
38
49
|
</template>
|
|
39
50
|
<template partial='foot'></template>
|
|
@@ -48,49 +59,41 @@ import {PagedList} from 'vue-client'
|
|
|
48
59
|
export default {
|
|
49
60
|
title: '安检记录列表',
|
|
50
61
|
props: ['row'],
|
|
51
|
-
data
|
|
62
|
+
data() {
|
|
52
63
|
return {
|
|
53
64
|
rowdata: this.row,
|
|
54
|
-
model: new PagedList('rs/sql/
|
|
65
|
+
model: new PagedList('rs/sql/safe_singleTable_OrderBy', 50,
|
|
66
|
+
{
|
|
67
|
+
items: '"tua.f_address,tui.f_userinfo_code,tui.f_user_name,tui.f_user_phone"',
|
|
68
|
+
tablename: '"t_user_address tua left join t_userinfo tui on tua.f_userinfo_id = tui.f_userinfo_id"',
|
|
69
|
+
orderitem: '"tua.id desc"'
|
|
70
|
+
}
|
|
71
|
+
)
|
|
55
72
|
}
|
|
56
73
|
},
|
|
57
|
-
ready(){
|
|
58
|
-
if(this.row){
|
|
59
|
-
let condition=''
|
|
60
|
-
|
|
61
|
-
this.model.url = 'rs/sql/getUserByCheckBook'
|
|
62
|
-
condition = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
|
|
63
|
-
}else{
|
|
64
|
-
this.model.url = 'rs/sql/getUserByCheckBookCompany'
|
|
65
|
-
condition = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
|
|
66
|
-
}
|
|
74
|
+
ready() {
|
|
75
|
+
if (this.row) {
|
|
76
|
+
let condition = ''
|
|
77
|
+
condition = `tua.f_check_book_id =${this.row.id}`
|
|
67
78
|
this.model.search(condition)
|
|
68
79
|
//只显示用户页面
|
|
69
|
-
this.row.f_check_book_type='用户'
|
|
80
|
+
this.row.f_check_book_type = '用户'
|
|
70
81
|
}
|
|
71
82
|
},
|
|
72
83
|
watch: {
|
|
73
|
-
'row'
|
|
84
|
+
'row'(val) {
|
|
74
85
|
if (val) {
|
|
75
86
|
this.rowdata = val
|
|
76
|
-
let condition=''
|
|
77
|
-
|
|
78
|
-
condition = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
|
|
79
|
-
}else{
|
|
80
|
-
condition = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
|
|
81
|
-
}
|
|
87
|
+
let condition = ''
|
|
88
|
+
condition = `tua.f_check_book_id =${val.id} `
|
|
82
89
|
this.model.search(condition)
|
|
83
90
|
}
|
|
84
91
|
}
|
|
85
92
|
},
|
|
86
93
|
methods: {
|
|
87
|
-
selfSearch
|
|
94
|
+
selfSearch(args) {
|
|
88
95
|
if (this.rowdata.id) {
|
|
89
|
-
|
|
90
|
-
args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
|
|
91
|
-
}else{
|
|
92
|
-
args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
|
|
93
|
-
}
|
|
96
|
+
args.condition += `and tua.f_check_book_id =${this.rowdata.id}`
|
|
94
97
|
this.model.search(args.condition)
|
|
95
98
|
} else {
|
|
96
99
|
this.$showMessage('请选择片区')
|
|
@@ -412,7 +412,7 @@
|
|
|
412
412
|
value-single>
|
|
413
413
|
</v-select>
|
|
414
414
|
</div>
|
|
415
|
-
<div class="form-group col-sm-4"
|
|
415
|
+
<div class="form-group col-sm-4" >
|
|
416
416
|
<label class="font_normal_body">结束时间:</label>
|
|
417
417
|
<datepicker
|
|
418
418
|
:value.sync="upCheckPlan.f_end_time"
|