safecheck-client 3.0.39-12 → 3.0.39-14

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "safecheck-client",
3
3
  "//": "主分支版本别乱升,测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包,不要频繁升级第三位版本号),别提交版本号。切了分支切记把主分支版本升了,保证主分支始终是最高版本!!!!!",
4
- "version": "3.0.39-12",
4
+ "version": "3.0.39-14",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
@@ -104,13 +104,13 @@
104
104
  "sinon-chai": "^2.8.0",
105
105
  "style": "0.0.3",
106
106
  "style-loader": "^0.20.3",
107
- "system-clients": "3.2.95-temp",
107
+ "system-clients": "3.2.1-10-kelai",
108
108
  "system-phone": "1.2.100",
109
109
  "telephone-clients": "1.1.27",
110
110
  "terser-webpack-plugin-legacy": "^1.2.5",
111
111
  "url-loader": "^0.5.7",
112
112
  "vue-amap": "0.5.10",
113
- "vue-client": "1.25.33",
113
+ "vue-client": "1.24.140-kelai",
114
114
  "vue-hot-reload-api": "^1.2.0",
115
115
  "vue-html-loader": "^1.0.0",
116
116
  "vue-loader": "^8.2.1",
@@ -1,214 +1,248 @@
1
- <template>
2
- <criteria-paged :model="model" v-ref:paged>
3
- <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
4
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
5
- <div class="row">
6
- <div class="col-sm-4 form-group">
7
- <role-selector-safe
8
- role-name="安检员"
9
- role-lable="安&nbsp;检&nbsp;员&nbsp;"
10
- @re-res="$parent.$parent.getRes"
11
- :value.sync="model.f_checker_name"
12
- v-model="model.f_checker_name"
13
- condition="f_checker_name = '{}'">
14
- </role-selector-safe>
15
- </div>
16
- <div class="col-sm-2 form-group">
17
- <label class="font_normal_body">处理状态</label>
18
- <v-select v-model="model.f_orderstate" style="width:60%"
19
- placeholder='处理状态'
20
- :value.sync="model.f_orderstate"
21
- :options='$parent.$parent.getState'
22
- condition= "f_orderstate like '%{}%'"
23
- close-on-select value-single>
24
- </v-select>
25
- </div>
26
- <div class="col-sm-2 form-group">
27
- <label class="font_normal_body">安检项</label>
28
- <input type="text" class="input_search"
29
- style="width:60%"
30
- v-model="model.f_device_type"
31
- condition="f_device_type like '%{}%'"
32
- placeholder="安检项"/>
33
- </div>
34
- <div class="form-group col-sm-2">
35
- <label class="font_normal_body">区域</label>
36
- <v-select class="select_list select"
37
- placeholder='请选择' style="width: 60%"
38
- :value.sync="model.f_pcd" v-model="model.f_pcd"
39
- :options='$parent.$parent.pcds'
40
- filer-key="name"
41
- close-on-select clear-button
42
- condition="f_pcd='{}'"
43
- :value-single="true">
44
- </v-select>
45
- </div>
46
- <div class="span col-sm-2 form-group button-range" style="float: right">
47
- <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
48
- <button class="button_clear button_spacing" @click="clear">清空</button>
49
- <div style="float: right" class="button_spacing" :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}" @click="criteriaShow = !criteriaShow"></div>
50
- <div style="float: right" class="button_spacing"
51
- :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
52
- @click="$parent.$parent.hiddenr()"></div>
53
- </div>
54
- <div class="row" v-show="criteriaShow">
55
- <div class="col-sm-2 form-group">
56
- <label class="font_normal_body">用户姓名</label>
57
- <input type="text" class="input_search"
58
- style="width:60%"
59
- v-model="model.f_user_name"
60
- condition="f_user_name like '%{}%'"
61
- placeholder="用户姓名"/>
62
- </div>
63
- <div class="col-sm-2 form-group">
64
- <label class="font_normal_body">用户编号</label>
65
- <input type="text" class="input_search"
66
- style="width:60%"
67
- v-model="model.f_userinfo_code"
68
- condition="f_userinfo_code = '{}'"
69
- placeholder="用户编号"/>
70
- </div>
71
- </div>
72
- </div>
73
- </div>
74
- </criteria>
75
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
76
- <template partial='head'>
77
- <tr>
78
- <th><nobr>用户编号</nobr></th>
79
- <th><nobr>用户姓名</nobr></th>
80
- <!--<th><nobr>联&ensp;系&ensp;人</nobr></th>-->
81
- <!-- <th>用户表号</th>-->
82
- <th><nobr>联系电话</nobr></th>
83
- <th><nobr>详细地址</nobr></th>
84
- <th><nobr>备注信息</nobr></th>
85
- <th><nobr>整改时间</nobr></th>
86
- <th><nobr>安检人</nobr></th>
87
- <th><nobr>隐患名称</nobr></th>
88
- <th><nobr>安检时间</nobr></th>
89
- <th><nobr>处理状态</nobr></th>
90
- <th><nobr>处&ensp;理&ensp;人</nobr></th>
91
- <th><nobr>处理时间</nobr></th>
92
- <th><nobr>处理意见</nobr></th>
93
- </tr>
94
- </template>
95
- <template partial='body'>
96
- <tr>
97
- <td style="text-align:center">{{row.f_userinfo_code}}</td>
98
- <td style="text-align:center">{{row.f_user_name}}</td>
99
- <!--<td style="text-align:center">{{row.f_contact}}</td>-->
100
- <!-- <td style="text-align:center">{{row.f_meternumber}}</td>-->
101
- <td style="text-align:center">{{row.f_phone}}</td>
102
- <td style="text-align:center">{{row.f_address}}</td>
103
- <td style="text-align:center">{{row.f_orderremark}}</td>
104
- <td style="text-align:center">{{row.f_orderdate}}</td>
105
- <td style="text-align:center">{{row.f_checker_name}}</td>
106
- <td style="text-align:center">{{row.f_item_name}}</td>
107
- <td style="text-align:center">{{row.f_onsite_time}}</td>
108
- <td style="text-align:center" v-if="row.f_orderstate === '待处理'">{{ row.f_orderstate }}</td>
109
- <td style="text-align:center" v-if="row.f_orderstate === '预约成功'">{{ '审核通过' }}</td>
110
- <td style="text-align:center" v-if="row.f_orderstate === '预约失败'">{{ '审核未通过' }}</td>
111
- <td style="text-align:center">{{row.f_dispose_operator || '***'}}</td>
112
- <td style="text-align:center">{{row.f_disposedate || '*** *** ***'}}</td>
113
- <td style="text-align:center;cursor: pointer;">
114
- <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.showSuggest(row.f_suggest)">点击查看</button>
115
- </td>
116
- </tr>
117
- </template>
118
- <template partial='foot'></template>
119
- </data-grid>
120
- </criteria-paged>
121
-
122
- <modal :show.sync="suggetsShow" v-ref:model width="30%">
123
- <header slot="modal-header" class="modal-header">
124
- <h4 class="modal-title">处理意见</h4>
125
- </header>
126
- <article slot="modal-body" class="modal-body">
127
- <div class="form-group">
128
- <p>{{f_suggest}}</p>
129
- </div>
130
- </article>
131
- <div slot="modal-footer" class="modal-footer">
132
- <button type="button" class="btn btn-default" @click="close()">关闭</button>
133
- </div>
134
- </modal>
135
- </template>
136
-
137
- <script>
138
- import {HttpResetClass, PagedList} from 'vue-client'
139
- export default {
140
- data () {
141
- return {
142
- model: new PagedList('/rs/sql/queryOrderCenterSafe',20, {tablename: '`t_order_center`',items: '`*`',orderitem: '`f_orderdate`'},
143
- null,null,null),
144
- f_orgids: this.$login.f.orgid,
145
- // f_orgids: '1522.255', //测试使用
146
- suggetsShow: false,
147
- f_suggest: '',
148
-
149
- curorgid: [this.$login.f.orgid],
150
- f_orgid: '',
151
- sliceArea: [],
152
- pcds: []
153
- }
154
- },
155
- ready(){
156
- // 默认查询待处理状态预约
157
- this.search()
158
- },
159
- methods: {
160
- getPcds(val) {
161
- this.pcds = [{label: '全部', value: ''}]
162
- new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
163
- {data: {items: "*", tablename: "t_pcd", orderitem: "id", condition: `f_orgid in ${val}`}},
164
- {resolveMsg: null, rejectMsg: null}).then((pcdlist) => {
165
- pcdlist.data.forEach((result) => {
166
- this.pcds.push({label: result.f_pcd, value: result.f_pcd})
167
- })
168
- })
169
- },
170
- search () {
171
- this.$refs.paged.$refs.criteria.search()
172
- },
173
- selfSearch (args) {
174
- if (!this.f_orgid) {
175
- // this.getorg(this.curorgid)
176
- this.f_orgid = this.$login.convertToIn(this.curorgid);
177
- }
178
- args.condition = `${args.condition} and f_orgstr in ${this.f_orgid}`
179
- this.model.search(args.condition, args.model)
180
- },
181
- // 显示处理意见
182
- showSuggest (f_suggest) {
183
- this.f_suggest = f_suggest
184
- this.suggetsShow = true
185
- },
186
- close () {
187
- this.suggetsShow = false
188
- },
189
- hiddenr() {
190
- this.$parent.showItem = !this.$parent.showItem
191
- },
192
- getRes(obj) {
193
- this.f_orgid = this.$login.convertToIn(obj.resids);
194
- this.getPcds(this.f_orgid)
195
- this.$refs.paged.$refs.criteria.model.f_pcd = ''
196
- }
197
- },
198
- computed: {
199
- getState () {
200
- return [{label: '全部', value: ''},{label: '待处理', value: '待处理'},{label: '审核通过', value: '预约成功'},{label: '审核未通过', value: '预约失败'}]
201
- },
202
- orderType () {
203
- return [{label: '全部', value: ''},...this.$appdata.getParam('预约类型')]
204
- }
205
- },
206
- watch: {
207
- 'sliceArea' () {
208
- this.model.model.f_slice_area = ''
209
- }
210
- }
211
- }
212
- </script>
213
- <style lang="less" >
214
- </style>
1
+ <template>
2
+ <criteria-paged :model="model" v-ref:paged>
3
+ <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
4
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
5
+ <div class="row">
6
+ <div class="col-sm-4 form-group">
7
+ <role-selector-safe
8
+ role-name="安检员"
9
+ role-lable="安&nbsp;检&nbsp;员&nbsp;"
10
+ @re-res="$parent.$parent.getRes"
11
+ :value.sync="model.f_checker_name"
12
+ v-model="model.f_checker_name"
13
+ condition="f_checker_name = '{}'">
14
+ </role-selector-safe>
15
+ </div>
16
+ <div class="col-sm-2 form-group">
17
+ <label class="font_normal_body">处理状态</label>
18
+ <v-select v-model="model.f_orderstate" style="width:60%"
19
+ placeholder='处理状态'
20
+ :value.sync="model.f_orderstate"
21
+ :options='$parent.$parent.getState'
22
+ condition= "f_orderstate like '%{}%'"
23
+ close-on-select value-single>
24
+ </v-select>
25
+ </div>
26
+ <div class="col-sm-2 form-group">
27
+ <label class="font_normal_body">安检项</label>
28
+ <input type="text" class="input_search"
29
+ style="width:60%"
30
+ v-model="model.f_device_type"
31
+ condition="f_device_type like '%{}%'"
32
+ placeholder="安检项"/>
33
+ </div>
34
+ <div class="form-group col-sm-2">
35
+ <label class="font_normal_body">区域</label>
36
+ <v-select class="select_list select"
37
+ placeholder='请选择' style="width: 60%"
38
+ :value.sync="model.f_pcd" v-model="model.f_pcd"
39
+ :options='$parent.$parent.pcds'
40
+ filer-key="name"
41
+ close-on-select clear-button
42
+ condition="f_pcd='{}'"
43
+ :value-single="true">
44
+ </v-select>
45
+ </div>
46
+ <div class="span col-sm-2 form-group button-range" style="float: right">
47
+ <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
48
+ <button class="button_clear button_spacing" @click="clear">清空</button>
49
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}" @click="criteriaShow = !criteriaShow"></div>
50
+ <div style="float: right" class="button_spacing"
51
+ :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
52
+ @click="$parent.$parent.hiddenr()"></div>
53
+ </div>
54
+ <div class="row" v-show="criteriaShow">
55
+ <div class="col-sm-2 form-group">
56
+ <label class="font_normal_body">用户姓名</label>
57
+ <input type="text" class="input_search"
58
+ style="width:60%"
59
+ v-model="model.f_user_name"
60
+ condition="f_user_name like '%{}%'"
61
+ placeholder="用户姓名"/>
62
+ </div>
63
+ <div class="col-sm-2 form-group">
64
+ <label class="font_normal_body">用户编号</label>
65
+ <input type="text" class="input_search"
66
+ style="width:60%"
67
+ v-model="model.f_userinfo_code"
68
+ condition="f_userinfo_code = '{}'"
69
+ placeholder="用户编号"/>
70
+ </div>
71
+ <div class="col-sm-2 form-group">
72
+ <label class="font_normal_body">网&ensp;格&ensp;员</label>
73
+ <v-select class="select_list select"
74
+ placeholder='请选择' style="width: 60%"
75
+ :value.sync="model.f_book_checker" v-model="model.f_book_checker"
76
+ :options='$parent.$parent.users'
77
+ filer-key="name"
78
+ close-on-select clear-button
79
+ condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
80
+ :value-single="true">
81
+ </v-select>
82
+ </div>
83
+ </div>
84
+ </div>
85
+ </div>
86
+ </criteria>
87
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
88
+ <template partial='head'>
89
+ <tr>
90
+ <th><nobr>用户编号</nobr></th>
91
+ <th><nobr>用户姓名</nobr></th>
92
+ <!--<th><nobr>联&ensp;系&ensp;人</nobr></th>-->
93
+ <!-- <th>用户表号</th>-->
94
+ <th><nobr>联系电话</nobr></th>
95
+ <th><nobr>详细地址</nobr></th>
96
+ <th><nobr>备注信息</nobr></th>
97
+ <th><nobr>整改时间</nobr></th>
98
+ <th><nobr>安检人</nobr></th>
99
+ <th><nobr>隐患名称</nobr></th>
100
+ <th><nobr>安检时间</nobr></th>
101
+ <th><nobr>处理状态</nobr></th>
102
+ <th><nobr>处&ensp;理&ensp;人</nobr></th>
103
+ <th><nobr>处理时间</nobr></th>
104
+ <th><nobr>处理意见</nobr></th>
105
+ </tr>
106
+ </template>
107
+ <template partial='body'>
108
+ <tr>
109
+ <td style="text-align:center">{{row.f_userinfo_code}}</td>
110
+ <td style="text-align:center">{{row.f_user_name}}</td>
111
+ <!--<td style="text-align:center">{{row.f_contact}}</td>-->
112
+ <!-- <td style="text-align:center">{{row.f_meternumber}}</td>-->
113
+ <td style="text-align:center">{{row.f_phone}}</td>
114
+ <td style="text-align:center">{{row.f_address}}</td>
115
+ <td style="text-align:center">{{row.f_orderremark}}</td>
116
+ <td style="text-align:center">{{row.f_orderdate}}</td>
117
+ <td style="text-align:center">{{row.f_checker_name}}</td>
118
+ <td style="text-align:center">{{row.f_item_name}}</td>
119
+ <td style="text-align:center">{{row.f_onsite_time}}</td>
120
+ <td style="text-align:center" v-if="row.f_orderstate === '待处理'">{{ row.f_orderstate }}</td>
121
+ <td style="text-align:center" v-if="row.f_orderstate === '预约成功'">{{ '审核通过' }}</td>
122
+ <td style="text-align:center" v-if="row.f_orderstate === '预约失败'">{{ '审核未通过' }}</td>
123
+ <td style="text-align:center">{{row.f_dispose_operator || '***'}}</td>
124
+ <td style="text-align:center">{{row.f_disposedate || '*** *** ***'}}</td>
125
+ <td style="text-align:center;cursor: pointer;">
126
+ <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.showSuggest(row.f_suggest)">点击查看</button>
127
+ </td>
128
+ </tr>
129
+ </template>
130
+ <template partial='foot'></template>
131
+ </data-grid>
132
+ </criteria-paged>
133
+
134
+ <modal :show.sync="suggetsShow" v-ref:model width="30%">
135
+ <header slot="modal-header" class="modal-header">
136
+ <h4 class="modal-title">处理意见</h4>
137
+ </header>
138
+ <article slot="modal-body" class="modal-body">
139
+ <div class="form-group">
140
+ <p>{{f_suggest}}</p>
141
+ </div>
142
+ </article>
143
+ <div slot="modal-footer" class="modal-footer">
144
+ <button type="button" class="btn btn-default" @click="close()">关闭</button>
145
+ </div>
146
+ </modal>
147
+ </template>
148
+
149
+ <script>
150
+ import {HttpResetClass, PagedList} from 'vue-client'
151
+ export default {
152
+ data () {
153
+ return {
154
+ model: new PagedList('/rs/sql/queryOrderCenterSafe',20, {tablename: '`t_order_center`',items: '`*`',orderitem: '`f_orderdate`'},
155
+ null,null,null),
156
+ f_orgids: this.$login.f.orgid,
157
+ // f_orgids: '1522.255', //测试使用
158
+ suggetsShow: false,
159
+ f_suggest: '',
160
+ users:[{label: '全部', value: ''}],
161
+
162
+ curorgid: [this.$login.f.orgid],
163
+ f_orgid: '',
164
+ sliceArea: [],
165
+ pcds: []
166
+ }
167
+ },
168
+ ready(){
169
+ // 默认查询待处理状态预约
170
+ this.search()
171
+ this.initBookChecker()
172
+ },
173
+ methods: {
174
+ initBookChecker(){
175
+ new HttpResetClass().load('POST', '/rs/search', {
176
+ data: {
177
+ source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
178
+ userid: this.$login.f.id
179
+ }
180
+ }, {resolveMsg: null, rejectMsg: null}).then(res=>{
181
+ let data = res.data
182
+ const addedNames = new Set()
183
+ this.users = []
184
+ data.forEach(user => {
185
+ if (user.state === '在职') {
186
+ if (!addedNames.has(user.name)) {
187
+ this.users.push({ label: user.name, value: user.name })
188
+ addedNames.add(user.name)
189
+ }
190
+ }
191
+ });
192
+ })
193
+ },
194
+ getPcds(val) {
195
+ this.pcds = [{label: '全部', value: ''}]
196
+ new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
197
+ {data: {items: "*", tablename: "t_pcd", orderitem: "id", condition: `f_orgid in ${val}`}},
198
+ {resolveMsg: null, rejectMsg: null}).then((pcdlist) => {
199
+ pcdlist.data.forEach((result) => {
200
+ this.pcds.push({label: result.f_pcd, value: result.f_pcd})
201
+ })
202
+ })
203
+ },
204
+ search () {
205
+ this.$refs.paged.$refs.criteria.search()
206
+ },
207
+ selfSearch (args) {
208
+ if (!this.f_orgid) {
209
+ // this.getorg(this.curorgid)
210
+ this.f_orgid = this.$login.convertToIn(this.curorgid);
211
+ }
212
+ args.condition = `${args.condition} and f_orgstr in ${this.f_orgid}`
213
+ this.model.search(args.condition, args.model)
214
+ },
215
+ // 显示处理意见
216
+ showSuggest (f_suggest) {
217
+ this.f_suggest = f_suggest
218
+ this.suggetsShow = true
219
+ },
220
+ close () {
221
+ this.suggetsShow = false
222
+ },
223
+ hiddenr() {
224
+ this.$parent.showItem = !this.$parent.showItem
225
+ },
226
+ getRes(obj) {
227
+ this.f_orgid = this.$login.convertToIn(obj.resids);
228
+ this.getPcds(this.f_orgid)
229
+ this.$refs.paged.$refs.criteria.model.f_pcd = ''
230
+ }
231
+ },
232
+ computed: {
233
+ getState () {
234
+ return [{label: '全部', value: ''},{label: '待处理', value: '待处理'},{label: '审核通过', value: '预约成功'},{label: '审核未通过', value: '预约失败'}]
235
+ },
236
+ orderType () {
237
+ return [{label: '全部', value: ''},...this.$appdata.getParam('预约类型')]
238
+ }
239
+ },
240
+ watch: {
241
+ 'sliceArea' () {
242
+ this.model.model.f_slice_area = ''
243
+ }
244
+ }
245
+ }
246
+ </script>
247
+ <style lang="less" >
248
+ </style>