system-clients 1.6.71 → 1.6.73-foric
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/build.gradle +1 -1
- package/package.json +3 -2
- package/src/components/equipment/PosAdd.vue +39 -67
- package/src/components/equipment/PosList.vue +113 -164
- package/src/components/equipment/PosManage.vue +4 -13
- package/src/components/parammanage/ParamPage.vue +151 -128
- package/src/components/parammanage/SinglePage.vue +157 -118
- package/src/components/server/Login.vue +626 -568
- package/src/components/server/ResSelectGroup.vue +3 -9
- package/src/plugins/GetLoginInfoService.js +505 -498
- package/static/login-do.gif +0 -0
- package/.gradle/5.2.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/5.2.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/gradle/wrapper/gradle-wrapper.properties +0 -5
- package/gradlew +0 -172
- package/gradlew.bat +0 -84
package/build.gradle
CHANGED
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "system-clients",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.73-foric",
|
|
4
4
|
"description": "系统基础框架",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
7
|
+
"doc": "doc",
|
|
7
8
|
"example": "examples",
|
|
8
9
|
"test": "test"
|
|
9
10
|
},
|
|
@@ -76,7 +77,7 @@
|
|
|
76
77
|
"style": "0.0.3",
|
|
77
78
|
"style-loader": "^0.20.3",
|
|
78
79
|
"url-loader": "^0.5.7",
|
|
79
|
-
"vue-client": "1.21.
|
|
80
|
+
"vue-client": "1.21.23",
|
|
80
81
|
"vue-hot-reload-api": "^1.2.0",
|
|
81
82
|
"vue-html-loader": "^1.0.0",
|
|
82
83
|
"vue-loader": "^8.2.1",
|
|
@@ -6,43 +6,35 @@
|
|
|
6
6
|
</ul>
|
|
7
7
|
<form class="form-horizontal">
|
|
8
8
|
<div class="row">
|
|
9
|
-
<div class="col-sm-
|
|
10
|
-
<label class="
|
|
11
|
-
<input type="text" class="
|
|
9
|
+
<div class="col-sm-4 form-group form-input-group">
|
|
10
|
+
<label class="control-label">设备编号</label>
|
|
11
|
+
<input type="text" class="form-control" v-model="model.f_terminal_number" placeholder="设备编号" >
|
|
12
12
|
</div>
|
|
13
|
-
<div class="col-sm-
|
|
14
|
-
<label class="
|
|
15
|
-
<input type="text" class="
|
|
13
|
+
<div class="col-sm-4 form-group form-input-group">
|
|
14
|
+
<label class="control-label">设备名称</label>
|
|
15
|
+
<input type="text" class="form-control" v-model="model.f_terminal_name" placeholder="设备名称" >
|
|
16
16
|
</div>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
<label class="font_normal_body" >机器编号</label>
|
|
21
|
-
<input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
|
|
22
|
-
</div>
|
|
23
|
-
<div class="col-sm-6">
|
|
24
|
-
<label class="font_normal_body" >联系电话</label>
|
|
25
|
-
<input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话" >
|
|
17
|
+
<div class="col-sm-4 form-group form-input-group">
|
|
18
|
+
<label class="control-label">所属银行</label>
|
|
19
|
+
<input type="text" class="form-control" v-model="model.f_bank_name" placeholder="所属银行" >
|
|
26
20
|
</div>
|
|
27
21
|
</div>
|
|
28
22
|
<div class="row">
|
|
29
|
-
<div class="col-sm-
|
|
30
|
-
<label class="
|
|
31
|
-
<
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
23
|
+
<div class="col-sm-4 form-group form-input-group">
|
|
24
|
+
<label class=" col-sm-2 control-label">使用公司</label>
|
|
25
|
+
<div class="col-sm-2">
|
|
26
|
+
<res-select restype='organization'
|
|
27
|
+
is-mul="false"
|
|
28
|
+
@res-select="getorg"
|
|
29
|
+
:initresid="curorgid">
|
|
30
|
+
</res-select>
|
|
31
|
+
</div>
|
|
36
32
|
</div>
|
|
37
33
|
</div>
|
|
38
|
-
<div class="col-sm-12">
|
|
39
|
-
<label class="font_normal_body " style="margin-top:-20px"> 备注 </label>
|
|
40
|
-
<textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
|
|
41
|
-
</div>
|
|
42
34
|
</form>
|
|
43
35
|
<div style="text-align:right;height:auto;">
|
|
44
|
-
<button class="btn
|
|
45
|
-
<button class="btn
|
|
36
|
+
<button class="btn btn-success " @click="confirm()" >确认</button>
|
|
37
|
+
<button class="btn btn-default " @click="cancel()" >取消</button>
|
|
46
38
|
</div>
|
|
47
39
|
</validator>
|
|
48
40
|
</div>
|
|
@@ -58,17 +50,13 @@
|
|
|
58
50
|
f_terminal_name: '',
|
|
59
51
|
f_bank_name: '',
|
|
60
52
|
f_equipment_type: 'POS',
|
|
61
|
-
f_state: '正常'
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
f_address:'',
|
|
66
|
-
f_filialeids:this.f_filialeids,
|
|
67
|
-
f_orgid:''
|
|
68
|
-
}
|
|
53
|
+
f_state: '正常'
|
|
54
|
+
},
|
|
55
|
+
curorgid: this.$login.f.orgid,
|
|
56
|
+
f_orgid: ''
|
|
69
57
|
}
|
|
70
58
|
},
|
|
71
|
-
props: ['data'
|
|
59
|
+
props: ['data'],
|
|
72
60
|
watch: {
|
|
73
61
|
'data' (val) {
|
|
74
62
|
if (val) {
|
|
@@ -86,51 +74,35 @@
|
|
|
86
74
|
},
|
|
87
75
|
methods: {
|
|
88
76
|
confirm () {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
this.$dispatch('refresh')
|
|
99
|
-
}).catch((error) => {
|
|
100
|
-
this.$dispatch('refresh')
|
|
101
|
-
})
|
|
102
|
-
// }else
|
|
103
|
-
// {
|
|
104
|
-
// this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
|
105
|
-
// }
|
|
106
|
-
|
|
77
|
+
this.model.f_operator = this.$login.f.name
|
|
78
|
+
this.model.f_operatorid = this.$login.f.id
|
|
79
|
+
this.model.f_orgid = this.f_orgid
|
|
80
|
+
console.log('保存', this.model)
|
|
81
|
+
this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
|
82
|
+
this.$dispatch('refresh')
|
|
83
|
+
}).catch((error) => {
|
|
84
|
+
this.$dispatch('refresh')
|
|
85
|
+
})
|
|
107
86
|
},
|
|
108
87
|
edit (row) {
|
|
88
|
+
console.log('修改，，。。', row)
|
|
109
89
|
this.model.f_terminal_number = row.f_terminal_number
|
|
110
90
|
this.model.f_terminal_name = row.f_terminal_name
|
|
111
91
|
this.model.f_bank_name = row.f_bank_name
|
|
112
|
-
this.model.f_machine_number = row.f_machine_number
|
|
113
|
-
this.model.f_address = row.f_address
|
|
114
|
-
this.model.f_phone = row.f_phone
|
|
115
|
-
this.model.f_comments=row.f_comments
|
|
116
|
-
this.model.f_filialeids=row.f_filialeids
|
|
117
92
|
this.model.id = row.id
|
|
118
|
-
this.
|
|
93
|
+
this.f_orgid = row.f_orgid
|
|
119
94
|
},
|
|
120
95
|
initModel () {
|
|
121
96
|
delete this.model.id
|
|
122
97
|
this.model.f_terminal_number = ''
|
|
123
98
|
this.model.f_terminal_name = ''
|
|
124
99
|
this.model.f_bank_name = ''
|
|
125
|
-
this.model.f_machine_number = ''
|
|
126
|
-
this.model.f_phone = ''
|
|
127
|
-
this.model.f_address = ''
|
|
128
|
-
this.model.f_filialeids=''
|
|
129
|
-
this.model.f_orgid=''
|
|
130
|
-
this.model.f_comments=''
|
|
131
100
|
},
|
|
132
101
|
cancel () {
|
|
133
102
|
this.$dispatch('close')
|
|
103
|
+
},
|
|
104
|
+
getorg (val) {
|
|
105
|
+
this.f_orgid = val[0]
|
|
134
106
|
}
|
|
135
107
|
}
|
|
136
108
|
}
|
|
@@ -1,164 +1,113 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div class="flex">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
<
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
<
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
</div>
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
<
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
</
|
|
50
|
-
<
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
</
|
|
55
|
-
</
|
|
56
|
-
</
|
|
57
|
-
</
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
props: ['f_filialeid'],
|
|
115
|
-
ready () {
|
|
116
|
-
this.search()
|
|
117
|
-
},
|
|
118
|
-
methods: {
|
|
119
|
-
|
|
120
|
-
search () {
|
|
121
|
-
console.log("111111111111111111111111111111111111")
|
|
122
|
-
this.$refs.paged.$refs.cri.search()
|
|
123
|
-
},
|
|
124
|
-
|
|
125
|
-
selfSearch (args) {
|
|
126
|
-
args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_filialeids = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
|
|
127
|
-
this.model.search(args.condition, this.model)
|
|
128
|
-
this.$dispatch('research')
|
|
129
|
-
},
|
|
130
|
-
|
|
131
|
-
add () {
|
|
132
|
-
if (this.f_filialeid) {
|
|
133
|
-
this.$parent.f_filialeid=this.f_filialeid
|
|
134
|
-
this.$dispatch('add')
|
|
135
|
-
} else {
|
|
136
|
-
this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
},
|
|
140
|
-
|
|
141
|
-
del (row) {
|
|
142
|
-
console.log('要删除了', row)
|
|
143
|
-
row.f_state = '已删除'
|
|
144
|
-
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
145
|
-
this.$dispatch('refresh')
|
|
146
|
-
}).catch((error) => {
|
|
147
|
-
this.$dispatch('refresh')
|
|
148
|
-
})
|
|
149
|
-
},
|
|
150
|
-
|
|
151
|
-
getorg (val) {
|
|
152
|
-
this.f_orgid = val[0]
|
|
153
|
-
this.f_filialeid = val[0]
|
|
154
|
-
this.search()
|
|
155
|
-
},
|
|
156
|
-
hidden(){
|
|
157
|
-
this.criteriaShow = !this.criteriaShow
|
|
158
|
-
}
|
|
159
|
-
},
|
|
160
|
-
computed: {
|
|
161
|
-
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
</script>
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex" style="flex:1; ">
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
|
+
<div novalidate class="form-inline" partial>
|
|
6
|
+
<div class="form-group">
|
|
7
|
+
<label>使用公司</label>
|
|
8
|
+
<res-select restype='organization'
|
|
9
|
+
is-mul="false"
|
|
10
|
+
@res-select="$parent.$parent.getorg"
|
|
11
|
+
:initresid="$parent.$parent.curorgid">
|
|
12
|
+
</res-select>
|
|
13
|
+
</div>
|
|
14
|
+
|
|
15
|
+
<div class="form-group">
|
|
16
|
+
<input type="text" class="form-control" v-model="model.f_terminal_number"
|
|
17
|
+
condition="f_terminal_number like '%{}%'" placeholder="设备编号">
|
|
18
|
+
</div>
|
|
19
|
+
<div class="form-group">
|
|
20
|
+
<input type="text" class="form-control" v-model="model.f_terminal_name"
|
|
21
|
+
condition="f_terminal_name like '%{}%'" placeholder="设备名称">
|
|
22
|
+
</div>
|
|
23
|
+
<div class="form-group">
|
|
24
|
+
<input type="text" class="form-control" v-model="model.f_bank_name"
|
|
25
|
+
condition="f_bank_name like '%{}%'" placeholder="所属银行">
|
|
26
|
+
</div>
|
|
27
|
+
|
|
28
|
+
<div class="form-group">
|
|
29
|
+
<button class="btn btn-success width-80" @click="search()" v-el:cx>查询</button>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="form-group">
|
|
32
|
+
<button class="btn btn-success width-80" @click="$parent.$parent.add()" v-el:cx>新增</button>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<data-grid :model="model" partial='list' v-ref:grid >
|
|
37
|
+
<template partial='head'>
|
|
38
|
+
<tr>
|
|
39
|
+
<th>序号</th>
|
|
40
|
+
<th>设备编号</th>
|
|
41
|
+
<th>设备名称</th>
|
|
42
|
+
<th>所属银行</th>
|
|
43
|
+
<th>操作</th>
|
|
44
|
+
</tr>
|
|
45
|
+
</template>
|
|
46
|
+
<template partial='body':model="model">
|
|
47
|
+
<tr>
|
|
48
|
+
<td style="text-align:center">{{$index+1}}</td>
|
|
49
|
+
<td style="text-align:center">{{row.f_terminal_number}}</td>
|
|
50
|
+
<td style="text-align:center">{{row.f_terminal_name}}</td>
|
|
51
|
+
<td style="text-align:center">{{row.f_bank_name}}</td>
|
|
52
|
+
<td style="text-align:center">
|
|
53
|
+
<button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
|
|
54
|
+
</td>
|
|
55
|
+
</tr>
|
|
56
|
+
</template>
|
|
57
|
+
</data-grid>
|
|
58
|
+
</criteria-paged>
|
|
59
|
+
</div>
|
|
60
|
+
</template>
|
|
61
|
+
|
|
62
|
+
<script>
|
|
63
|
+
|
|
64
|
+
import { PagedList } from 'vue-client'
|
|
65
|
+
|
|
66
|
+
export default {
|
|
67
|
+
title: '终端控制',
|
|
68
|
+
components: {},
|
|
69
|
+
data () {
|
|
70
|
+
return {
|
|
71
|
+
model: new PagedList('rs/sql/equipmentQuery', 20),
|
|
72
|
+
|
|
73
|
+
curorgid: [this.$login.f.orgid],
|
|
74
|
+
f_orgid: ''
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
ready () {
|
|
78
|
+
this.search()
|
|
79
|
+
},
|
|
80
|
+
methods: {
|
|
81
|
+
|
|
82
|
+
search () {
|
|
83
|
+
this.$refs.paged.$refs.cri.search()
|
|
84
|
+
},
|
|
85
|
+
|
|
86
|
+
selfSearch (args) {
|
|
87
|
+
args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
|
|
88
|
+
this.model.search(args.condition, this.model)
|
|
89
|
+
},
|
|
90
|
+
|
|
91
|
+
add () {
|
|
92
|
+
this.$dispatch('add')
|
|
93
|
+
},
|
|
94
|
+
|
|
95
|
+
del (row) {
|
|
96
|
+
console.log('要删除了', row)
|
|
97
|
+
row.f_state = '已删除'
|
|
98
|
+
this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
99
|
+
this.$dispatch('refresh')
|
|
100
|
+
}).catch((error) => {
|
|
101
|
+
this.$dispatch('refresh')
|
|
102
|
+
})
|
|
103
|
+
},
|
|
104
|
+
|
|
105
|
+
getorg (val) {
|
|
106
|
+
this.f_orgid = val[0]
|
|
107
|
+
}
|
|
108
|
+
},
|
|
109
|
+
computed: {
|
|
110
|
+
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
</script>
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex-row">
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
<div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
|
|
7
|
-
<pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
|
|
3
|
+
<pos-list :row="row" @select-changed="selected" style="width:auto;" v-ref:list ></pos-list>
|
|
4
|
+
<div class="flex" style="margin-left: 10px; width: 50%;" v-if="isChange">
|
|
5
|
+
<pos-add :data="row" v-ref:addbox></pos-add>
|
|
8
6
|
</div>
|
|
9
7
|
</div>
|
|
10
8
|
</template>
|
|
@@ -21,9 +19,7 @@
|
|
|
21
19
|
data () {
|
|
22
20
|
return {
|
|
23
21
|
isChange: false,
|
|
24
|
-
row: null
|
|
25
|
-
|
|
26
|
-
f_filialeids: ''
|
|
22
|
+
row: null
|
|
27
23
|
}
|
|
28
24
|
},
|
|
29
25
|
methods: {
|
|
@@ -38,11 +34,6 @@
|
|
|
38
34
|
this.row = null
|
|
39
35
|
this.$refs.list.$refs.paged.$refs.cri.search()
|
|
40
36
|
},
|
|
41
|
-
'research' () {
|
|
42
|
-
console.log('重新查询')
|
|
43
|
-
this.isChange = false
|
|
44
|
-
this.row = null
|
|
45
|
-
},
|
|
46
37
|
'refresh' () {
|
|
47
38
|
this.isChange = false
|
|
48
39
|
this.row = null
|