system-clients 3.3.4 → 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.
@@ -0,0 +1,341 @@
1
+ <template>
2
+ <div class="flex">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+
5
+ <criteria partial='criteria' style="background-color: white;" @condition-changed='$parent.selfSearch' v-ref:cri>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="col-sm-3 form-group">
9
+ <label class="font_normal_body">公&emsp;&emsp;司 </label>
10
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
11
+ </div>
12
+ <div class="col-sm-3 form-group">
13
+ <label class="font_normal_body">设备编号</label>
14
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
15
+ condition="f_terminal_number like '%{}%'" placeholder="设备编号">
16
+ </div>
17
+
18
+
19
+ <div class="span" style="float:right;margin-top: 6px">
20
+ <button type="button" class="btn-success btn " style="border-radius: 4px"
21
+ @click="$parent.$parent.batchRoot('1')">批量启用
22
+ </button>
23
+ <button type="button" class="btn-danger btn " style="border-radius: 4px"
24
+ @click="$parent.$parent.batchRoot('0')">批量停用
25
+ </button>
26
+ <button type="button" class="button_search btn" @click="search()" v-el:cx>查询</button>
27
+ <button type="button" class="button_search btn" @click="$parent.$parent.add() " v-el:cx>新增</button>
28
+ <div style="float: right" class="button_spacing"
29
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
30
+ @click="$parent.$parent.hidden()"></div>
31
+ </div>
32
+ </div>
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>
42
+ <div class="col-sm-3 form-group">
43
+ <label class="font_normal_body">所属人员</label>
44
+ <res-select restype='user'
45
+ @res-select="$parent.$parent.getuser"
46
+ :is-mul="false"
47
+ :parentresid="$parent.$parent.userresid">
48
+ </res-select>
49
+ </div>
50
+ <div class="col-sm-3 form-group">
51
+ <label class="font_normal_body">所在地</label>
52
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
53
+ condition="f_address like '%{}%'" placeholder="所在地">
54
+ </div>
55
+ <div class="col-sm-3 form-group">
56
+ <label class="font_normal_body">设备名称</label>
57
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
58
+ condition="f_terminal_name like '%{}%'" placeholder="设备名称">
59
+ </div>
60
+ <div class="col-sm-3 form-group">
61
+ <label class="font_normal_body">机器编号</label>
62
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_machine_number"
63
+ condition="f_machine_number like '%{}%'" placeholder="机器编号">
64
+ </div>
65
+ <div class="col-sm-3 form-group">
66
+ <label class="font_normal_body">所属银行</label>
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>
75
+ </div>
76
+ <div class="col-sm-3 form-group">
77
+ <label class="font_normal_body">联系电话</label>
78
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
79
+ condition="f_phone like '%{}%'" placeholder="联系电话">
80
+ </div>
81
+ </div>
82
+ </div>
83
+ </criteria>
84
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
85
+ <template partial='head'>
86
+ <tr>
87
+ <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
88
+ <th style="text-align:center;white-space:nowrap;">序号</th>
89
+ <th style="text-align:center;white-space:nowrap;">设备编号</th>
90
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
91
+ <th style="text-align:center;white-space:nowrap;">设备名称</th>
92
+ <!-- <th style="text-align:center;white-space:nowrap;">所属公司</th>-->
93
+ <th style="text-align:center;white-space:nowrap;">所属部门</th>
94
+ <th style="text-align:center;white-space:nowrap;">所属人员</th>
95
+ <th style="text-align:center;white-space:nowrap;">状态</th>
96
+ <th style="text-align:center;white-space:nowrap;">联系电话</th>
97
+ <th style="text-align:center;white-space:nowrap;">所在地</th>
98
+ <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>
102
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
103
+ <th style="text-align:center;white-space:nowrap;">失联状态</th>
104
+ <th style="text-align:center;white-space:nowrap;">操作</th>
105
+ </tr>
106
+ </template>
107
+ <template partial='body':model="model">
108
+ <tr>
109
+ <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
110
+ <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
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>
112
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
113
+ <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
114
+ <!-- <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>-->
115
+ <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
116
+ <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
117
+
118
+ <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
119
+ <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
120
+ <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
121
+ <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</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>
125
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
126
+ <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
127
+ <td style="text-align:center">
128
+ <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
129
+ </td>
130
+ </tr>
131
+ </template>
132
+ </data-grid>
133
+ </criteria-paged>
134
+ </div>
135
+ <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
136
+ <article slot="modal-body" class="modal-body">
137
+ <criteria-paged :model="model2" v-ref:paged2>
138
+ <data-grid :model="model2" v-ref:grid2 partial='list'>
139
+ <template partial='head'>
140
+ <tr>
141
+ <!--<th style="padding: 0;border: 0">
142
+ <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
143
+ @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
144
+ </th>-->
145
+ <th><nobr>序号</nobr></th>
146
+ <th><nobr>终端号</nobr></th>
147
+ <th><nobr>上次上报时间</nobr></th>
148
+ <th><nobr>本次上报时间</nobr></th>
149
+ <th><nobr><b>状态</b></nobr></th>
150
+ </tr>
151
+ </template>
152
+ <template partial='body'>
153
+ <td style="text-align: center;">{{$index + 1}}</td>
154
+ <td style="text-align: center;">{{row.f_terminal_number}}</td>
155
+ <td style="text-align: center;">{{row.f_update_date}}</td>
156
+ <td style="text-align: center;">{{row.f_update_date }}</td>
157
+ <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
158
+ </template>
159
+ </data-grid>
160
+ </criteria-paged>
161
+ </article>
162
+ <footer slot="modal-footer" class="modal-footer">
163
+ <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
164
+ </footer>
165
+ </modal>
166
+ </template>
167
+
168
+ <script>
169
+
170
+ import {PagedList} from 'vue-client'
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 = []
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
231
+ },
232
+ getdep (obj, val) {
233
+ this.depname = val
234
+ // this.userresid = obj
235
+ this.f_depid = obj
236
+ },
237
+ getuser (obj, val) {
238
+ this.operatorname = val
239
+ this.f_operatorid = obj
240
+ },
241
+ infoclose(){
242
+ this.infoshow=false
243
+ },
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)
253
+ }
254
+ } else if (val === '1') {
255
+ alertMessage = '启用'
256
+ for (const tmp of selPos) {
257
+ if (tmp.f_state === '停用') arrs.push(tmp)
258
+ }
259
+ } else if (val === '2') {
260
+ alertMessage = '升级'
261
+ for (const tmp of selPos) {
262
+ if (tmp.f_state === '正常') arrs.push(tmp)
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
+ }
292
+
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
+ }
297
+
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}'`;
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')
314
+ },
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
335
+ }
336
+ },
337
+ computed: {
338
+
339
+ }
340
+ }
341
+ </script>
@@ -0,0 +1,138 @@
1
+ <template>
2
+ <div class="flex-row">
3
+ <div :class="{'basic-main':!isChange,'binary-left':isChange}">
4
+ <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
5
+ </div>
6
+ <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
7
+ <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
8
+ </div>
9
+
10
+ <!-- <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >-->
11
+ <!-- <header slot="modal-header" class="modal-header">-->
12
+ <!-- <button type="button" class="close" @click="close"><span>&times;</span></button>-->
13
+ <!-- <h4 class="modal-title">批量操作</h4>-->
14
+ <!-- </header>-->
15
+ <!-- <article slot="modal-body" class="modal-body">-->
16
+ <!-- <form class="form-horizontal">-->
17
+ <!-- <div class="row">-->
18
+ <!-- <div>-->
19
+ <!-- <h4>注意事项</h4>-->
20
+ <!-- <p>1.如果需要对POS设备进行升级,批量选择的POS设备包含非正常状态,则只会对状态为正常的设备进行升级。</p>-->
21
+ <!-- <p>2.如果POS设备处于停用状态,则可以进行启用操作。如果设备处于启用状态,则可以进行停用和升级操作。</p>-->
22
+ <!-- <p>3.批量操作可能耗时较长,请刷新列表查看结果。</p>-->
23
+ <!-- </div>-->
24
+ <!-- </div>-->
25
+ <!-- </form>-->
26
+ <!-- </article>-->
27
+ <!-- <footer slot="modal-footer" class="modal-footer">-->
28
+ <!--&lt;!&ndash; <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
29
+ <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>-->
30
+ <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>-->
31
+ <!-- <button type="button" class="button_clear button_spacing" @click='close'>退出</button>-->
32
+ <!-- </footer>-->
33
+ <!-- </modal>-->
34
+ </div>
35
+ </template>
36
+ <script>
37
+
38
+ import PosList from './PosList'
39
+ import PosAdd from './PosAdd'
40
+
41
+ export default {
42
+ title: 'POS终端管理',
43
+ components: {
44
+ PosList, PosAdd
45
+ },
46
+ data () {
47
+ return {
48
+ isChange: false,
49
+ row: null,
50
+ infoadd: true, // 判断是否显示 升级 等按钮(true/false)
51
+ batchPos: false,
52
+ f_filialeids: ''
53
+ }
54
+ },
55
+ methods: {
56
+ // 批量操作
57
+ // async batchRoot(val){
58
+ // let arrs = []
59
+ // let alertMessage=''
60
+ // let selPos = this.$refs.list.selPos
61
+ // if (val==='0'){
62
+ // alertMessage='停用'
63
+ // for (const tmp of selPos) {
64
+ // if (tmp.f_state==='正常') arrs.push(tmp)
65
+ // }
66
+ // } else if (val==='1'){
67
+ // alertMessage='启用'
68
+ // for (const tmp of selPos) {
69
+ // if (tmp.f_state==='停用') arrs.push(tmp)
70
+ // }
71
+ // } else if(val==='2'){
72
+ // alertMessage='升级'
73
+ // for (const tmp of selPos) {
74
+ // if (tmp.f_state==='正常') arrs.push(tmp)
75
+ // }
76
+ // } else {
77
+ // this.showAlert('出现异常,请重新进操作')
78
+ // return
79
+ // }
80
+ //
81
+ // await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
82
+ //
83
+ // // 需要提示
84
+ // this.$showAlert(`已经开始批量${alertMessage},选择${selPos.length},其中${arrs.length}台可以正常${alertMessage},具体请留意设备情况,并刷新列表查看执行结果!`)
85
+ // this.isChange = false
86
+ // this.close()
87
+ // },
88
+ close(){
89
+ this.batchPos = false
90
+ },
91
+ selected(obj, idx) {
92
+ console.log(obj)
93
+ if (!(obj instanceof MouseEvent)) {
94
+ this.isChange = true
95
+ this.infoadd = true
96
+ this.row = obj
97
+ } else {
98
+ this.$showAlert('如需新增,请点击增加按钮!', 'info', 1000)
99
+ }
100
+ }
101
+ },
102
+ events: {
103
+ 'search' () {
104
+ this.infoadd=true
105
+ this.isChange = false
106
+ this.row = null
107
+ this.$refs.list.$refs.paged.$refs.cri.search()
108
+ },
109
+ 'research' () {
110
+ console.log('重新查询')
111
+ this.isChange = false
112
+ this.row = null
113
+ },
114
+ 'refresh' () {
115
+ this.isChange = false
116
+ this.row = null
117
+ this.$refs.list.search()
118
+ },
119
+ 'error' (name, row, res) {
120
+ this.isChange = false
121
+ this.row = null
122
+ },
123
+ 'close' () {
124
+ this.isChange = false
125
+ this.row = null
126
+
127
+ // this.$refs.list.search()
128
+ },
129
+ 'add' (val) {
130
+ this.f_filialeids = val
131
+ this.infoadd=false
132
+ this.row = null
133
+ this.isChange = true
134
+ this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
135
+ }
136
+ }
137
+ }
138
+ </script>
@@ -0,0 +1,6 @@
1
+ // 分公司特殊组件页面注册
2
+
3
+
4
+ exports.specialComp = {
5
+ 'pos-manage': (resolve) => { require(['./PosManage'], resolve) }
6
+ }
@@ -158,6 +158,8 @@ let GetLoginInfoService = {
158
158
  afterLogin: [],
159
159
  //验证码开关
160
160
  Verification: true,
161
+ // 验证码类型
162
+ VerificationType: 'mix',
161
163
  //构建时间开关
162
164
  versionTime: true,
163
165
  //
package/src/system.js CHANGED
@@ -28,12 +28,13 @@ import TestResSelect from './components/server/TestResSelect'
28
28
  import RoleSelector from "./components/server/RoleSelector";
29
29
 
30
30
  // BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
31
- export default function (val,filiale, {showLogin = false, show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true} = {}) {
31
+ export default function (val ,filiale, {showLogin = false,VerificationType = 'mix', show_daiBan = false, show_yiDi= false, BAinformation = null,showVersionTime=true} = {}) {
32
32
  console.log(val,filiale,showLogin)
33
33
  //验证码开关赋值
34
34
  if(val!=null){
35
35
  GetLoginInfoService.Verification=val
36
36
  }
37
+ GetLoginInfoService.VerificationType = (VerificationType === null || VerificationType === '') ? 'mix' : VerificationType
37
38
  //构建时间开关赋值
38
39
  if(val!=null){
39
40
  GetLoginInfoService.versionTime=showVersionTime