system-clients 3.2.6-rongcheng → 3.2.7-aodeToV4

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 (155) hide show
  1. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  2. package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
  3. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  4. package/.gradle/7.1/fileChanges/last-build.bin +0 -0
  5. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  6. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  7. package/.gradle/7.1/gc.properties +0 -0
  8. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  9. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  10. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  11. package/.gradle/checksums/checksums.lock +0 -0
  12. package/.gradle/vcs-1/gc.properties +0 -0
  13. package/build/webpack.base.conf.js +4 -1
  14. package/gradle/wrapper/gradle-wrapper.jar +0 -0
  15. package/gradle/wrapper/gradle-wrapper.properties +5 -0
  16. package/gradlew +185 -0
  17. package/gradlew.bat +89 -0
  18. package/package.json +102 -102
  19. package/src/App.vue +1 -1
  20. package/src/components/Main.vue +46 -152
  21. package/src/components/equipment/EquipmentManage.vue +3 -3
  22. package/src/components/equipment/PcAdd.vue +1 -1
  23. package/src/components/equipment/PcList.vue +4 -3
  24. package/src/components/equipment/PhoneAdd.vue +1 -1
  25. package/src/components/equipment/PhoneList.vue +3 -3
  26. package/src/components/equipment/PosAdd.vue +24 -5
  27. package/src/components/equipment/PosList.vue +15 -15
  28. package/src/components/equipment/PosManage.vue +3 -2
  29. package/src/components/materialManage/materialList.vue +1 -1
  30. package/src/components/parammanage/ParamPage.vue +6 -6
  31. package/src/components/parammanage/ParamPages.vue +5 -5
  32. package/src/components/parammanage/SinglePage.vue +3 -3
  33. package/src/components/parammanage/SinglePages.vue +3 -3
  34. package/src/components/server/AddChangeMsg.vue +1 -1
  35. package/src/components/server/ChangeDeclare.vue +1 -1
  36. package/src/components/server/Login.vue +630 -529
  37. package/src/components/server/ModifyPw.vue +11 -5
  38. package/src/components/server/NewResSelectGroup.vue +211 -0
  39. package/src/components/server/ResSelect.vue +3 -0
  40. package/src/components/server/ResSelectGroup.vue +165 -198
  41. package/src/components/server/RightTree.vue +87 -7
  42. package/src/components/server/RoleSelector.vue +4 -3
  43. package/src/components/server/TestResSelectGroup.vue +2 -2
  44. package/src/plugins/EncryptUtil.js +53 -0
  45. package/src/plugins/GetLoginInfoService.js +88 -104
  46. package/src/plugins/HeatGetLoginInfoService.js +491 -0
  47. package/src/plugins/validation.js +1 -1
  48. package/src/project/State.js +1 -1
  49. package/src/stores/AppData.js +1 -1
  50. package/src/stores/HeatAppData.js +38 -0
  51. package/src/styles/fonts/PINGFANG LIGHT.TTF +0 -0
  52. package/src/styles/fonts/PingFangSC-Regular.ttf +0 -0
  53. package/src/styles/fonts/glyphicons-halflings-regular.eot +0 -0
  54. package/src/styles/fonts/glyphicons-halflings-regular.svg +288 -0
  55. package/src/styles/fonts/glyphicons-halflings-regular.ttf +0 -0
  56. package/src/styles/fonts/glyphicons-halflings-regular.woff +0 -0
  57. package/src/styles/fonts/glyphicons-halflings-regular.woff2 +0 -0
  58. package/src/styles/fonts/pingfang-bold.ttf +0 -0
  59. package/src/styles/fonts/pingfang-medium.ttf +0 -0
  60. package/src/styles/fonts/pingfang-regular.ttf +0 -0
  61. package/src/styles/fonts/trendstrends.ttf +0 -0
  62. package/src/styles/fonts//346/261/211/344/273/252/350/217/261/345/277/203/344/275/223/347/256/200.ttf +0 -0
  63. package/src/styles/less/.csscomb.json +304 -0
  64. package/src/styles/less/.csslintrc +19 -0
  65. package/src/styles/less/alerts.less +73 -0
  66. package/src/styles/less/aofeng/animate.min.css +11 -0
  67. package/src/styles/less/aofeng/expandcss.less +569 -0
  68. package/src/styles/less/aofeng/standard.less +2121 -0
  69. package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +686 -0
  70. package/src/styles/less/aofeng/themeOne/loginStyle.less +1586 -0
  71. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -0
  72. package/src/styles/less/aofeng/themeOne.less +17 -0
  73. package/src/styles/less/aofeng/themeTwo/newStyle1.less +415 -0
  74. package/src/styles/less/aofeng/themeTwo.less +3 -0
  75. package/src/styles/less/badges.less +66 -0
  76. package/src/styles/less/bootstrap.less +66 -0
  77. package/src/styles/less/breadcrumbs.less +26 -0
  78. package/src/styles/less/button-groups.less +247 -0
  79. package/src/styles/less/buttons.less +172 -0
  80. package/src/styles/less/carousel.less +269 -0
  81. package/src/styles/less/close.less +34 -0
  82. package/src/styles/less/code.less +69 -0
  83. package/src/styles/less/component-animations.less +33 -0
  84. package/src/styles/less/dropdowns.less +216 -0
  85. package/src/styles/less/fonts-list.less +25 -0
  86. package/src/styles/less/forms.less +626 -0
  87. package/src/styles/less/glyphicons.less +305 -0
  88. package/src/styles/less/grid.less +84 -0
  89. package/src/styles/less/input-groups.less +167 -0
  90. package/src/styles/less/jumbotron.less +52 -0
  91. package/src/styles/less/labels.less +64 -0
  92. package/src/styles/less/list-group.less +141 -0
  93. package/src/styles/less/manageStyle/manageChile.less +180 -0
  94. package/src/styles/less/manageStyle/manageStyle.less +1102 -0
  95. package/src/styles/less/manageStyle/safeStyle.less +498 -0
  96. package/src/styles/less/media.less +66 -0
  97. package/src/styles/less/mixins/alerts.less +14 -0
  98. package/src/styles/less/mixins/background-variant.less +9 -0
  99. package/src/styles/less/mixins/border-radius.less +18 -0
  100. package/src/styles/less/mixins/buttons.less +69 -0
  101. package/src/styles/less/mixins/center-block.less +7 -0
  102. package/src/styles/less/mixins/clearfix.less +22 -0
  103. package/src/styles/less/mixins/forms.less +90 -0
  104. package/src/styles/less/mixins/gradients.less +59 -0
  105. package/src/styles/less/mixins/grid-framework.less +92 -0
  106. package/src/styles/less/mixins/grid.less +122 -0
  107. package/src/styles/less/mixins/hide-text.less +21 -0
  108. package/src/styles/less/mixins/image.less +33 -0
  109. package/src/styles/less/mixins/labels.less +12 -0
  110. package/src/styles/less/mixins/list-group.less +30 -0
  111. package/src/styles/less/mixins/nav-divider.less +10 -0
  112. package/src/styles/less/mixins/nav-vertical-align.less +9 -0
  113. package/src/styles/less/mixins/opacity.less +8 -0
  114. package/src/styles/less/mixins/pagination.less +24 -0
  115. package/src/styles/less/mixins/panels.less +24 -0
  116. package/src/styles/less/mixins/progress-bar.less +10 -0
  117. package/src/styles/less/mixins/reset-filter.less +8 -0
  118. package/src/styles/less/mixins/reset-text.less +18 -0
  119. package/src/styles/less/mixins/resize.less +6 -0
  120. package/src/styles/less/mixins/responsive-visibility.less +15 -0
  121. package/src/styles/less/mixins/size.less +10 -0
  122. package/src/styles/less/mixins/tab-focus.less +9 -0
  123. package/src/styles/less/mixins/table-row.less +44 -0
  124. package/src/styles/less/mixins/text-emphasis.less +9 -0
  125. package/src/styles/less/mixins/text-overflow.less +8 -0
  126. package/src/styles/less/mixins/vendor-prefixes.less +227 -0
  127. package/src/styles/less/mixins.less +40 -0
  128. package/src/styles/less/modals.less +151 -0
  129. package/src/styles/less/navbar.less +660 -0
  130. package/src/styles/less/navs.less +285 -0
  131. package/src/styles/less/normalize.less +424 -0
  132. package/src/styles/less/pager.less +76 -0
  133. package/src/styles/less/pagination.less +89 -0
  134. package/src/styles/less/panels.less +275 -0
  135. package/src/styles/less/popovers.less +131 -0
  136. package/src/styles/less/print.less +101 -0
  137. package/src/styles/less/progress-bars.less +87 -0
  138. package/src/styles/less/responsive-embed.less +35 -0
  139. package/src/styles/less/responsive-utilities.less +194 -0
  140. package/src/styles/less/scaffolding.less +161 -0
  141. package/src/styles/less/stand.less +207 -0
  142. package/src/styles/less/tables.less +262 -0
  143. package/src/styles/less/theme.less +291 -0
  144. package/src/styles/less/thumbnails.less +36 -0
  145. package/src/styles/less/tooltip.less +102 -0
  146. package/src/styles/less/type.less +303 -0
  147. package/src/styles/less/utilities.less +55 -0
  148. package/src/styles/less/variables.less +896 -0
  149. package/src/styles/less/wells.less +29 -0
  150. package/src/system.js +9 -0
  151. package/static/aodelogo.png +0 -0
  152. package/static/aodenewlogo.png +0 -0
  153. package/static/ewmlogo.png +0 -0
  154. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
  155. /package/.gradle/{buildOutputCleanup/built.bin → 7.1/dependencies-accessors/gc.properties} +0 -0
@@ -1,76 +1,25 @@
1
1
  <template>
2
2
  <div @click="hindsetting1()">
3
- <!-- <div class="system-main" id="box" v-el:box v-if="!isManger">-->
4
- <!-- <div class="system-logo" style="height: auto">-->
5
- <!-- <img :src="imgs.logoimg" alt=""/>-->
6
- <!-- <label>{{systemname}}</label>-->
7
- <!-- <div class="system-logo-chi" >-->
8
- <!-- <div v-if="userpane" class="auto system-logo-prompt" style="float: right">-->
9
- <!-- <span>{{orgpathnames}}</span>-->
10
- <!-- </div>-->
11
- <!-- &lt;!&ndash;<div class="system-logo-chi-img1" style="float: right" @mouseenter="mouseenteruser()" @mouseleave="mouseleaveuser()"></div>&ndash;&gt;-->
12
- <!-- <span style="float: right; padding-top: 2px" @mouseenter="mouseenteruser()" @mouseleave="mouseleaveuser()" class="system-logo-chi-span-1">{{$login.f.name}}</span>-->
13
- <!-- <span style="border-left: 1px solid;float: right;padding-top: 2px" class="system-logo-chi-span-1"> <img src="../../static/newStyle/login-f.png" height="20" width="20"> </span>-->
14
- <!-- <a href="index.html" onclick="return confirm('您确定要退出系统吗?');" style="float: right;padding-top: 2px">-->
15
- <!-- <img src="../../static/newStyle/system-off.png" alt="" >-->
16
- <!-- <span class="system-logo-chi-span-1">退出系统</span>-->
17
- <!-- </a>-->
18
- <!-- <div style="float: right" :class="{'dropstyle':setting,'dropstyle-1':!setting}">-->
19
- <!-- <dropdown class="auto" >-->
20
- <!-- <span data-toggle="dropdown" @click="hindsetting()" >-->
21
- <!-- <img :src="srcsetting" alt=""><span>系统设置</span>-->
22
- <!-- </span>-->
23
- <!-- <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-up dropstyle-chi" >-->
24
- <!-- &lt;!&ndash; <li>系统信息及设置</li>&ndash;&gt;-->
25
- <!-- <li style="color: #ffffff;white-space: nowrap" @click="show=true">修改密码</li>-->
26
- <!-- <li style="color: #ffffff;white-space: nowrap" @click="AddChangeMsgShow=true">系统版本</li>-->
27
- <!-- </ul>-->
28
- <!-- </dropdown>-->
29
- <!-- </div>-->
30
3
 
31
- <!-- </div>-->
32
- <!-- </div>-->
33
- <!-- <div class="system-left tree-flex" :class="{'system-left-1': !treeOrIcon}" id="top" v-el:top >-->
34
- <!-- <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}" >-->
35
- <!-- <div class="span system-left-tree" >-->
36
- <!-- <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" :treeOrIcon="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>-->
37
- <!-- &lt;!&ndash; <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
38
- <!-- </div>-->
39
- <!-- </div>-->
40
- <!-- <div class="system-foot-stretch" >-->
41
- <!-- <a @click="changeShow()"><img src="../../static/images/lefticon/菜单伸缩.png" alt=""></a>-->
42
- <!-- </div>-->
43
- <!-- </div>-->
44
-
45
-
46
- <!-- <div class="system-right" :class="{'system-right-1': !treeOrIcon}" id="bottom" v-el:bottom>-->
47
- <!-- <div class="span">-->
48
- <!-- <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>-->
49
- <!-- <dynamic :comps='[]' :showup="true" :showhide="false" name='main' :selecttab.sync="selecttab" @tab-changed="tabChange" @tabscg="tabcg" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>-->
50
- <!-- </div>-->
51
- <!-- </div>-->
52
- <!-- <div class="system-foot" v-el:bottom>-->
53
-
54
- <!-- <div class="system-foot-box">-->
55
-
56
- <!-- </div>-->
57
- <!-- </div>-->
58
- <!-- </div>-->
59
4
  <div class='flex-row system-main' id="box" v-el:box v-if="!isManger">
5
+
60
6
  <div class="auto " :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
61
- <span>
62
- <img
63
- src="../assets/people.png" height="15" width="15">
64
- 登录人:</span>
65
- <label>{{orgpathnames}}</label>
7
+ <span class="glyphicon glyphicon-asterisk" style="color:#a1d0f5"></span>
8
+ <span>组织编码:</span>
9
+ <label style="margin-right:14px;">{{$login.f.number}}</label>
10
+ <span class="glyphicon glyphicon-user" style="color:#a1d0f5"></span>
11
+ <span>登录人:</span>
12
+ <label>{{orgpathnames}}</label>
66
13
  </div>
67
14
  <div class="system-left tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
68
15
  <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}" >
69
16
  <div class="span system-left-tree " style="height:85%">
70
- <h3>{{systemname}}</h3>
17
+ <div class="logopicaode" >
18
+ <div class="aodeloginedlogo"></div>
19
+ </div>
20
+ <h3 style="margin-bottom: 12px;height: 35px;">&nbsp;&nbsp;</h3>
71
21
  <!-- <div class="span" style="margin-bottom:10px;padding-bottom:5px;padding-top:5px;flex: 1;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;">-->
72
22
  <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>
73
- <!--&lt;!&ndash; <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
74
23
  </div>
75
24
 
76
25
  <div class="tree-flex-footer">
@@ -85,11 +34,12 @@
85
34
  <!-- <li>{{name}}</li> -->
86
35
  <li>{{date}}</li>
87
36
  <li @click="show=true">修改密码</li>
37
+ <li @click="clearCache">清除缓存</li>
88
38
  <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
89
39
  </ul>
90
40
 
91
41
  </dropdown>
92
- <a href="index.html" onclick="return confirm('您确定要退出系统吗?');">
42
+ <a href="index.html" @click.prevent="logOut">
93
43
  <img :src="imgs.out" alt="" ><span v-if="treeOrIcon">退出系统</span>
94
44
  </a>
95
45
  </div>
@@ -150,17 +100,12 @@
150
100
  tabs:[], //已初始化页签数组
151
101
  selecttab:'',
152
102
  setting:true,
153
- srcsetting:'../../static/newStyle/setting.png',
103
+ srcsetting:'../../static/newStyle/setting.png'
154
104
 
155
105
  // headerHint: true, // 右侧顶部提示信息
156
106
  // value: 25645.26,
157
107
  // AddChangeMsgShow: false,
158
108
  // showsum: false
159
- lockReconnect: false, // 避免重复连接
160
- timeout: 10000, // 10秒发一次心跳
161
- connectNumber: 10, // 重连次数
162
- timeoutObj: null,
163
- serverTimeoutObj: null
164
109
  }
165
110
  },
166
111
  ready () {
@@ -207,91 +152,8 @@
207
152
  // return false
208
153
  // }
209
154
  this.changeShow()
210
-
211
- vue.prototype.$connectNumber = this.connectNumber
212
- this.initWebSocket()
213
155
  },
214
156
  methods: {
215
- // 清除
216
- reset () {
217
- clearTimeout(this.timeoutObj)
218
- clearTimeout(this.serverTimeoutObj)
219
- },
220
- // 发送心跳
221
- start () {
222
- // 重置
223
- vue.prototype.$connectNumber = this.connectNumber
224
- this.timeoutObj = setTimeout(() => {
225
- this.$socket.send('ping')
226
- console.log('ping!')
227
- this.serverTimeoutObj = setTimeout(() => {
228
- this.$socket.close()
229
- }, this.timeout)
230
- }, this.timeout)
231
- },
232
- // 重连
233
- reconnect () {
234
- if (this.lockReconnect) return
235
- if (this.$connectNumber <= 0) {
236
- vue.showMessage('连接已断开,将无法接收消息,请重新登录', ['confirm']).then((res) => {
237
- if (res === 'confirm') {
238
- location.reload()
239
- }
240
- })
241
- return
242
- }
243
- this.$connectNumber--
244
- setTimeout(() => {
245
- console.log('连接异常,尝试重新连接。。。。')
246
- this.initWebSocket()
247
- this.lockReconnect = false
248
- }, 1000 * 60)
249
- },
250
- // 初始化
251
- initWebSocket () {
252
- let path = `ws://${location.host}/ws?token=${this.$login.f.id}`
253
- try {
254
- if ('WebSocket' in window) {
255
- // 创建对象
256
- vue.prototype.$socket = new WebSocket(path)
257
- } else {
258
- this.$showMessage('您的浏览器不支持websocket的协议,建议使用新版谷歌浏览器,请勿使用IE浏览器,360浏览器请使用极速模式,不要使用兼容模式!"')
259
- }
260
- } catch (e) {
261
- this.reconnect()
262
- }
263
-
264
- this.$socket.onopen = this.onOpen // 连接成功
265
- this.$socket.onmessage = this.onMessage // 收到消息时回调
266
- this.$socket.onclose = this.onClose // 连接关闭时回调
267
- this.$socket.onerror = this.onError // 通讯异常
268
- },
269
- // 通讯异常
270
- onError () {
271
- this.reconnect()
272
- },
273
- // 连接成功
274
- onOpen () {
275
- console.log('webSocket连接成功')
276
- this.start()
277
- },
278
- // 收到消息时回调函数
279
- onMessage (event) {
280
- if (event.data === 'pong') {
281
- this.reset()
282
- this.start()
283
- return
284
- }
285
- let data = JSON.parse(event.data)
286
- this.$broadcast('onMessage', data)
287
- this.$showMessage(data.message)
288
- },
289
- // 关闭连接时回调函数
290
- onClose () {
291
- console.log('webSocket连接断开')
292
- this.reset()
293
- this.reconnect()
294
- },
295
157
  hindsetting(){
296
158
 
297
159
  this.setting=!this.setting
@@ -359,6 +221,26 @@
359
221
  tabcg(val){
360
222
  console.log(val)
361
223
  this.tabs = val
224
+ },
225
+ logOut () {
226
+ console.log(this.$login.f)
227
+ this.$showMessage('您确定要退出系统吗?', ['confirm', 'cancel']).then(async (res) => {
228
+ if (res == 'confirm') {
229
+ let data = {
230
+ userid: this.$login.f.id,
231
+ username: this.$login.f.name,
232
+ usertelephone: this.$login.f.f_user_telephone
233
+ }
234
+ try {
235
+ await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
236
+ }catch(e){
237
+ }
238
+ window.location.reload()
239
+ }
240
+ })
241
+ },
242
+ clearCache() {
243
+ this.$resetpost('/rs/search/clearCache', { userid: this.$login.f.id }, { resolveMsg: '清除缓存成功', rejectMsg: '清除缓存失败,请重试' })
362
244
  }
363
245
  },
364
246
  computed: {
@@ -578,6 +460,18 @@
578
460
  .tree-img {
579
461
  font-size: 1.2em;
580
462
  }
463
+ .aodeloginedlogo {
464
+ background:url(../../static/aodenewlogo.png);
465
+ background-size:80%;
466
+ background-repeat: no-repeat;
467
+ }
468
+ .logopicaode{
469
+ width: 100%;
470
+ height: 61px;
471
+ float: left;
472
+ margin-left: 2.5%;
473
+ margin-top: 10px;
474
+ }
581
475
 
582
476
  /*将较长信息截断显示,鼠标悬停显示全部信息*/
583
477
  .cutout50 {
@@ -19,8 +19,8 @@
19
19
  <div v-if="model.f_equipment_type[0] === 'PC'">
20
20
  <pc-manage></pc-manage>
21
21
  </div>
22
- <div v-if="model.f_equipment_type[0] === 'POS'">
23
- <pos-manage></pos-manage>
22
+ <div v-if="model.f_equipment_type[0] === 'POS'||model.f_equipment_type[0] === '自助写卡机'||model.f_equipment_type[0] === '手持POS'">
23
+ <pos-manage :type="model.f_equipment_type[0]"></pos-manage>
24
24
  </div>
25
25
  <div v-if="model.f_equipment_type[0] === 'PHONE'">
26
26
  <phone-manage></phone-manage>
@@ -46,7 +46,7 @@
46
46
  },
47
47
  ready () {
48
48
  console.log('看看终端类型', this.equipmentType)
49
- this.model.f_equipment_type = [this.equipmentType[0].value]
49
+ this.model.f_equipment_type = ['POS']
50
50
  },
51
51
  methods: {
52
52
  del (row) {
@@ -74,7 +74,7 @@
74
74
  this.model.f_operatorid = this.$login.f.id
75
75
  this.model.f_orgid = this.f_orgid
76
76
  console.log('保存', this.model)
77
- this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
77
+ this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
78
78
  this.$dispatch('refresh')
79
79
  }).catch((error) => {
80
80
  this.$dispatch('refresh')
@@ -76,9 +76,10 @@
76
76
  data () {
77
77
  return {
78
78
  criteriaShow: false,
79
- model: new PagedList('rs/sql/equipmentQuery', 20),
79
+ model: new PagedList('api/af-system/sql/equipmentQuery', 20),
80
80
  curorgid: [this.$login.f.orgid],
81
- f_orgid: ''
81
+ f_filialeid: this.$login.f.orgid,
82
+ f_orgid: this.$login.f.orgid
82
83
  }
83
84
  },
84
85
  ready () {
@@ -102,7 +103,7 @@
102
103
  del (row) {
103
104
  console.log('要删除了', row)
104
105
  row.f_state = '已删除'
105
- this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
106
+ this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
106
107
  this.$dispatch('refresh')
107
108
  }).catch((error) => {
108
109
  this.$dispatch('refresh')
@@ -65,7 +65,7 @@
65
65
  this.model.f_operator = this.$login.f.name
66
66
  this.model.f_filialeids = this.filialeCodeStr
67
67
  console.log('保存', this.model)
68
- this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
68
+ this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
69
69
  this.$dispatch('refresh')
70
70
  }).catch(() => {
71
71
  this.$dispatch('refresh')
@@ -58,7 +58,7 @@
58
58
  components: {},
59
59
  data () {
60
60
  return {
61
- model: new PagedList('rs/sql/equipmentQuery', 20),
61
+ model: new PagedList('api/af-system/sql/equipmentQuery', 20),
62
62
  filialeNameStr: this.$login.f.f_fengongsi,
63
63
  filialeCodeStr: this.$login.f.f_orgids,
64
64
  userid:this.$login.f.id,
@@ -75,7 +75,7 @@
75
75
  },
76
76
 
77
77
  selfSearch (args) {
78
- args.condition = `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_filialeids like '${this.filialeCodeStr}%'`
78
+ args.condition = `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid like '${this.filialeCodeStr}%'`
79
79
  this.model.search(args.condition, this.model)
80
80
  },
81
81
  add () {
@@ -84,7 +84,7 @@
84
84
  del (row) {
85
85
  console.log('要删除了', row)
86
86
  row.f_state = '已删除'
87
- this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
87
+ this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
88
88
  this.$dispatch('refresh')
89
89
  }).catch((error) => {
90
90
  this.$dispatch('refresh')
@@ -2,9 +2,19 @@
2
2
  <div class="auto select-overspread">
3
3
  <validator name='v'>
4
4
  <ul class="nav nav-tabs" >
5
- <li role="presentation" class="active"><a href="#">POS</a></li>
5
+ <li role="presentation" class="active"><a href="#">{{ type }}</a></li>
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
+ <div class="row">
9
+ <div class="col-sm-6">
10
+ <label class="font_normal_body">使用公司</label>
11
+ <res-select restype='organization'
12
+ is-mul="false"
13
+ @res-select="getorg"
14
+ :initresid="curorgid">
15
+ </res-select>
16
+ </div>
17
+ </div>
8
18
  <div class="row">
9
19
  <div class="col-sm-6">
10
20
  <label class="font_normal_body" >设备编号</label>
@@ -35,6 +45,7 @@
35
45
  <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
36
46
  </div>
37
47
  </div>
48
+
38
49
  <div class="col-sm-12">
39
50
  <label class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
40
51
  <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
@@ -53,11 +64,14 @@
53
64
  export default {
54
65
  data () {
55
66
  return {
67
+ f_orgid:'',
68
+ f_filialeid:'',
69
+ curorgid: [this.f_filialeids],
56
70
  model: {
57
71
  f_terminal_number: '',
58
72
  f_terminal_name: '',
59
73
  f_bank_name: '',
60
- f_equipment_type: 'POS',
74
+ f_equipment_type: '',
61
75
  f_state: '正常',
62
76
  f_machine_number:'',
63
77
  f_phone:'',
@@ -68,7 +82,7 @@
68
82
  }
69
83
  }
70
84
  },
71
- props: ['data', 'f_filialeids'],
85
+ props: ['data', 'f_filialeids','type'],
72
86
  watch: {
73
87
  'data' (val) {
74
88
  if (val) {
@@ -85,16 +99,21 @@
85
99
  }
86
100
  },
87
101
  methods: {
102
+ getorg (val) {
103
+ this.f_orgid = val[0]
104
+ this.f_filialeids = val[0]
105
+ },
88
106
  confirm () {
89
107
  // if(this.f_filialeids!=''&&this.f_filialeids!=null){
90
108
  this.model.f_operator = this.$login.f.name
109
+ this.model.f_equipment_type = this.type
91
110
  this.model.f_operatorid = this.$login.f.id
92
111
  this.model.f_filialeids = this.f_filialeids
93
- this.model.f_orgid = this.$login.f.orgid
112
+ this.model.f_orgid = this.f_filialeids
94
113
  this.model.f_orgname = this.$login.f.orgs
95
114
  this.model.f_depid = this.$login.f.depids
96
115
  this.model.f_depname = this.$login.f.deps
97
- this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
116
+ this.$resetpost('api/af-system/logic/saveEquipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
98
117
  this.$dispatch('refresh')
99
118
  }).catch((error) => {
100
119
  this.$dispatch('refresh')
@@ -65,10 +65,10 @@
65
65
  <th>联系电话</th>
66
66
  <th>所在地</th>
67
67
  <th>所属银行</th>
68
- <th>电池电量</th>
69
- <th>是否登录</th>
70
- <th>更新时间</th>
71
- <th>软件版本</th>
68
+ <!-- <th>电池电量</th>-->
69
+ <!-- <th>是否登录</th>-->
70
+ <!-- <th>更新时间</th>-->
71
+ <!-- <th>软件版本</th>-->
72
72
  <th>操作</th>
73
73
  </tr>
74
74
  </template>
@@ -81,10 +81,10 @@
81
81
  <td style="text-align:center">{{row.f_phone}}</td>
82
82
  <td style="text-align:center">{{row.f_address}}</td>
83
83
  <td style="text-align:center">{{row.f_bank_name}}</td>
84
- <td style="text-align:center">{{row.f_battery_level}}</td>
85
- <td style="text-align:center">{{row.f_is_login}}</td>
86
- <td style="text-align:center">{{row.f_hybrid_version}}</td>
87
- <td style="text-align:center">{{row.f_appVer}}</td>
84
+ <!-- <td style="text-align:center">{{row.f_battery_level}}</td>-->
85
+ <!-- <td style="text-align:center">{{row.f_is_login}}</td>-->
86
+ <!-- <td style="text-align:center">{{row.f_hybrid_version}}</td>-->
87
+ <!-- <td style="text-align:center">{{row.f_appVer}}</td>-->
88
88
  <td style="text-align:center">
89
89
  <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
90
90
  </td>
@@ -104,14 +104,14 @@
104
104
  components: {},
105
105
  data () {
106
106
  return {
107
- model: new PagedList('rs/sql/equipmentQuery', 20),
108
- curorgid: [this.f_filialeid],
109
- f_orgid: '',
110
- f_filialeids:'',
107
+ model: new PagedList('api/af-system/sql/equipmentQuery', 20),
108
+ curorgid: [this.$login.f.orgid],
109
+ f_filialeid: this.$login.f.orgid,
110
+ f_orgid: this.$login.f.orgid,
111
111
  criteriaShow: false
112
112
  }
113
113
  },
114
- props: ['f_filialeid'],
114
+ props: ['f_filialeid','type'],
115
115
  ready () {
116
116
  this.search()
117
117
  },
@@ -123,7 +123,7 @@
123
123
  },
124
124
 
125
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}'`
126
+ args.condition = `${args.condition} and f_equipment_type = '${this.type}' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
127
127
  this.model.search(args.condition, this.model)
128
128
  this.$dispatch('research')
129
129
  },
@@ -141,7 +141,7 @@
141
141
  del (row) {
142
142
  console.log('要删除了', row)
143
143
  row.f_state = '已删除'
144
- this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
144
+ this.$resetpost('api/af-system/logic/saveEquipment', row, {warnMsg: '确定要删除这条信息吗?', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
145
145
  this.$dispatch('refresh')
146
146
  }).catch((error) => {
147
147
  this.$dispatch('refresh')
@@ -1,10 +1,10 @@
1
1
  <template>
2
2
  <div class="flex-row">
3
3
  <div :class="{'basic-main':!isChange,'binary-left':isChange}">
4
- <pos-list :row="row" @select-changed="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
4
+ <pos-list :type="type" :row="row" @select-changed="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
5
5
  </div>
6
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>
7
+ <pos-add :type="type" :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
8
8
  </div>
9
9
  </div>
10
10
  </template>
@@ -15,6 +15,7 @@
15
15
 
16
16
  export default {
17
17
  title: 'POS终端管理',
18
+ props:['type'],
18
19
  components: {
19
20
  PosList, PosAdd
20
21
  },
@@ -175,7 +175,7 @@
175
175
  data(){
176
176
  //配置后台systemModule,sql
177
177
  return{
178
- model: new PagedList('rs/sql/singleTable_OrderBy', 50),
178
+ model: new PagedList('api/af-revenue/sql/singleTable_OrderBy', 50),
179
179
  row: null,
180
180
  searchshow: true,
181
181
  obj: {
@@ -175,7 +175,7 @@
175
175
  async queryParam (condition) {
176
176
  this.model.rows = []
177
177
  let http = new HttpResetClass()
178
- let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
178
+ let res = await http.load('POST', 'api/af-system/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
179
179
  this.model.rows = res.data
180
180
  },
181
181
  selected (val) {
@@ -184,7 +184,7 @@
184
184
  },
185
185
  async getParamValue(obj) {
186
186
  let http = new HttpResetClass()
187
- let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
187
+ let res = await http.load('POST', 'api/af-system/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
188
188
  this.params.rows = res.data
189
189
  },
190
190
  filter_query (paramName,orgid) {
@@ -235,7 +235,7 @@
235
235
  if (type === 't_parameter') {
236
236
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
237
237
  if (res === 'confirm') {
238
- this.$resetpost('rs/logic/deleteParam', row).then((res) => {
238
+ this.$resetpost('api/af-system/logic/deleteParam', row).then((res) => {
239
239
  this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
240
240
  this.selectItem = null
241
241
  })
@@ -244,7 +244,7 @@
244
244
  } else if (type === 't_paramvalue') {
245
245
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
246
246
  if (res === 'confirm') {
247
- this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
247
+ this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
248
248
  this.getParamValue(this.selectItem)
249
249
  })
250
250
  }
@@ -268,7 +268,7 @@
268
268
  //添加当前分公司
269
269
  }
270
270
  data.f_filialeids = this.modifyItem.f_filialeids
271
- this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
271
+ this.$resetpost('api/af-system/logic/system_saveParam', data).then((res) => {
272
272
  //无id
273
273
  this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
274
274
  this.show = false
@@ -287,7 +287,7 @@
287
287
  processid: this.selectItem.id
288
288
  }
289
289
  }
290
- this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
290
+ this.$resetpost('api/af-system/logic/system_saveParamValue', data).then((res) => {
291
291
  this.show = false
292
292
  // 如果没有id,需要在数组中添加
293
293
  this.getParamValue(this.selectItem)
@@ -113,7 +113,7 @@
113
113
  methods: {
114
114
  // 加载全部参数
115
115
  loadParams () {
116
- this.$refs.paramsLoad.load('rs/sql/hql/simpleHql', {data: {tablename: 't_parameter'}}).then((res) => {
116
+ this.$refs.paramsLoad.load('api/af-system/sql/hql/simpleHql', {data: {tablename: 't_parameter'}}).then((res) => {
117
117
  this.model.rows = this.allParams = res.data
118
118
  })
119
119
  },
@@ -150,7 +150,7 @@
150
150
  if (row.EntityType === 't_parameter') {
151
151
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
152
152
  if (res === 'confirm') {
153
- this.$refs.paramsLoad.load('rs/logic/deleteParam', row).then((res) => {
153
+ this.$refs.paramsLoad.load('api/af-revenue/logic/deleteParam', row).then((res) => {
154
154
  this.loadParams()
155
155
  this.selectItem = null
156
156
  })
@@ -159,7 +159,7 @@
159
159
  } else if (row.EntityType === 't_paramvalue') {
160
160
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
161
161
  if (res === 'confirm') {
162
- this.$refs.selectsLoad.load('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
162
+ this.$refs.selectsLoad.load('api/af-revenue/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
163
163
  this.params.rows.splice(index, 1)
164
164
  })
165
165
  }
@@ -181,7 +181,7 @@
181
181
  name: this.modifyItem.name
182
182
  }
183
183
  }
184
- this.$refs.paramsLoad.load('rs/entity/t_parameter', data).then((res) => {
184
+ this.$refs.paramsLoad.load('api/af-system/logic/system_saveParam', data).then((res) => {
185
185
  this.loadParams()
186
186
  this.show = false
187
187
  this.modifyItem = {name: ''}
@@ -199,7 +199,7 @@
199
199
  processid: this.selectItem.id
200
200
  }
201
201
  }
202
- this.$refs.selectsLoad.load('rs/entity/t_paramvalue', data).then((res) => {
202
+ this.$refs.selectsLoad.load('api/af-system/logic/system_saveParamValue', data).then((res) => {
203
203
  this.show = false
204
204
  // 如果没有id,需要在数组中添加
205
205
  if (!data.id) {
@@ -149,7 +149,7 @@
149
149
  async queryParam (condition) {
150
150
  this.model.rows = []
151
151
  let http = new HttpResetClass()
152
- let res = await http.load('POST', 'rs/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
152
+ let res = await http.load('POST', 'api/af-system/sql/system_getSingle', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错!!'})
153
153
  this.model.rows = res.data
154
154
  },
155
155
 
@@ -183,7 +183,7 @@
183
183
  deleteItem (row) {
184
184
  this.$showMessage('删除后不可恢复,确认删除吗?', ['confirm', 'cancel']).then((res) => {
185
185
  if (res === 'confirm') {
186
- this.$resetpost('rs/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
186
+ this.$resetpost('api/af-system/logic/deleteValue', {tablename: 't_singlevalue', id: row.id}).then((res) => {
187
187
  this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
188
188
  })
189
189
  }
@@ -201,7 +201,7 @@
201
201
  this.show = true
202
202
  },
203
203
  confirm () {
204
- this.$resetpost('rs/logic/system_saveSingle', this.selectItem).then((res) => {
204
+ this.$resetpost('api/af-system/logic/system_saveSingle', this.selectItem).then((res) => {
205
205
  // 如果没有id,需要在数组中添加
206
206
  this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
207
207
  this.show = false