system-clients 3.2.4 → 3.2.6-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 (171) hide show
  1. package/.eslintrc.js +16 -16
  2. package/.npmignore +10 -0
  3. package/SystemClient.iml +8 -11
  4. package/build/.npmignore +1 -0
  5. package/build/webpack.base.conf.js +21 -11
  6. package/package-lock.json +23125 -0
  7. package/package.json +6 -4
  8. package/src/.npmignore +1 -0
  9. package/src/components/Main.vue +626 -476
  10. package/src/components/TabButton.vue +201 -0
  11. package/src/components/Tabs.vue +67 -0
  12. package/src/components/addressManage/AddressCascadingMenu.vue +145 -0
  13. package/src/components/equipment/EquipmentManage.vue +1 -1
  14. package/src/components/equipment/PcAdd.vue +5 -5
  15. package/src/components/equipment/PcList.vue +5 -5
  16. package/src/components/equipment/PhoneAdd.vue +26 -13
  17. package/src/components/equipment/PhoneList.vue +31 -21
  18. package/src/components/equipment/PosAdd.vue +231 -45
  19. package/src/components/equipment/PosList.vue +198 -68
  20. package/src/components/equipment/PosManage.vue +80 -9
  21. package/src/components/equipment/PosManageBoth.vue +125 -0
  22. package/src/components/equipment/PosParamAdd.vue +236 -0
  23. package/src/components/equipment/PosParamList.vue +121 -0
  24. package/src/components/equipment/PosParamManage.vue +51 -0
  25. package/src/components/parammanage/ParamManage.vue +2 -2
  26. package/src/components/parammanage/ParamPage.vue +30 -8
  27. package/src/components/parammanage/SinglePage.vue +4 -4
  28. package/src/components/server/ImageVieweTest.vue +56 -0
  29. package/src/components/server/ImageViewer.vue +350 -0
  30. package/src/components/server/LoadData.vue +21 -2
  31. package/src/components/server/Login.vue +889 -625
  32. package/src/components/server/ModifyPw.vue +12 -7
  33. package/src/components/server/PcdBuildingSelect.vue +241 -0
  34. package/src/components/server/ResSelect.vue +5 -0
  35. package/src/components/server/ResSelectGroup.vue +159 -103
  36. package/src/components/server/RightTree.vue +289 -204
  37. package/src/filiale/dongguan/Login.vue +889 -0
  38. package/src/filiale/dongguan/Main.vue +715 -0
  39. package/src/filiale/dongguan/system.js +6 -0
  40. package/src/filiale/konggang/Login.vue +840 -0
  41. package/src/filiale/konggang/system.js +7 -0
  42. package/src/filiale/qianneng/ModifyPw.vue +107 -0
  43. package/src/filiale/qianneng/system.js +7 -0
  44. package/src/filiale/rizhao/LeftTree.vue +111 -0
  45. package/src/filiale/rizhao/Login.vue +791 -0
  46. package/src/filiale/rizhao/Main.vue +606 -0
  47. package/src/filiale/rizhao/system.js +14 -0
  48. package/src/filiale/yuchuan/Login.vue +889 -0
  49. package/src/filiale/yuchuan/Main.vue +773 -0
  50. package/src/filiale/yuchuan/system.js +10 -0
  51. package/src/plugins/EncryptUtil.js +53 -0
  52. package/src/plugins/GetLoginInfoService.js +76 -70
  53. package/src/plugins/HeatGetLoginInfoService.js +491 -0
  54. package/src/plugins/validation.js +9 -1
  55. package/src/stores/HeatAppData.js +38 -0
  56. package/src/styles/fonts/PINGFANG LIGHT.TTF +0 -0
  57. package/src/styles/fonts/PingFangSC-Regular.ttf +0 -0
  58. package/src/styles/fonts/glyphicons-halflings-regular.eot +0 -0
  59. package/src/styles/fonts/glyphicons-halflings-regular.svg +288 -0
  60. package/src/styles/fonts/glyphicons-halflings-regular.ttf +0 -0
  61. package/src/styles/fonts/glyphicons-halflings-regular.woff +0 -0
  62. package/src/styles/fonts/glyphicons-halflings-regular.woff2 +0 -0
  63. package/src/styles/fonts/pingfang-bold.ttf +0 -0
  64. package/src/styles/fonts/pingfang-medium.ttf +0 -0
  65. package/src/styles/fonts/pingfang-regular.ttf +0 -0
  66. package/src/styles/fonts/trendstrends.ttf +0 -0
  67. 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
  68. package/src/styles/less/.csscomb.json +304 -0
  69. package/src/styles/less/.csslintrc +19 -0
  70. package/src/styles/less/alerts.less +73 -0
  71. package/src/styles/less/aofeng/animate.min.css +11 -0
  72. package/src/styles/less/aofeng/expandcss.less +569 -0
  73. package/src/styles/less/aofeng/standard.less +2507 -0
  74. package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +686 -0
  75. package/src/styles/less/aofeng/themeOne/loginStyle.less +1586 -0
  76. package/src/styles/less/aofeng/themeOne/systemStyle.less +2650 -0
  77. package/src/styles/less/aofeng/themeOne.less +17 -0
  78. package/src/styles/less/aofeng/themeTwo/newStyle1.less +415 -0
  79. package/src/styles/less/aofeng/themeTwo.less +3 -0
  80. package/src/styles/less/badges.less +66 -0
  81. package/src/styles/less/bootstrap.less +66 -0
  82. package/src/styles/less/breadcrumbs.less +26 -0
  83. package/src/styles/less/button-groups.less +247 -0
  84. package/src/styles/less/buttons.less +172 -0
  85. package/src/styles/less/carousel.less +269 -0
  86. package/src/styles/less/close.less +34 -0
  87. package/src/styles/less/code.less +69 -0
  88. package/src/styles/less/component-animations.less +33 -0
  89. package/src/styles/less/dropdowns.less +216 -0
  90. package/src/styles/less/fonts-list.less +25 -0
  91. package/src/styles/less/forms.less +626 -0
  92. package/src/styles/less/glyphicons.less +305 -0
  93. package/src/styles/less/grid.less +84 -0
  94. package/src/styles/less/input-groups.less +167 -0
  95. package/src/styles/less/jumbotron.less +52 -0
  96. package/src/styles/less/labels.less +64 -0
  97. package/src/styles/less/list-group.less +141 -0
  98. package/src/styles/less/manageStyle/manageChile.less +180 -0
  99. package/src/styles/less/manageStyle/manageStyle/manageChile.less +180 -0
  100. package/src/styles/less/manageStyle/manageStyle/manageStyle.less +1102 -0
  101. package/src/styles/less/manageStyle/manageStyle/safeStyle.less +498 -0
  102. package/src/styles/less/manageStyle/manageStyle.less +1102 -0
  103. package/src/styles/less/manageStyle/safeStyle.less +498 -0
  104. package/src/styles/less/media.less +66 -0
  105. package/src/styles/less/mixins/alerts.less +14 -0
  106. package/src/styles/less/mixins/background-variant.less +9 -0
  107. package/src/styles/less/mixins/border-radius.less +18 -0
  108. package/src/styles/less/mixins/buttons.less +69 -0
  109. package/src/styles/less/mixins/center-block.less +7 -0
  110. package/src/styles/less/mixins/clearfix.less +22 -0
  111. package/src/styles/less/mixins/forms.less +90 -0
  112. package/src/styles/less/mixins/gradients.less +59 -0
  113. package/src/styles/less/mixins/grid-framework.less +92 -0
  114. package/src/styles/less/mixins/grid.less +122 -0
  115. package/src/styles/less/mixins/hide-text.less +21 -0
  116. package/src/styles/less/mixins/image.less +33 -0
  117. package/src/styles/less/mixins/labels.less +12 -0
  118. package/src/styles/less/mixins/list-group.less +30 -0
  119. package/src/styles/less/mixins/nav-divider.less +10 -0
  120. package/src/styles/less/mixins/nav-vertical-align.less +9 -0
  121. package/src/styles/less/mixins/opacity.less +8 -0
  122. package/src/styles/less/mixins/pagination.less +24 -0
  123. package/src/styles/less/mixins/panels.less +24 -0
  124. package/src/styles/less/mixins/progress-bar.less +10 -0
  125. package/src/styles/less/mixins/reset-filter.less +8 -0
  126. package/src/styles/less/mixins/reset-text.less +18 -0
  127. package/src/styles/less/mixins/resize.less +6 -0
  128. package/src/styles/less/mixins/responsive-visibility.less +15 -0
  129. package/src/styles/less/mixins/size.less +10 -0
  130. package/src/styles/less/mixins/tab-focus.less +9 -0
  131. package/src/styles/less/mixins/table-row.less +44 -0
  132. package/src/styles/less/mixins/text-emphasis.less +9 -0
  133. package/src/styles/less/mixins/text-overflow.less +8 -0
  134. package/src/styles/less/mixins/vendor-prefixes.less +227 -0
  135. package/src/styles/less/mixins.less +40 -0
  136. package/src/styles/less/modals.less +151 -0
  137. package/src/styles/less/navbar.less +660 -0
  138. package/src/styles/less/navs.less +285 -0
  139. package/src/styles/less/normalize.less +424 -0
  140. package/src/styles/less/pager.less +76 -0
  141. package/src/styles/less/pagination.less +89 -0
  142. package/src/styles/less/panels.less +275 -0
  143. package/src/styles/less/popovers.less +131 -0
  144. package/src/styles/less/print.less +101 -0
  145. package/src/styles/less/progress-bars.less +87 -0
  146. package/src/styles/less/responsive-embed.less +35 -0
  147. package/src/styles/less/responsive-utilities.less +194 -0
  148. package/src/styles/less/scaffolding.less +161 -0
  149. package/src/styles/less/stand.less +207 -0
  150. package/src/styles/less/tables.less +312 -0
  151. package/src/styles/less/theme.less +291 -0
  152. package/src/styles/less/thumbnails.less +36 -0
  153. package/src/styles/less/tooltip.less +102 -0
  154. package/src/styles/less/type.less +316 -0
  155. package/src/styles/less/utilities.less +55 -0
  156. package/src/styles/less/variables.less +899 -0
  157. package/src/styles/less/wells.less +29 -0
  158. package/src/system.js +34 -1
  159. package/src/util/Daiban.json +12 -0
  160. package/static/images/lefticon//345/220/210/345/220/214/347/256/241/347/220/206.png +0 -0
  161. package/static/logo.png +0 -0
  162. package/static/newStyle/about-us.png +0 -0
  163. package/static/rizhao.png +0 -0
  164. package/yarn-error.log +6896 -0
  165. package/.gradle/3.5/file-changes/last-build.bin +0 -0
  166. package/.gradle/3.5/taskHistory/taskHistory.lock +0 -0
  167. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  168. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
  169. package/.gradle/buildOutputCleanup/built.bin +0 -0
  170. package/.gradle/buildOutputCleanup/cache.properties +0 -2
  171. package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
@@ -4,71 +4,148 @@
4
4
  <ul class="nav nav-tabs" >
5
5
  <li role="presentation" class="active"><a href="#">POS</a></li>
6
6
  </ul>
7
- <form class="form-horizontal">
7
+ <form novalidate class="form-horizontal" >
8
8
  <div class="row">
9
- <div class="col-sm-6">
10
- <label class="font_normal_body" >设备编号</label>
11
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_number" placeholder="设备编号" >
9
+ <div class="col-sm-6 form-group">
10
+ <label class="font_normal_body">所属人员</label>
11
+ <right-tree @re-res="getRes" :source="source"></right-tree>
12
12
  </div>
13
- <div class="col-sm-6">
14
- <label class="font_normal_body" >设备名称</label>
15
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_terminal_name" placeholder="设备名称" >
13
+ <div class="col-sm-6 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}' />
16
17
  </div>
17
- </div>
18
- <div class="row">
19
- <div class="col-sm-6">
18
+ <div class="col-sm-6 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-6 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-6 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-6 form-group">
20
33
  <label class="font_normal_body" >机器编号</label>
21
34
  <input type="text" class="input_search" style="width: 60%" v-model="model.f_machine_number" placeholder="机器编号" >
22
35
  </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="联系电话" >
36
+ <div class="col-sm-6 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>-->
26
41
  </div>
27
- </div>
28
- <div class="row">
29
- <div class="col-sm-6">
30
- <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;所在地</label>
31
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_address" placeholder="所在地" >
42
+ <div class="col-sm-6 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}">
32
46
  </div>
33
- <div class="col-sm-6">
34
- <label class="font_normal_body" >所属银行</label>
35
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行" >
47
+ <div class="col-sm-6 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 class="col-sm-6 form-group">
53
+ <label class="font_normal_body">所属参数</label>
54
+ <v-select id="f_charge_type"
55
+ v-model="model.f_param_id"
56
+ placeholder='所属参数'
57
+ :value.sync="model.f_param_id"
58
+ :options='ParamTypeItems'
59
+ close-on-select clear-button>
60
+ </v-select>
36
61
  </div>
37
62
  </div>
38
- <div class="col-sm-12">
39
- <label class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
63
+ <div class="col-sm-12 form-group">
64
+ <label class="font_normal_body " >&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
40
65
  <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
41
66
  </div>
42
67
  </form>
43
68
  <div style="text-align:right;height:auto;">
44
- <button class="btn button_search " @click="confirm()" >确认</button>
69
+ <button class="button_search" @click="uploadFiles()" v-if="info">上传图片</button>
70
+ <button class="btn btn-info" @click="upgrade()" v-if="info && data.f_state==='正常'">升级</button>
71
+ <button class="btn btn-success" @click="getEditState()" v-if="model.f_state === '停用' && info" >启用</button>
72
+ <button class="btn btn-danger" @click="getEditState()" v-if="model.f_state === '正常' && info" >停用</button>
73
+ <button class="btn button_search" @click="confirm()" :disabled="!$v.valid" >确认</button>
45
74
  <button class="btn button_clear " @click="cancel()" >取消</button>
46
75
  </div>
76
+ <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
77
+ <article slot="modal-body" style="height: 500px">
78
+ <upload v-show="showfiles" :businessid="model.id" v-ref:upload fusetype="POS" isremark="true" style="width:auto" ></upload>
79
+ </article>
80
+ <footer slot="modal-footer" class="modal-footer">
81
+ </footer>
82
+ </modal>
83
+ <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false" >
84
+ <header slot="modal-header" class="modal-header">
85
+ <button type="button" class="close" @click="close"><span>&times;</span></button>
86
+ <h4 class="modal-title">pos机升级</h4>
87
+ </header>
88
+ <article slot="modal-body" class="modal-body">
89
+ <form class="form-horizontal">
90
+ <div class="row">
91
+ <div>
92
+ <h4>是否升级?</h4>
93
+ </div>
94
+ <!-- <div class="col-sm-6 form-group">-->
95
+ <!-- <label class="font_normal_body">参数名称</label>-->
96
+ <!-- <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">-->
97
+ <!-- </div>-->
98
+ <!-- <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">-->
99
+ <!-- <div class="checkbox">-->
100
+ <!-- <label>-->
101
+ <!-- <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局-->
102
+ <!-- </label>-->
103
+ <!-- </div>-->
104
+ <!-- </div>-->
105
+ </div>
106
+ </form>
107
+ </article>
108
+ <footer slot="modal-footer" class="modal-footer">
109
+ <button type="button" class="button_search button_spacing" @click='upgradeRoot()'>是</button>
110
+ <button type="button" class="button_clear button_spacing" @click='close'>否</button>
111
+ </footer>
112
+ </modal>
47
113
  </validator>
114
+
48
115
  </div>
49
116
  </template>
50
117
  <script>
51
-
52
-
118
+ import {HttpResetClass, PagedList} from 'vue-client'
53
119
  export default {
54
120
  data () {
55
121
  return {
122
+ checkparam: false,
123
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
56
124
  model: {
57
125
  f_terminal_number: '',
58
126
  f_terminal_name: '',
127
+ f_mac_number:'',
128
+ // f_username:'',
59
129
  f_bank_name: '',
60
130
  f_equipment_type: 'POS',
61
131
  f_state: '正常',
62
- f_machine_number:'',
132
+ f_machine_number: '',
63
133
  f_phone:'',
64
134
  f_comments:'',
65
135
  f_address:'',
66
- f_filialeids:this.f_filialeids,
67
- f_orgid:''
68
- }
136
+ f_filialeids: '',
137
+ f_orgid:'',
138
+ f_param_id:''
139
+ },
140
+ ParamTypeItems:[],
141
+ showfiles: false,
142
+ show:false,
143
+ infoadd: this.infoadd,
144
+ isSelPop: false
69
145
  }
70
146
  },
71
- props: ['data', 'f_filialeids'],
147
+ props: ['data', 'f_filialeids','info'],
148
+
72
149
  watch: {
73
150
  'data' (val) {
74
151
  if (val) {
@@ -78,31 +155,134 @@
78
155
  }
79
156
  }
80
157
  },
81
- ready () {
158
+ async ready () {
82
159
  console.log('mac信息:', this.data)
83
160
  if (this.data) {
84
161
  this.edit(this.data)
85
162
  }
163
+ console.log('查看是否隐藏', this.info)
164
+ try {
165
+ // 获取参数
166
+ let http = new HttpResetClass()
167
+ let res = await http.load('POST', 'rs/sql/get_posParam', {data: {condition : ' 1 = 1 '}}, {
168
+ resolveMsg: null,
169
+ rejectMsg: '获取参数出错!!'
170
+ })
171
+ this.ParamTypeItems = res.data.map(item=>{
172
+ return {
173
+ label:item.name,
174
+ value:item.f_param_id
175
+ }
176
+ })
177
+ } catch (e) {
178
+ console.log(e)
179
+ }
86
180
  },
181
+
87
182
  methods: {
183
+ recursiveSelOrg(val, flag){
184
+ if(val.parent){
185
+ if(val.parent.resourcetype===flag){
186
+ return {id: val.parent.id, name: val.parent.name}
187
+ } else {
188
+ return this.recursiveSelOrg(val.parent,flag)
189
+ }
190
+ } else {
191
+ return {id: '', name: ''}
192
+ }
193
+ },
194
+ getRes(val){
195
+ console.log('====================', val)
196
+ if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
197
+
198
+ let org = this.recursiveSelOrg(val.orgobj[0], 'organization')
199
+ this.model.f_user_orgid=org.id
200
+ this.model.f_user_orgname=org.name
201
+ let dep = this.recursiveSelOrg(val.orgobj[0], 'department')
202
+ this.model.f_user_depid=dep.id
203
+ this.model.f_user_depname=dep.name
204
+
205
+ this.model.f_user_operatorid = val.orgobj[0].userid
206
+ this.model.f_user_operator=val.orgobj[0].name
207
+ this.isSelPop = true
208
+ } else {
209
+ // 不可提交
210
+ this.isSelPop = false
211
+ }
212
+ },
213
+ close () {
214
+ this.show = false
215
+ },
216
+ uploadFiles(){
217
+ this.showfiles= !this.showfiles
218
+ },
219
+ getEditState () {
220
+ if (this.model.f_state === '正常') {
221
+ this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认停用该设备?`, ['confirm', 'cancel']).then((res) => {
222
+ if (res === 'confirm') {
223
+ this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送停用指令,请稍后查看执行结果!`, 'success', 2500)
224
+ this.model.f_state = '停用'
225
+ try {
226
+ // 测试接口
227
+ // this.$resetpost('rs/logic/updatePosState', {data: {number: this.model.f_terminal_number, state: '停用'}}, {resolveMsg: null, rejectMsg: null}, 0)
228
+ // .then((res) => {})
229
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 0}}, {rejectMsg: null, resolveMsg: null})
230
+ } catch (error) {
231
+ this.search()
232
+ }
233
+ }
234
+ })
235
+ } else if (this.model.f_state === '停用'){
236
+ this.$showMessage(`当前设备号: ${this.model.f_terminal_number} ,确认启用该设备?`, ['confirm', 'cancel']).then((res) => {
237
+ if (res === 'confirm') {
238
+ this.$showAlert(`已向设备号: ${this.model.f_terminal_number}发送启用指令,请稍后查看执行结果!`, 'success', 2500)
239
+ this.model.f_state = '正常'
240
+ try {
241
+ // 测试接口
242
+ // this.$resetpost('rs/logic/getEditPosState', {data: {number: this.model.f_terminal_number, state: '正常'}}, {resolveMsg: null, rejectMsg: null}, 0)
243
+ // .then((res) => {})
244
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 1}}, {rejectMsg: null, resolveMsg: null})
245
+ } catch (error) {
246
+ this.search()
247
+ }
248
+ }
249
+ })
250
+ }
251
+ },
252
+ editBeizhu (val) {
253
+ this.editshow = true
254
+ this.posBase = val
255
+ },
256
+
257
+ //升级
258
+ upgrade(){
259
+ this.show=true
260
+ },
261
+ upgradeRoot() {
262
+ this.$resetpost('rs/logic/batchPos',{data: {tasks: [this.data], taskState: 2}}, {rejectMsg: null, resolveMsg: null})
263
+ this.$dispatch('refresh')
264
+ },
265
+ search () {
266
+ this.$refs.paged.$refs.cri.search()
267
+ },
88
268
  confirm () {
89
- // if(this.f_filialeids!=''&&this.f_filialeids!=null){
90
- this.model.f_operator = this.$login.f.name
91
- this.model.f_operatorid = this.$login.f.id
92
- this.model.f_filialeids = this.f_filialeids
93
- this.model.f_orgid = this.$login.f.orgid
94
- this.model.f_orgname = this.$login.f.orgs
95
- this.model.f_depid = this.$login.f.depids
96
- this.model.f_depname = this.$login.f.deps
269
+ // 如果是修改的话,只修改页面上用户填写的信息
270
+ if (!this.info) {
271
+ this.model.f_online = '离线'
272
+ this.model.f_operator = this.$login.f.name
273
+ this.model.f_orgid = this.$login.f.orgid
274
+ this.model.f_filialeids = this.$login.f.orgid
275
+ this.model.f_operatorid = this.$login.f.id
276
+ this.model.f_orgname = this.$login.f.orgs
277
+ this.model.f_depid = this.$login.f.depids
278
+ this.model.f_depname = this.$login.f.deps
279
+ this.model.f_orgstr = this.$login.f.fullids
280
+ }
97
281
  this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
98
282
  this.$dispatch('refresh')
99
283
  }).catch((error) => {
100
284
  this.$dispatch('refresh')
101
285
  })
102
- // }else
103
- // {
104
- // this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
105
- // }
106
286
 
107
287
  },
108
288
  edit (row) {
@@ -110,11 +290,15 @@
110
290
  this.model.f_terminal_name = row.f_terminal_name
111
291
  this.model.f_bank_name = row.f_bank_name
112
292
  this.model.f_machine_number = row.f_machine_number
293
+ this.model.f_mac_number = row.f_mac_number
113
294
  this.model.f_address = row.f_address
114
295
  this.model.f_phone = row.f_phone
296
+ this.model.f_state = row.f_state
115
297
  this.model.f_comments=row.f_comments
116
- this.model.f_filialeids=row.f_filialeids
298
+ this.model.f_param_id=row.f_param_id
299
+ // this.model.f_username=row.f_username
117
300
  this.model.id = row.id
301
+ this.model.f_filialeids=row.f_filialeids
118
302
  this.model.f_orgid = row.f_orgid
119
303
  },
120
304
  initModel () {
@@ -123,7 +307,9 @@
123
307
  this.model.f_terminal_name = ''
124
308
  this.model.f_bank_name = ''
125
309
  this.model.f_machine_number = ''
310
+ this.model.f_state = '正常'
126
311
  this.model.f_phone = ''
312
+ this.model.f_param_id = ''
127
313
  this.model.f_address = ''
128
314
  this.model.f_filialeids=''
129
315
  this.model.f_orgid=''