system-clients 3.1.89-20 → 3.1.89-20-rongchuang-1

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.
Files changed (199) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/.eslintrc.js +16 -16
  4. package/.gradle/6.8/executionHistory/executionHistory.bin +0 -0
  5. package/.gradle/6.8/executionHistory/executionHistory.lock +0 -0
  6. package/.gradle/6.8/fileChanges/last-build.bin +0 -0
  7. package/.gradle/6.8/fileHashes/fileHashes.bin +0 -0
  8. package/.gradle/6.8/fileHashes/fileHashes.lock +0 -0
  9. package/.gradle/{buildOutputCleanup/built.bin → 6.8/gc.properties} +0 -0
  10. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  11. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  12. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  13. package/.gradle/checksums/checksums.lock +0 -0
  14. package/.gradle/configuration-cache/gc.properties +0 -0
  15. package/CHANGELOG.md +51 -51
  16. package/README.md +36 -36
  17. package/SystemClient.iml +11 -11
  18. package/build/css-loaders.js +34 -34
  19. package/build/dev-client.js +8 -8
  20. package/build/example-server.js +80 -80
  21. package/build/release.sh +28 -28
  22. package/build/utils.js +71 -71
  23. package/build/webpack.base.conf.js +75 -75
  24. package/build/webpack.dev.conf.js +31 -31
  25. package/build/webpack.example.conf.js +49 -49
  26. package/build/webpack.prod.conf.js +60 -60
  27. package/build/webpack.test.conf.js +31 -31
  28. package/build.gradle +6 -6
  29. package/config/dev.env.js +6 -6
  30. package/config/index.js +38 -38
  31. package/config/prod.env.js +3 -3
  32. package/config/test.env.js +6 -6
  33. package/doc/Login.md +7 -7
  34. package/examples/ReadCard/App.vue +23 -23
  35. package/examples/ReadCard/index.html +11 -11
  36. package/examples/ReadCard/main.js +12 -12
  37. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  38. package/gradle/wrapper/gradle-wrapper.properties +5 -0
  39. package/gradlew +185 -0
  40. package/gradlew.bat +89 -0
  41. package/index.html +21 -21
  42. package/package.json +1 -1
  43. package/release.bat +5 -5
  44. package/src/App.vue +24 -24
  45. package/src/LodopFuncs.js +123 -123
  46. package/src/assets/binding.svg +1 -1
  47. package/src/assets/unbind.svg +1 -1
  48. package/src/assets//345/205/254/345/221/212.svg +1 -1
  49. package/src/assets//347/207/203/346/260/224/347/274/264/350/264/271.eps +116 -116
  50. package/src/assets//350/201/224/347/263/273/346/210/221/344/273/254.svg +1 -1
  51. package/src/components/List.vue +51 -51
  52. package/src/components/Main.vue +676 -589
  53. package/src/components/Table.js +74 -74
  54. package/src/components/Util.js +343 -343
  55. package/src/components/equipment/EquipmentManage.vue +65 -65
  56. package/src/components/equipment/PcAdd.vue +105 -105
  57. package/src/components/equipment/PcList.vue +119 -119
  58. package/src/components/equipment/PcManage.vue +60 -60
  59. package/src/components/equipment/PhoneAdd.vue +94 -94
  60. package/src/components/equipment/PhoneList.vue +102 -102
  61. package/src/components/equipment/PhoneManage.vue +60 -60
  62. package/src/components/equipment/PosAdd.vue +299 -299
  63. package/src/components/equipment/PosList.vue +254 -254
  64. package/src/components/equipment/PosManage.vue +150 -150
  65. package/src/components/materialManage/materialData.vue +44 -44
  66. package/src/components/materialManage/materialList.vue +255 -255
  67. package/src/components/parammanage/ParamManage.vue +42 -42
  68. package/src/components/parammanage/ParamManages.vue +43 -43
  69. package/src/components/parammanage/ParamPages.vue +222 -222
  70. package/src/components/parammanage/SinglePages.vue +167 -167
  71. package/src/components/server/AddChangeMsg.vue +66 -66
  72. package/src/components/server/ChangeDeclare.vue +45 -45
  73. package/src/components/server/IconTree.vue +26 -26
  74. package/src/components/server/ImageVieweTest.vue +56 -56
  75. package/src/components/server/ImageViewer.vue +350 -350
  76. package/src/components/server/LeftTree.vue +111 -111
  77. package/src/components/server/LoadData.vue +36 -36
  78. package/src/components/server/Menu.vue +188 -188
  79. package/src/components/server/ModifyPw.vue +106 -106
  80. package/src/components/server/ResSelect.vue +155 -155
  81. package/src/components/server/ResSelectGroup.vue +196 -196
  82. package/src/components/server/RightTree.vue +348 -348
  83. package/src/components/server/RoleSelector.vue +88 -88
  84. package/src/components/server/TestResSelect.vue +58 -58
  85. package/src/components/server/TestResSelectGroup.vue +388 -388
  86. package/src/components/server/TestRightTree.vue +42 -42
  87. package/src/index.js +7 -7
  88. package/src/plugins/GetLoginInfoService.js +4 -2
  89. package/src/plugins/HeatGetLoginInfoService.js +491 -491
  90. package/src/plugins/validation.js +7 -7
  91. package/src/project/ProjectPage.vue +24 -24
  92. package/src/project/State.js +17 -17
  93. package/src/stores/AppData.js +38 -38
  94. package/src/stores/HeatAppData.js +38 -38
  95. package/src/styles/fonts/glyphicons-halflings-regular.svg +287 -287
  96. package/src/styles/less/.csscomb.json +304 -304
  97. package/src/styles/less/.csslintrc +19 -19
  98. package/src/styles/less/alerts.less +73 -73
  99. package/src/styles/less/aofeng/animate.min.css +10 -10
  100. package/src/styles/less/aofeng/expandcss.less +569 -569
  101. package/src/styles/less/aofeng/themeOne/loginStyle.less +1586 -1586
  102. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -2650
  103. package/src/styles/less/aofeng/themeOne.less +17 -17
  104. package/src/styles/less/aofeng/themeTwo/newStyle1.less +415 -415
  105. package/src/styles/less/aofeng/themeTwo.less +3 -3
  106. package/src/styles/less/badges.less +66 -66
  107. package/src/styles/less/bootstrap.less +66 -66
  108. package/src/styles/less/breadcrumbs.less +26 -26
  109. package/src/styles/less/button-groups.less +247 -247
  110. package/src/styles/less/buttons.less +172 -172
  111. package/src/styles/less/carousel.less +269 -269
  112. package/src/styles/less/close.less +34 -34
  113. package/src/styles/less/code.less +69 -69
  114. package/src/styles/less/component-animations.less +33 -33
  115. package/src/styles/less/dropdowns.less +216 -216
  116. package/src/styles/less/fonts-list.less +25 -25
  117. package/src/styles/less/forms.less +626 -626
  118. package/src/styles/less/glyphicons.less +305 -305
  119. package/src/styles/less/grid.less +84 -84
  120. package/src/styles/less/input-groups.less +167 -167
  121. package/src/styles/less/jumbotron.less +52 -52
  122. package/src/styles/less/labels.less +64 -64
  123. package/src/styles/less/list-group.less +141 -141
  124. package/src/styles/less/manageStyle/manageChile.less +180 -180
  125. package/src/styles/less/manageStyle/manageStyle.less +1102 -1102
  126. package/src/styles/less/manageStyle/safeStyle.less +498 -498
  127. package/src/styles/less/media.less +66 -66
  128. package/src/styles/less/mixins/alerts.less +14 -14
  129. package/src/styles/less/mixins/background-variant.less +9 -9
  130. package/src/styles/less/mixins/border-radius.less +18 -18
  131. package/src/styles/less/mixins/buttons.less +69 -69
  132. package/src/styles/less/mixins/center-block.less +7 -7
  133. package/src/styles/less/mixins/clearfix.less +22 -22
  134. package/src/styles/less/mixins/forms.less +90 -90
  135. package/src/styles/less/mixins/gradients.less +59 -59
  136. package/src/styles/less/mixins/grid-framework.less +92 -92
  137. package/src/styles/less/mixins/grid.less +122 -122
  138. package/src/styles/less/mixins/hide-text.less +21 -21
  139. package/src/styles/less/mixins/image.less +33 -33
  140. package/src/styles/less/mixins/labels.less +12 -12
  141. package/src/styles/less/mixins/list-group.less +30 -30
  142. package/src/styles/less/mixins/nav-divider.less +10 -10
  143. package/src/styles/less/mixins/nav-vertical-align.less +9 -9
  144. package/src/styles/less/mixins/opacity.less +8 -8
  145. package/src/styles/less/mixins/pagination.less +24 -24
  146. package/src/styles/less/mixins/panels.less +24 -24
  147. package/src/styles/less/mixins/progress-bar.less +10 -10
  148. package/src/styles/less/mixins/reset-filter.less +8 -8
  149. package/src/styles/less/mixins/reset-text.less +18 -18
  150. package/src/styles/less/mixins/resize.less +6 -6
  151. package/src/styles/less/mixins/responsive-visibility.less +15 -15
  152. package/src/styles/less/mixins/size.less +10 -10
  153. package/src/styles/less/mixins/tab-focus.less +9 -9
  154. package/src/styles/less/mixins/table-row.less +44 -44
  155. package/src/styles/less/mixins/text-emphasis.less +9 -9
  156. package/src/styles/less/mixins/text-overflow.less +8 -8
  157. package/src/styles/less/mixins/vendor-prefixes.less +227 -227
  158. package/src/styles/less/mixins.less +40 -40
  159. package/src/styles/less/modals.less +151 -151
  160. package/src/styles/less/navbar.less +660 -660
  161. package/src/styles/less/navs.less +285 -285
  162. package/src/styles/less/normalize.less +424 -424
  163. package/src/styles/less/pager.less +76 -76
  164. package/src/styles/less/pagination.less +89 -89
  165. package/src/styles/less/panels.less +275 -275
  166. package/src/styles/less/popovers.less +131 -131
  167. package/src/styles/less/print.less +101 -101
  168. package/src/styles/less/progress-bars.less +87 -87
  169. package/src/styles/less/responsive-embed.less +35 -35
  170. package/src/styles/less/responsive-utilities.less +194 -194
  171. package/src/styles/less/scaffolding.less +161 -161
  172. package/src/styles/less/stand.less +207 -207
  173. package/src/styles/less/theme.less +291 -291
  174. package/src/styles/less/thumbnails.less +36 -36
  175. package/src/styles/less/tooltip.less +102 -102
  176. package/src/styles/less/utilities.less +55 -55
  177. package/src/styles/less/wells.less +29 -29
  178. package/src/system.js +87 -87
  179. package/src/systemphone.js +11 -11
  180. package/src/util/LdapHelper.js +75 -75
  181. package/test/e2e/custom-assertions/elementCount.js +26 -26
  182. package/test/e2e/nightwatch.conf.js +40 -40
  183. package/test/e2e/runner.js +30 -30
  184. package/test/e2e/specs/test.js +14 -14
  185. package/test/unit/.eslintrc +5 -5
  186. package/test/unit/index.js +13 -13
  187. package/test/unit/init.js +10 -10
  188. package/test/unit/karma.conf.js +49 -49
  189. package/test/unit/specs/base64.spec.js +5 -5
  190. package/test/unit/specs/components/parammanage/ParamPage.spec.js +20 -20
  191. package/test/unit/specs/components/parammanage/SinglePage.spec.js +20 -20
  192. package/test/unit/specs/components/server/LeftTree/App.vue +18 -18
  193. package/test/unit/specs/components/server/LeftTree/LeftTree.spec.js +22 -22
  194. package/test/unit/specs/components/server/LoadData.spec.js +24 -24
  195. package/test/unit/specs/components/server/Login.spec.js +61 -61
  196. package/test/unit/specs/components/server/RightTree.spec.js +50 -50
  197. package/test/unit/specs/plugins/GetLoginInfoService.spec.js +55 -55
  198. package/test/unit/test.html +76 -76
  199. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
@@ -1,299 +1,299 @@
1
- <template>
2
- <div class="auto select-overspread">
3
- <validator name='v'>
4
- <ul class="nav nav-tabs" >
5
- <li role="presentation" class="active"><a href="#">POS</a></li>
6
- </ul>
7
- <form novalidate class="form-horizontal" >
8
- <div class="row">
9
- <div class="col-sm-4 form-group">
10
- <label class="font_normal_body">所属人员</label>
11
- <right-tree @re-res="getRes" :source="source"></right-tree>
12
- </div>
13
- <div class="col-sm-4 form-group" :class="[$v.f_terminal_number.required ? 'has-error' : '']">
14
- <label class="font_normal_body">设备编号</label>
15
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" v-el:f_terminal_number
16
- v-validate:f_terminal_number='{required :true}' />
17
- </div>
18
- <div class="col-sm-4 form-group" :class="[$v.f_terminal_name.required ? 'has-error' : '']">
19
- <label class="font_normal_body">设备名称</label>
20
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称"
21
- v-validate:f_terminal_name='{required: true}' />
22
- </div>
23
- <div class="col-sm-4 form-group" :class="{'has-error': $v.f_equipment_type.required}">
24
- <label class="font_normal_body">设备类型</label>
25
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型"
26
- v-validate:f_equipment_type="{required: true}" />
27
- </div>
28
- <div class="col-sm-4 form-group">
29
- <label class="font_normal_body" >MAC&nbsp;号&nbsp;</label>
30
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_mac_number" placeholder="MAC号" >
31
- </div>
32
- <div class="col-sm-4 form-group">
33
- <label class="font_normal_body" >机器编号</label>
34
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
35
- </div>
36
- <div class="col-sm-4 form-group" :class="{'has-error': $v.f_phone.required}">
37
- <label class="font_normal_body">联系电话</label>
38
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
39
- v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
40
- <!-- <div class="font_normal_body" v-if="$v.f_phone.minlength || $v.f_phone.maxlength"><span>手机号必须7-11位</span></div>-->
41
- </div>
42
- <div class="col-sm-4 form-group" :class="{'has-error': $v.f_address.required}">
43
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
44
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地"
45
- v-validate:f_address="{required: true}">
46
- </div>
47
- <div class="col-sm-4 form-group" :class="{'has-error': $v.f_bank_name.required}">
48
- <label class="font_normal_body">所属银行</label>
49
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
50
- v-validate:f_bank_name="{required: true}">
51
- </div>
52
- </div>
53
- <div class="col-sm-12 form-group">
54
- <label class="font_normal_body " >&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
55
- <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
56
- </div>
57
- </form>
58
- <div style="text-align:right;height:auto;">
59
- <button class="button_search" @click="uploadFiles()" v-if="info">上传图片</button>
60
- <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
61
- <button class="btn btn-success" @click="getEditState()" v-if="model.f_state === '停用' && info" >启用</button>
62
- <button class="btn btn-danger" @click="getEditState()" v-if="model.f_state === '正常' && info" >停用</button>
63
- <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
64
- <button class="btn button_clear " @click="cancel()" >取消</button>
65
- </div>
66
- <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
67
- <article slot="modal-body">
68
- <upload :blodid="model.f_userinfo_id" :businessid="model.id" v-ref:upload fusetype="收费" isremark="true" style="width:auto" ></upload>
69
- </article>
70
- <footer slot="modal-footer" class="modal-footer">
71
- </footer>
72
- </modal>
73
-
74
- <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
75
- <header slot="modal-header" class="modal-header">
76
- <button type="button" class="close" @click="close"><span>&times;</span></button>
77
- <h4 class="modal-title">pos机升级</h4>
78
- </header>
79
- <article slot="modal-body" class="modal-body">
80
- <form class="form-horizontal">
81
- <div class="row">
82
- <div>
83
- <h4>是否升级?</h4>
84
- </div>
85
- <!-- <div class="col-sm-6 form-group">-->
86
- <!-- <label class="font_normal_body">参数名称</label>-->
87
- <!-- <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">-->
88
- <!-- </div>-->
89
- <!-- <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
90
- <!-- <div class="checkbox">-->
91
- <!-- <label>-->
92
- <!-- <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
93
- <!-- </label>-->
94
- <!-- </div>-->
95
- <!-- </div>-->
96
- </div>
97
- </form>
98
- </article>
99
- <footer slot="modal-footer" class="modal-footer">
100
- <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
101
- <button type="button" class="button_clear button_spacing" @click='close'>否</button>
102
- </footer>
103
- </modal>
104
- </validator>
105
-
106
- </div>
107
- </template>
108
- <script>
109
- import {PagedList} from 'vue-client'
110
- export default {
111
- data () {
112
- return {
113
- checkparam: false,
114
- source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
115
- model: {
116
- f_terminal_number: '',
117
- f_terminal_name: '',
118
- f_mac_number:'',
119
- // f_username:'',
120
- f_bank_name: '',
121
- f_equipment_type: 'POS',
122
- f_state: '正常',
123
- f_machine_number: '',
124
- f_phone:'',
125
- f_comments:'',
126
- f_address:'',
127
- f_filialeids: '',
128
- f_orgid:''
129
- },
130
- showfiles: false,
131
- show:false,
132
- infoadd: this.infoadd,
133
- isSelPop: false
134
- }
135
- },
136
- props: ['data', 'f_filialeids','info'],
137
-
138
- watch: {
139
- 'data' (val) {
140
- if (val) {
141
- this.edit(val)
142
- } else {
143
- this.initModel()
144
- }
145
- }
146
- },
147
- ready () {
148
- console.log('mac信息:', this.data)
149
- if (this.data) {
150
- this.edit(this.data)
151
- }
152
- console.log('查看是否隐藏', this.info)
153
- },
154
-
155
- methods: {
156
- recursiveSelOrg(val, flag){
157
- if(val.parent){
158
- if(val.parent.resourcetype===flag){
159
- return {id: val.parent.id, name: val.parent.name}
160
- } else {
161
- return this.recursiveSelOrg(val.parent,flag)
162
- }
163
- } else {
164
- return {id: '', name: ''}
165
- }
166
- },
167
- getRes(val){
168
- console.log('====================', val)
169
- if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
170
-
171
- let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
172
- this.model.f_user_orgid=org.id
173
- this.model.f_user_orgname=org.name
174
- let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
175
- this.model.f_user_depid=dep.id
176
- this.model.f_user_depname=dep.name
177
-
178
- this.model.f_user_operatorid = val.orgobj[0].userid
179
- this.model.f_user_operator=val.orgobj[0].name
180
- this.isSelPop = true
181
- } else {
182
- // 不可提交
183
- this.isSelPop = false
184
- }
185
- },
186
- close () {
187
- this.show = false
188
- },
189
- uploadFiles(){
190
- this.showfiles= !this.showfiles
191
- },
192
- getEditState () {
193
- if (this.model.f_state === '正常') {
194
- this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认停用该设备?`, ['confirm', 'cancel']).then((res) => {
195
- if (res === 'confirm') {
196
- this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送停用指令,请稍后查看执行结果!`, 'success', 2500)
197
- this.model.f_state = '停用'
198
- try {
199
- // 测试接口
200
- // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
201
- // .then((res) => {})
202
- this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
203
- } catch (error) {
204
- this.search()
205
- }
206
- }
207
- })
208
- } else if (this.model.f_state === '停用'){
209
- this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认启用该设备?`, ['confirm', 'cancel']).then((res) => {
210
- if (res === 'confirm') {
211
- this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送启用指令,请稍后查看执行结果!`, 'success', 2500)
212
- this.model.f_state = '正常'
213
- try {
214
- // 测试接口
215
- // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
216
- // .then((res) => {})
217
- this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
218
- } catch (error) {
219
- this.search()
220
- }
221
- }
222
- })
223
- }
224
- },
225
- editBeizhu (val) {
226
- this.editshow = true
227
- this.posBase = val
228
- },
229
-
230
- //升级
231
- upgrade(){
232
- this.show=true
233
- },
234
- upgradeRoot() {
235
- this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
236
- this.$dispatch('refresh')
237
- // this.$resetpost('rs/logic/t_equipment', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
238
- // this.$dispatch('refresh')
239
- // }).catch((error) => {
240
- // this.$dispatch('refresh')
241
- // })
242
- },
243
- search () {
244
- this.$refs.paged.$refs.cri.search()
245
- },
246
- confirm () {
247
- // 如果是修改的话,只修改页面上用户填写的信息
248
- if (!this.info) {
249
- this.model.f_online = '离线'
250
- this.model.f_operator = this.$login.f.name
251
- this.model.f_orgid = this.$login.f.orgid
252
- this.model.f_filialeids = this.$login.f.orgid
253
- this.model.f_operatorid = this.$login.f.id
254
- this.model.f_orgname = this.$login.f.orgs
255
- this.model.f_depid = this.$login.f.depids
256
- this.model.f_depname = this.$login.f.deps
257
- this.model.f_orgstr = this.$login.f.fullids
258
- }
259
- this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
260
- this.$dispatch('refresh')
261
- }).catch((error) => {
262
- this.$dispatch('refresh')
263
- })
264
-
265
- },
266
- edit (row) {
267
- this.model.f_terminal_number = row.f_terminal_number
268
- this.model.f_terminal_name = row.f_terminal_name
269
- this.model.f_bank_name = row.f_bank_name
270
- this.model.f_machine_number = row.f_machine_number
271
- this.model.f_mac_number = row.f_mac_number
272
- this.model.f_address = row.f_address
273
- this.model.f_phone = row.f_phone
274
- this.model.f_state = row.f_state
275
- this.model.f_comments=row.f_comments
276
- // this.model.f_username=row.f_username
277
- this.model.id = row.id
278
- this.model.f_filialeids=row.f_filialeids
279
- this.model.f_orgid = row.f_orgid
280
- },
281
- initModel () {
282
- delete this.model.id
283
- this.model.f_terminal_number = ''
284
- this.model.f_terminal_name = ''
285
- this.model.f_bank_name = ''
286
- this.model.f_machine_number = ''
287
- this.model.f_state = '正常'
288
- this.model.f_phone = ''
289
- this.model.f_address = ''
290
- this.model.f_filialeids=''
291
- this.model.f_orgid=''
292
- this.model.f_comments=''
293
- },
294
- cancel () {
295
- this.$dispatch('close')
296
- }
297
- }
298
- }
299
- </script>
1
+ <template>
2
+ <div class="auto select-overspread">
3
+ <validator name='v'>
4
+ <ul class="nav nav-tabs" >
5
+ <li role="presentation" class="active"><a href="#">POS</a></li>
6
+ </ul>
7
+ <form novalidate class="form-horizontal" >
8
+ <div class="row">
9
+ <div class="col-sm-4 form-group">
10
+ <label class="font_normal_body">所属人员</label>
11
+ <right-tree @re-res="getRes" :source="source"></right-tree>
12
+ </div>
13
+ <div class="col-sm-4 form-group" :class="[$v.f_terminal_number.required ? 'has-error' : '']">
14
+ <label class="font_normal_body">设备编号</label>
15
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" v-el:f_terminal_number
16
+ v-validate:f_terminal_number='{required :true}' />
17
+ </div>
18
+ <div class="col-sm-4 form-group" :class="[$v.f_terminal_name.required ? 'has-error' : '']">
19
+ <label class="font_normal_body">设备名称</label>
20
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称"
21
+ v-validate:f_terminal_name='{required: true}' />
22
+ </div>
23
+ <div class="col-sm-4 form-group" :class="{'has-error': $v.f_equipment_type.required}">
24
+ <label class="font_normal_body">设备类型</label>
25
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_equipment_type" placeholder="设备类型"
26
+ v-validate:f_equipment_type="{required: true}" />
27
+ </div>
28
+ <div class="col-sm-4 form-group">
29
+ <label class="font_normal_body" >MAC&nbsp;号&nbsp;</label>
30
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_mac_number" placeholder="MAC号" >
31
+ </div>
32
+ <div class="col-sm-4 form-group">
33
+ <label class="font_normal_body" >机器编号</label>
34
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
35
+ </div>
36
+ <div class="col-sm-4 form-group" :class="{'has-error': $v.f_phone.required}">
37
+ <label class="font_normal_body">联系电话</label>
38
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone" placeholder="联系电话"
39
+ v-validate:f_phone="{required: true, minlength:7, maxlength: 11}" title="手机号必须7-11位">
40
+ <!-- <div class="font_normal_body" v-if="$v.f_phone.minlength || $v.f_phone.maxlength"><span>手机号必须7-11位</span></div>-->
41
+ </div>
42
+ <div class="col-sm-4 form-group" :class="{'has-error': $v.f_address.required}">
43
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
44
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地"
45
+ v-validate:f_address="{required: true}">
46
+ </div>
47
+ <div class="col-sm-4 form-group" :class="{'has-error': $v.f_bank_name.required}">
48
+ <label class="font_normal_body">所属银行</label>
49
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
50
+ v-validate:f_bank_name="{required: true}">
51
+ </div>
52
+ </div>
53
+ <div class="col-sm-12 form-group">
54
+ <label class="font_normal_body " >&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
55
+ <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
56
+ </div>
57
+ </form>
58
+ <div style="text-align:right;height:auto;">
59
+ <button class="button_search" @click="uploadFiles()" v-if="info">上传图片</button>
60
+ <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
61
+ <button class="btn btn-success" @click="getEditState()" v-if="model.f_state === '停用' && info" >启用</button>
62
+ <button class="btn btn-danger" @click="getEditState()" v-if="model.f_state === '正常' && info" >停用</button>
63
+ <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
64
+ <button class="btn button_clear " @click="cancel()" >取消</button>
65
+ </div>
66
+ <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
67
+ <article slot="modal-body">
68
+ <upload :blodid="model.f_userinfo_id" :businessid="model.id" v-ref:upload fusetype="收费" isremark="true" style="width:auto" ></upload>
69
+ </article>
70
+ <footer slot="modal-footer" class="modal-footer">
71
+ </footer>
72
+ </modal>
73
+
74
+ <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
75
+ <header slot="modal-header" class="modal-header">
76
+ <button type="button" class="close" @click="close"><span>&times;</span></button>
77
+ <h4 class="modal-title">pos机升级</h4>
78
+ </header>
79
+ <article slot="modal-body" class="modal-body">
80
+ <form class="form-horizontal">
81
+ <div class="row">
82
+ <div>
83
+ <h4>是否升级?</h4>
84
+ </div>
85
+ <!-- <div class="col-sm-6 form-group">-->
86
+ <!-- <label class="font_normal_body">参数名称</label>-->
87
+ <!-- <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">-->
88
+ <!-- </div>-->
89
+ <!-- <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
90
+ <!-- <div class="checkbox">-->
91
+ <!-- <label>-->
92
+ <!-- <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
93
+ <!-- </label>-->
94
+ <!-- </div>-->
95
+ <!-- </div>-->
96
+ </div>
97
+ </form>
98
+ </article>
99
+ <footer slot="modal-footer" class="modal-footer">
100
+ <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
101
+ <button type="button" class="button_clear button_spacing" @click='close'>否</button>
102
+ </footer>
103
+ </modal>
104
+ </validator>
105
+
106
+ </div>
107
+ </template>
108
+ <script>
109
+ import {PagedList} from 'vue-client'
110
+ export default {
111
+ data () {
112
+ return {
113
+ checkparam: false,
114
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
115
+ model: {
116
+ f_terminal_number: '',
117
+ f_terminal_name: '',
118
+ f_mac_number:'',
119
+ // f_username:'',
120
+ f_bank_name: '',
121
+ f_equipment_type: 'POS',
122
+ f_state: '正常',
123
+ f_machine_number: '',
124
+ f_phone:'',
125
+ f_comments:'',
126
+ f_address:'',
127
+ f_filialeids: '',
128
+ f_orgid:''
129
+ },
130
+ showfiles: false,
131
+ show:false,
132
+ infoadd: this.infoadd,
133
+ isSelPop: false
134
+ }
135
+ },
136
+ props: ['data', 'f_filialeids','info'],
137
+
138
+ watch: {
139
+ 'data' (val) {
140
+ if (val) {
141
+ this.edit(val)
142
+ } else {
143
+ this.initModel()
144
+ }
145
+ }
146
+ },
147
+ ready () {
148
+ console.log('mac信息:', this.data)
149
+ if (this.data) {
150
+ this.edit(this.data)
151
+ }
152
+ console.log('查看是否隐藏', this.info)
153
+ },
154
+
155
+ methods: {
156
+ recursiveSelOrg(val, flag){
157
+ if(val.parent){
158
+ if(val.parent.resourcetype===flag){
159
+ return {id: val.parent.id, name: val.parent.name}
160
+ } else {
161
+ return this.recursiveSelOrg(val.parent,flag)
162
+ }
163
+ } else {
164
+ return {id: '', name: ''}
165
+ }
166
+ },
167
+ getRes(val){
168
+ console.log('====================', val)
169
+ if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
170
+
171
+ let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
172
+ this.model.f_user_orgid=org.id
173
+ this.model.f_user_orgname=org.name
174
+ let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
175
+ this.model.f_user_depid=dep.id
176
+ this.model.f_user_depname=dep.name
177
+
178
+ this.model.f_user_operatorid = val.orgobj[0].userid
179
+ this.model.f_user_operator=val.orgobj[0].name
180
+ this.isSelPop = true
181
+ } else {
182
+ // 不可提交
183
+ this.isSelPop = false
184
+ }
185
+ },
186
+ close () {
187
+ this.show = false
188
+ },
189
+ uploadFiles(){
190
+ this.showfiles= !this.showfiles
191
+ },
192
+ getEditState () {
193
+ if (this.model.f_state === '正常') {
194
+ this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认停用该设备?`, ['confirm', 'cancel']).then((res) => {
195
+ if (res === 'confirm') {
196
+ this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送停用指令,请稍后查看执行结果!`, 'success', 2500)
197
+ this.model.f_state = '停用'
198
+ try {
199
+ // 测试接口
200
+ // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
201
+ // .then((res) => {})
202
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
203
+ } catch (error) {
204
+ this.search()
205
+ }
206
+ }
207
+ })
208
+ } else if (this.model.f_state === '停用'){
209
+ this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认启用该设备?`, ['confirm', 'cancel']).then((res) => {
210
+ if (res === 'confirm') {
211
+ this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送启用指令,请稍后查看执行结果!`, 'success', 2500)
212
+ this.model.f_state = '正常'
213
+ try {
214
+ // 测试接口
215
+ // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
216
+ // .then((res) => {})
217
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
218
+ } catch (error) {
219
+ this.search()
220
+ }
221
+ }
222
+ })
223
+ }
224
+ },
225
+ editBeizhu (val) {
226
+ this.editshow = true
227
+ this.posBase = val
228
+ },
229
+
230
+ //升级
231
+ upgrade(){
232
+ this.show=true
233
+ },
234
+ upgradeRoot() {
235
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
236
+ this.$dispatch('refresh')
237
+ // this.$resetpost('rs/logic/t_equipment', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
238
+ // this.$dispatch('refresh')
239
+ // }).catch((error) => {
240
+ // this.$dispatch('refresh')
241
+ // })
242
+ },
243
+ search () {
244
+ this.$refs.paged.$refs.cri.search()
245
+ },
246
+ confirm () {
247
+ // 如果是修改的话,只修改页面上用户填写的信息
248
+ if (!this.info) {
249
+ this.model.f_online = '离线'
250
+ this.model.f_operator = this.$login.f.name
251
+ this.model.f_orgid = this.$login.f.orgid
252
+ this.model.f_filialeids = this.$login.f.orgid
253
+ this.model.f_operatorid = this.$login.f.id
254
+ this.model.f_orgname = this.$login.f.orgs
255
+ this.model.f_depid = this.$login.f.depids
256
+ this.model.f_depname = this.$login.f.deps
257
+ this.model.f_orgstr = this.$login.f.fullids
258
+ }
259
+ this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
260
+ this.$dispatch('refresh')
261
+ }).catch((error) => {
262
+ this.$dispatch('refresh')
263
+ })
264
+
265
+ },
266
+ edit (row) {
267
+ this.model.f_terminal_number = row.f_terminal_number
268
+ this.model.f_terminal_name = row.f_terminal_name
269
+ this.model.f_bank_name = row.f_bank_name
270
+ this.model.f_machine_number = row.f_machine_number
271
+ this.model.f_mac_number = row.f_mac_number
272
+ this.model.f_address = row.f_address
273
+ this.model.f_phone = row.f_phone
274
+ this.model.f_state = row.f_state
275
+ this.model.f_comments=row.f_comments
276
+ // this.model.f_username=row.f_username
277
+ this.model.id = row.id
278
+ this.model.f_filialeids=row.f_filialeids
279
+ this.model.f_orgid = row.f_orgid
280
+ },
281
+ initModel () {
282
+ delete this.model.id
283
+ this.model.f_terminal_number = ''
284
+ this.model.f_terminal_name = ''
285
+ this.model.f_bank_name = ''
286
+ this.model.f_machine_number = ''
287
+ this.model.f_state = '正常'
288
+ this.model.f_phone = ''
289
+ this.model.f_address = ''
290
+ this.model.f_filialeids=''
291
+ this.model.f_orgid=''
292
+ this.model.f_comments=''
293
+ },
294
+ cancel () {
295
+ this.$dispatch('close')
296
+ }
297
+ }
298
+ }
299
+ </script>