system-clients 3.3.5 → 3.3.6
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/.gradle/8.5/checksums/checksums.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.5/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/gradle/wrapper/gradle-wrapper.properties +7 -0
- package/gradlew +249 -0
- package/gradlew.bat +92 -0
- package/package.json +105 -105
- package/src/components/server/Login.vue +615 -615
- package/src/components/server/ResSelect.vue +3 -0
- package/src/filiale/bayan/PosAdd.vue +245 -200
- package/src/filiale/bayan/PosList.vue +187 -143
- package/src/plugins/GetLoginInfoService.js +480 -480
- package/src/system.js +122 -122
@@ -6,12 +6,8 @@
|
|
6
6
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
7
7
|
<div class="row">
|
8
8
|
<div class="col-sm-3 form-group">
|
9
|
-
<label class="font_normal_body">公&
|
10
|
-
<
|
11
|
-
is-mul="false"
|
12
|
-
@res-select="$parent.$parent.getorg"
|
13
|
-
:initresid="$parent.$parent.curorgid">
|
14
|
-
</res-select>
|
9
|
+
<label class="font_normal_body">公  司 </label>
|
10
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
15
11
|
</div>
|
16
12
|
<div class="col-sm-3 form-group">
|
17
13
|
<label class="font_normal_body">设备编号</label>
|
@@ -35,9 +31,21 @@
|
|
35
31
|
</div>
|
36
32
|
</div>
|
37
33
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
34
|
+
<div class="col-sm-3 form-group">
|
35
|
+
<label class="font_normal_body">所属部门</label>
|
36
|
+
<res-select restype='department'
|
37
|
+
:is-mul="false"
|
38
|
+
@res-select="$parent.$parent.getdep"
|
39
|
+
:parentresid="$parent.$parent.depresid">
|
40
|
+
</res-select>
|
41
|
+
</div>
|
38
42
|
<div class="col-sm-3 form-group">
|
39
43
|
<label class="font_normal_body">所属人员</label>
|
40
|
-
<
|
44
|
+
<res-select restype='user'
|
45
|
+
@res-select="$parent.$parent.getuser"
|
46
|
+
:is-mul="false"
|
47
|
+
:parentresid="$parent.$parent.userresid">
|
48
|
+
</res-select>
|
41
49
|
</div>
|
42
50
|
<div class="col-sm-3 form-group">
|
43
51
|
<label class="font_normal_body">所在地</label>
|
@@ -56,8 +64,14 @@
|
|
56
64
|
</div>
|
57
65
|
<div class="col-sm-3 form-group">
|
58
66
|
<label class="font_normal_body">所属银行</label>
|
59
|
-
<
|
60
|
-
|
67
|
+
<v-select id="f_charge_type"
|
68
|
+
v-model="model.f_bank_name"
|
69
|
+
placeholder='所属银行'
|
70
|
+
:value.sync="model.f_bank_name"
|
71
|
+
:options='$parent.$parent.bankAffiliation'
|
72
|
+
condition="f_bank_name = '{}'"
|
73
|
+
close-on-select clear-button>
|
74
|
+
</v-select>
|
61
75
|
</div>
|
62
76
|
<div class="col-sm-3 form-group">
|
63
77
|
<label class="font_normal_body">联系电话</label>
|
@@ -75,15 +89,16 @@
|
|
75
89
|
<th style="text-align:center;white-space:nowrap;">设备编号</th>
|
76
90
|
<th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
|
77
91
|
<th style="text-align:center;white-space:nowrap;">设备名称</th>
|
78
|
-
<th style="text-align:center;white-space:nowrap;">所属公司</th
|
92
|
+
<!-- <th style="text-align:center;white-space:nowrap;">所属公司</th>-->
|
79
93
|
<th style="text-align:center;white-space:nowrap;">所属部门</th>
|
80
94
|
<th style="text-align:center;white-space:nowrap;">所属人员</th>
|
81
95
|
<th style="text-align:center;white-space:nowrap;">状态</th>
|
82
96
|
<th style="text-align:center;white-space:nowrap;">联系电话</th>
|
83
97
|
<th style="text-align:center;white-space:nowrap;">所在地</th>
|
84
98
|
<th style="text-align:center;white-space:nowrap;">所属银行</th>
|
85
|
-
<th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th
|
86
|
-
<!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
|
99
|
+
<!-- <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>-->
|
100
|
+
<!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
|
101
|
+
<th style="text-align:center;white-space:nowrap;">备注</th>
|
87
102
|
<th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
|
88
103
|
<th style="text-align:center;white-space:nowrap;">失联状态</th>
|
89
104
|
<th style="text-align:center;white-space:nowrap;">操作</th>
|
@@ -96,7 +111,7 @@
|
|
96
111
|
<td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
|
97
112
|
<td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
|
98
113
|
<td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
|
99
|
-
<td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td
|
114
|
+
<!-- <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>-->
|
100
115
|
<td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
|
101
116
|
<td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
|
102
117
|
|
@@ -104,8 +119,9 @@
|
|
104
119
|
<td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
|
105
120
|
<td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
|
106
121
|
<td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
|
107
|
-
<td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td
|
108
|
-
<!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
|
122
|
+
<!-- <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>-->
|
123
|
+
<!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
|
124
|
+
<td style="text-align:center;white-space:nowrap;">{{row.f_comments}}</td>
|
109
125
|
<td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
|
110
126
|
<td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
|
111
127
|
<td style="text-align:center">
|
@@ -151,147 +167,175 @@
|
|
151
167
|
|
152
168
|
<script>
|
153
169
|
|
154
|
-
|
170
|
+
import {PagedList} from 'vue-client'
|
155
171
|
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
+
export default {
|
173
|
+
title: '终端控制',
|
174
|
+
components: {},
|
175
|
+
data () {
|
176
|
+
return {
|
177
|
+
depresid: [this.$login.f.depids],
|
178
|
+
depid: [this.$login.f.depids],
|
179
|
+
f_orgid: this.$login.f.orgid,
|
180
|
+
f_depid: '',
|
181
|
+
f_operatorid: '',
|
182
|
+
mul: false,
|
183
|
+
orgname: '',
|
184
|
+
depname: '',
|
185
|
+
operatorname: '',
|
186
|
+
userresid: [this.$login.f.id],
|
187
|
+
operatorid: [this.$login.f.id],
|
188
|
+
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
|
189
|
+
model: new PagedList('rs/sql/equipmentQuery', 20),
|
190
|
+
model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
|
191
|
+
curorgid: [this.f_filialeid],
|
192
|
+
f_filialeids: '',
|
193
|
+
criteriaShow: false,
|
194
|
+
infoadd: false,
|
195
|
+
selPos: [],
|
196
|
+
bankAffiliation: this.$appdata.getParam('所属银行'),
|
197
|
+
isSelAll: false, // 默认不全选
|
198
|
+
infoshow: false
|
199
|
+
}
|
200
|
+
},
|
201
|
+
props: ['f_filialeid','isshowless'],
|
202
|
+
ready () {
|
203
|
+
this.search()
|
204
|
+
},
|
205
|
+
watch:{
|
206
|
+
// 'selPos'(val){
|
207
|
+
// console.log(val)
|
208
|
+
// },
|
209
|
+
'isSelAll'(val){
|
210
|
+
console.log('-------', val)
|
211
|
+
if (val) {
|
212
|
+
// 对当前页面全选
|
213
|
+
this.selPos = []
|
214
|
+
for (const sel of this.model.rows) {
|
215
|
+
// if (this.selPos.indexOf(sel.id) < 0){
|
216
|
+
this.selPos.push(sel)
|
217
|
+
// }
|
218
|
+
}
|
219
|
+
} else {
|
220
|
+
// 取消全选
|
221
|
+
this.selPos = []
|
172
222
|
}
|
223
|
+
}
|
224
|
+
},
|
225
|
+
methods: {
|
226
|
+
getRes (obj) {
|
227
|
+
this.orgname = obj.res[0]
|
228
|
+
this.depresid = obj.resids
|
229
|
+
this.f_orgid = obj.resids
|
230
|
+
this.userresid = obj.resids
|
173
231
|
},
|
174
|
-
|
175
|
-
|
176
|
-
this.
|
232
|
+
getdep (obj, val) {
|
233
|
+
this.depname = val
|
234
|
+
// this.userresid = obj
|
235
|
+
this.f_depid = obj
|
177
236
|
},
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
if (val) {
|
185
|
-
// 对当前页面全选
|
186
|
-
this.selPos = []
|
187
|
-
for (const sel of this.model.rows) {
|
188
|
-
// if (this.selPos.indexOf(sel.id) < 0){
|
189
|
-
this.selPos.push(sel)
|
190
|
-
// }
|
191
|
-
}
|
192
|
-
} else {
|
193
|
-
// 取消全选
|
194
|
-
this.selPos = []
|
195
|
-
}
|
196
|
-
}
|
237
|
+
getuser (obj, val) {
|
238
|
+
this.operatorname = val
|
239
|
+
this.f_operatorid = obj
|
240
|
+
},
|
241
|
+
infoclose(){
|
242
|
+
this.infoshow=false
|
197
243
|
},
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
244
|
+
// 批量操作
|
245
|
+
async batchRoot(val) {
|
246
|
+
let arrs = []
|
247
|
+
let alertMessage = ''
|
248
|
+
let selPos = this.selPos
|
249
|
+
if (val === '0') {
|
250
|
+
alertMessage = '停用'
|
251
|
+
for (const tmp of selPos) {
|
252
|
+
if (tmp.f_state === '正常') arrs.push(tmp)
|
206
253
|
}
|
207
|
-
}
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
// 批量操作
|
212
|
-
async batchRoot(val) {
|
213
|
-
let arrs = []
|
214
|
-
let alertMessage = ''
|
215
|
-
let selPos = this.selPos
|
216
|
-
if (val === '0') {
|
217
|
-
alertMessage = '停用'
|
218
|
-
for (const tmp of selPos) {
|
219
|
-
if (tmp.f_state === '正常') arrs.push(tmp)
|
220
|
-
}
|
221
|
-
} else if (val === '1') {
|
222
|
-
alertMessage = '启用'
|
223
|
-
for (const tmp of selPos) {
|
224
|
-
if (tmp.f_state === '停用') arrs.push(tmp)
|
225
|
-
}
|
226
|
-
} else if (val === '2') {
|
227
|
-
alertMessage = '升级'
|
228
|
-
for (const tmp of selPos) {
|
229
|
-
if (tmp.f_state === '正常') arrs.push(tmp)
|
230
|
-
}
|
231
|
-
} else {
|
232
|
-
this.showAlert('出现异常,请重新进操作')
|
233
|
-
return
|
254
|
+
} else if (val === '1') {
|
255
|
+
alertMessage = '启用'
|
256
|
+
for (const tmp of selPos) {
|
257
|
+
if (tmp.f_state === '停用') arrs.push(tmp)
|
234
258
|
}
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
// 需要提示
|
240
|
-
this.$showAlert(`已经开始批量${alertMessage},选择${selPos.length},其中${arrs.length}台可以正常${alertMessage},具体请留意设备情况,并刷新列表查看执行结果!`,'success', 2500)
|
241
|
-
this.$dispatch('close')
|
242
|
-
},
|
243
|
-
abcd (row) {
|
244
|
-
console.log("chakan",row)
|
245
|
-
let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
|
246
|
-
this.model2.search(condition)
|
247
|
-
this.infoshow = true
|
248
|
-
},
|
249
|
-
search () {
|
250
|
-
console.log("111111111111111111111111111111111111")
|
251
|
-
this.$refs.paged.$refs.cri.search()
|
252
|
-
},
|
253
|
-
|
254
|
-
selfSearch (args) {
|
255
|
-
console.log(args)
|
256
|
-
if (args.model.f_user_operatorid && args.model.f_user_operator){
|
257
|
-
args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
|
258
|
-
and f_user_operator = '${args.model.f_user_operator}'`
|
259
|
+
} else if (val === '2') {
|
260
|
+
alertMessage = '升级'
|
261
|
+
for (const tmp of selPos) {
|
262
|
+
if (tmp.f_state === '正常') arrs.push(tmp)
|
259
263
|
}
|
260
|
-
|
261
|
-
this.
|
262
|
-
|
263
|
-
}
|
264
|
+
} else {
|
265
|
+
this.showAlert('出现异常,请重新进操作')
|
266
|
+
return
|
267
|
+
}
|
268
|
+
await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
|
269
|
+
rejectMsg: null,
|
270
|
+
resolveMsg: null
|
271
|
+
})
|
272
|
+
// 需要提示
|
273
|
+
this.$showAlert(`已经开始批量${alertMessage},选择${selPos.length},其中${arrs.length}台可以正常${alertMessage},具体请留意设备情况,并刷新列表查看执行结果!`,'success', 2500)
|
274
|
+
this.$dispatch('close')
|
275
|
+
},
|
276
|
+
abcd (row) {
|
277
|
+
console.log("chakan",row)
|
278
|
+
let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
|
279
|
+
this.model2.search(condition)
|
280
|
+
this.infoshow = true
|
281
|
+
},
|
282
|
+
search () {
|
283
|
+
console.log("111111111111111111111111111111111111")
|
284
|
+
this.$refs.paged.$refs.cri.search()
|
285
|
+
},
|
286
|
+
selfSearch (args) {
|
287
|
+
console.log(args)
|
288
|
+
if (args.model.f_user_operatorid && args.model.f_user_operator){
|
289
|
+
args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
|
290
|
+
and f_user_operator = '${args.model.f_user_operator}'`
|
291
|
+
}
|
264
292
|
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
// } else {
|
270
|
-
// this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
271
|
-
// }
|
272
|
-
},
|
273
|
-
del (row) {
|
274
|
-
console.log('要删除了', row)
|
275
|
-
row.f_state = '已删除'
|
276
|
-
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
277
|
-
this.$dispatch('refresh')
|
278
|
-
}).catch((error) => {
|
279
|
-
this.$dispatch('refresh')
|
280
|
-
})
|
281
|
-
},
|
293
|
+
if (args.model.f_user_operatorid && args.model.f_user_operator) {
|
294
|
+
args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
|
295
|
+
and f_user_operator = '${args.model.f_user_operator}'`;
|
296
|
+
}
|
282
297
|
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
},
|
289
|
-
hidden(){
|
290
|
-
this.criteriaShow = !this.criteriaShow
|
298
|
+
// 添加设备类型和状态条件
|
299
|
+
args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state != '已删除'`;
|
300
|
+
// 添加公司、部门、员工条件
|
301
|
+
if (this.f_orgid && this.f_orgid.length > 0) {
|
302
|
+
args.condition += ` and f_orgid = '${this.f_orgid}'`;
|
291
303
|
}
|
304
|
+
|
305
|
+
if (this.f_depid && this.f_depid.length > 0) {
|
306
|
+
args.condition += ` and f_depid = '${this.f_depid}'`; // 或者使用合适的条件处理
|
307
|
+
}
|
308
|
+
|
309
|
+
if (this.f_operatorid && this.f_operatorid.length > 0) {
|
310
|
+
args.condition += ` and f_operatorid = '${this.f_operatorid}'`; // 或者使用合适的条件处理
|
311
|
+
}
|
312
|
+
this.model.search(args.condition, this.model)
|
313
|
+
this.$dispatch('research')
|
292
314
|
},
|
293
|
-
computed: {
|
294
315
|
|
316
|
+
add () {
|
317
|
+
this.infoadd=false
|
318
|
+
// if (this.f_filialeid) {
|
319
|
+
this.$dispatch('add', this.f_filialeid)
|
320
|
+
// } else {
|
321
|
+
// this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
322
|
+
// }
|
323
|
+
},
|
324
|
+
del (row) {
|
325
|
+
console.log('要删除了', row)
|
326
|
+
row.f_state = '已删除'
|
327
|
+
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
328
|
+
this.$dispatch('refresh')
|
329
|
+
}).catch((error) => {
|
330
|
+
this.$dispatch('refresh')
|
331
|
+
})
|
332
|
+
},
|
333
|
+
hidden(){
|
334
|
+
this.criteriaShow = !this.criteriaShow
|
295
335
|
}
|
336
|
+
},
|
337
|
+
computed: {
|
338
|
+
|
296
339
|
}
|
340
|
+
}
|
297
341
|
</script>
|