system-clients 3.2.86 → 3.2.87-temp

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 (7) hide show
  1. package/package.json +105 -105
  2. package/src/components/server/ResSelectGroup.vue +7 -0
  3. package/src/filiale/bayan/PosAdd.vue +323 -0
  4. package/src/filiale/bayan/PosList.vue +297 -0
  5. package/src/filiale/bayan/PosManage.vue +138 -0
  6. package/src/filiale/bayan/system.js +6 -0
  7. package/src/plugins/validation.js +15 -15
package/package.json CHANGED
@@ -1,105 +1,105 @@
1
- {
2
- "name": "system-clients",
3
- "version": "3.2.86",
4
- "description": "系统基础框架",
5
- "main": "src/index.js",
6
- "directories": {
7
- "doc": "doc",
8
- "example": "examples",
9
- "test": "test"
10
- },
11
- "scripts": {
12
- "example": "node build/example-server.js",
13
- "dev": "node build/dev-server.js",
14
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
15
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
16
- "e2e": "node test/e2e/runner.js",
17
- "unit": "karma start test/unit/karma.conf.js",
18
- "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
19
- "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
20
- },
21
- "dependencies": {
22
- "base64-js": "^1.3.0",
23
- "js-base64": "^2.4.9",
24
- "less": "^2.7.1",
25
- "less-loader": "^2.2.3",
26
- "nyc": "^15.1.0",
27
- "src": "^1.1.2",
28
- "vue": "^1.0.17"
29
- },
30
- "devDependencies": {
31
- "babel-core": "^6.0.0",
32
- "babel-loader": "^6.0.0",
33
- "babel-plugin-transform-runtime": "^6.0.0",
34
- "babel-preset-es2015": "^6.0.0",
35
- "babel-preset-stage-2": "^6.0.0",
36
- "chai": "^3.5.0",
37
- "connect-history-api-fallback": "^1.1.0",
38
- "cross-env": "^1.0.7",
39
- "cross-spawn": "^2.1.5",
40
- "css-loader": "^0.23.0",
41
- "eslint": "^2.0.0",
42
- "eslint-config-standard": "^5.1.0",
43
- "eslint-friendly-formatter": "^1.2.2",
44
- "eslint-loader": "^1.3.0",
45
- "eslint-plugin-html": "^1.3.0",
46
- "eslint-plugin-promise": "^1.0.8",
47
- "eslint-plugin-standard": "^1.3.2",
48
- "eslint-plugin-vue": "^0.1.1",
49
- "eventsource-polyfill": "^0.9.6",
50
- "express": "^4.13.3",
51
- "extract-text-webpack-plugin": "^1.0.1",
52
- "file-loader": "^0.8.4",
53
- "function-bind": "^1.0.2",
54
- "html-webpack-plugin": "^2.8.1",
55
- "http-proxy-middleware": "^0.11.0",
56
- "inject-loader": "^2.0.1",
57
- "isparta-loader": "^2.0.0",
58
- "jasmine-core": "^2.4.1",
59
- "jquery": "^3.3.1",
60
- "jsencrypt": "^3.0.0-rc.1",
61
- "json-loader": "^0.5.4",
62
- "karma": "^1.4.1",
63
- "karma-chrome-launcher": "^2.2.0",
64
- "karma-coverage": "^1.1.1",
65
- "karma-mocha": "^1.3.0",
66
- "karma-sinon-chai": "^1.3.1",
67
- "karma-sourcemap-loader": "^0.3.7",
68
- "karma-spec-reporter": "0.0.31",
69
- "karma-webpack": "^2.0.2",
70
- "manage-client": "^1.4.20",
71
- "mkdirp": "^0.5.1",
72
- "mocha": "^3.2.0",
73
- "ncp": "^2.0.0",
74
- "nightwatch": "^0.8.18",
75
- "rimraf": "^2.5.0",
76
- "selenium-server": "2.52.0",
77
- "sinon": "^2.1.0",
78
- "sinon-chai": "^2.8.0",
79
- "style": "0.0.3",
80
- "style-loader": "^0.20.3",
81
- "url-loader": "^0.5.7",
82
- "vue-client": "1.24.107-test",
83
- "vue-hot-reload-api": "^1.2.0",
84
- "vue-html-loader": "^1.0.0",
85
- "vue-loader": "^8.2.1",
86
- "vue-resource": "^1.5.0",
87
- "vue-router": "^0.7.13",
88
- "vue-strap": "^1.0.9",
89
- "vue-style-loader": "^1.0.0",
90
- "vue-validator": "2.1.7",
91
- "webpack": "^1.12.2",
92
- "webpack-dev-middleware": "^1.4.0",
93
- "webpack-hot-middleware": "^2.6.0",
94
- "webpack-merge": "^0.8.3"
95
- },
96
- "repository": {
97
- "type": "git",
98
- "url": "https://gitee.com/aotu/System"
99
- },
100
- "keywords": [
101
- "system_clients"
102
- ],
103
- "author": "杨文宇",
104
- "license": "ISC"
105
- }
1
+ {
2
+ "name": "system-clients",
3
+ "version": "3.2.87-temp",
4
+ "description": "系统基础框架",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "doc": "doc",
8
+ "example": "examples",
9
+ "test": "test"
10
+ },
11
+ "scripts": {
12
+ "example": "node build/example-server.js",
13
+ "dev": "node build/dev-server.js",
14
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
15
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
16
+ "e2e": "node test/e2e/runner.js",
17
+ "unit": "karma start test/unit/karma.conf.js",
18
+ "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
19
+ "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
20
+ },
21
+ "dependencies": {
22
+ "base64-js": "^1.3.0",
23
+ "js-base64": "^2.4.9",
24
+ "less": "^2.7.1",
25
+ "less-loader": "^2.2.3",
26
+ "nyc": "^15.1.0",
27
+ "src": "^1.1.2",
28
+ "vue": "^1.0.17"
29
+ },
30
+ "devDependencies": {
31
+ "babel-core": "^6.0.0",
32
+ "babel-loader": "^6.0.0",
33
+ "babel-plugin-transform-runtime": "^6.0.0",
34
+ "babel-preset-es2015": "^6.0.0",
35
+ "babel-preset-stage-2": "^6.0.0",
36
+ "chai": "^3.5.0",
37
+ "connect-history-api-fallback": "^1.1.0",
38
+ "cross-env": "^1.0.7",
39
+ "cross-spawn": "^2.1.5",
40
+ "css-loader": "^0.23.0",
41
+ "eslint": "^2.0.0",
42
+ "eslint-config-standard": "^5.1.0",
43
+ "eslint-friendly-formatter": "^1.2.2",
44
+ "eslint-loader": "^1.3.0",
45
+ "eslint-plugin-html": "^1.3.0",
46
+ "eslint-plugin-promise": "^1.0.8",
47
+ "eslint-plugin-standard": "^1.3.2",
48
+ "eslint-plugin-vue": "^0.1.1",
49
+ "eventsource-polyfill": "^0.9.6",
50
+ "express": "^4.13.3",
51
+ "extract-text-webpack-plugin": "^1.0.1",
52
+ "file-loader": "^0.8.4",
53
+ "function-bind": "^1.0.2",
54
+ "html-webpack-plugin": "^2.8.1",
55
+ "http-proxy-middleware": "^0.11.0",
56
+ "inject-loader": "^2.0.1",
57
+ "isparta-loader": "^2.0.0",
58
+ "jasmine-core": "^2.4.1",
59
+ "jquery": "^3.3.1",
60
+ "jsencrypt": "^3.0.0-rc.1",
61
+ "json-loader": "^0.5.4",
62
+ "karma": "^1.4.1",
63
+ "karma-chrome-launcher": "^2.2.0",
64
+ "karma-coverage": "^1.1.1",
65
+ "karma-mocha": "^1.3.0",
66
+ "karma-sinon-chai": "^1.3.1",
67
+ "karma-sourcemap-loader": "^0.3.7",
68
+ "karma-spec-reporter": "0.0.31",
69
+ "karma-webpack": "^2.0.2",
70
+ "manage-client": "^1.4.20",
71
+ "mkdirp": "^0.5.1",
72
+ "mocha": "^3.2.0",
73
+ "ncp": "^2.0.0",
74
+ "nightwatch": "^0.8.18",
75
+ "rimraf": "^2.5.0",
76
+ "selenium-server": "2.52.0",
77
+ "sinon": "^2.1.0",
78
+ "sinon-chai": "^2.8.0",
79
+ "style": "0.0.3",
80
+ "style-loader": "^0.20.3",
81
+ "url-loader": "^0.5.7",
82
+ "vue-client": "1.24.107-test",
83
+ "vue-hot-reload-api": "^1.2.0",
84
+ "vue-html-loader": "^1.0.0",
85
+ "vue-loader": "^8.2.1",
86
+ "vue-resource": "^1.5.0",
87
+ "vue-router": "^0.7.13",
88
+ "vue-strap": "^1.0.9",
89
+ "vue-style-loader": "^1.0.0",
90
+ "vue-validator": "2.1.7",
91
+ "webpack": "^1.12.2",
92
+ "webpack-dev-middleware": "^1.4.0",
93
+ "webpack-hot-middleware": "^2.6.0",
94
+ "webpack-merge": "^0.8.3"
95
+ },
96
+ "repository": {
97
+ "type": "git",
98
+ "url": "https://gitee.com/aotu/System"
99
+ },
100
+ "keywords": [
101
+ "system_clients"
102
+ ],
103
+ "author": "杨文宇",
104
+ "license": "ISC"
105
+ }
package/src/components/server/ResSelectGroup.vue CHANGED
@@ -135,6 +135,13 @@ export default {
135
135
  userid: this.$login.f.id
136
136
  }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
137
137
  let arr = getAllArea.data.filter((res) => {
138
+ if(Array.isArray(val)){
139
+ for (let i = 0; i <val.length ; i++) {
140
+ if(res.parentid == val[i]){
141
+ return true
142
+ }
143
+ }
144
+ }
138
145
  return res.parentid == val
139
146
  })
140
147
  this.sliceArea = []
package/src/filiale/bayan/PosAdd.vue ADDED
@@ -0,0 +1,323 @@
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-6 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-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}' />
17
+ </div>
18
+ <div class="col-sm-6 form-group" :class="[$v.f_terminal_name.required ? 'has-error' : '']">
19
+ <label class="font_normal_body">&ensp;设备名称&ensp;</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" >&ensp;MAC&nbsp;号&nbsp;&ensp;</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">
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-6 form-group" :class="{'has-error': $v.f_phone.required}">
37
+ <label class="font_normal_body">&ensp;联系电话&ensp;</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-6 form-group" :class="{'has-error': $v.f_bank_name.required}">
43
+ <label class="font_normal_body">所属银行</label>
44
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_bank_name" placeholder="所属银行"
45
+ v-validate:f_bank_name="{required: true}">
46
+ </div>
47
+ <div class="col-sm-6 form-group">
48
+ <label class="font_normal_body">&ensp;所属参数&ensp;</label>
49
+ <v-select id="f_charge_type"
50
+ v-model="model.f_param_id"
51
+ placeholder='所属参数'
52
+ :value.sync="model.f_param_id"
53
+ :options='ParamTypeItems'
54
+ close-on-select clear-button>
55
+ </v-select>
56
+ </div>
57
+ <div class="col-sm-12 form-group" :class="{'has-error': $v.f_address.required}">
58
+ <label class="font_normal_body">&ensp;放置地点&ensp;</label>
59
+ <input type="text" class="input_search" style="width: 80%" v-model="model.f_address" placeholder="所在地"
60
+ v-validate:f_address="{required: true}">
61
+ </div>
62
+ </div>
63
+ <div class="col-sm-12 form-group">
64
+ <label class="font_normal_body " >&ensp;&nbsp;&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;&ensp;</label>
65
+ <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="model.f_comments"></textarea>
66
+ </div>
67
+ </form>
68
+ <div style="text-align:right;height:auto;">
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>
74
+ <button class="btn button_clear " @click="cancel()" >取消</button>
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>
113
+ </validator>
114
+
115
+ </div>
116
+ </template>
117
+ <script>
118
+ import {HttpResetClass, PagedList} from 'vue-client'
119
+ export default {
120
+ data () {
121
+ return {
122
+ checkparam: false,
123
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
124
+ model: {
125
+ f_terminal_number: '',
126
+ f_terminal_name: '',
127
+ f_mac_number:'',
128
+ // f_username:'',
129
+ f_bank_name: '',
130
+ f_equipment_type: 'POS',
131
+ f_state: '正常',
132
+ f_machine_number: '',
133
+ f_phone:'',
134
+ f_comments:'',
135
+ f_address:'',
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
145
+ }
146
+ },
147
+ props: ['data', 'f_filialeids','info'],
148
+
149
+ watch: {
150
+ 'data' (val) {
151
+ if (val) {
152
+ this.edit(val)
153
+ } else {
154
+ this.initModel()
155
+ }
156
+ }
157
+ },
158
+ async ready () {
159
+ console.log('mac信息：', this.data)
160
+ if (this.data) {
161
+ this.edit(this.data)
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
+ }
180
+ },
181
+
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
+ },
268
+ confirm () {
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
+ }
281
+ this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
282
+ this.$dispatch('refresh')
283
+ }).catch((error) => {
284
+ this.$dispatch('refresh')
285
+ })
286
+
287
+ },
288
+ edit (row) {
289
+ this.model.f_terminal_number = row.f_terminal_number
290
+ this.model.f_terminal_name = row.f_terminal_name
291
+ this.model.f_bank_name = row.f_bank_name
292
+ this.model.f_machine_number = row.f_machine_number
293
+ this.model.f_mac_number = row.f_mac_number
294
+ this.model.f_address = row.f_address
295
+ this.model.f_phone = row.f_phone
296
+ this.model.f_state = row.f_state
297
+ this.model.f_comments=row.f_comments
298
+ this.model.f_param_id=row.f_param_id
299
+ // this.model.f_username=row.f_username
300
+ this.model.id = row.id
301
+ this.model.f_filialeids=row.f_filialeids
302
+ this.model.f_orgid = row.f_orgid
303
+ },
304
+ initModel () {
305
+ delete this.model.id
306
+ this.model.f_terminal_number = ''
307
+ this.model.f_terminal_name = ''
308
+ this.model.f_bank_name = ''
309
+ this.model.f_machine_number = ''
310
+ this.model.f_state = '正常'
311
+ this.model.f_phone = ''
312
+ this.model.f_param_id = ''
313
+ this.model.f_address = ''
314
+ this.model.f_filialeids=''
315
+ this.model.f_orgid=''
316
+ this.model.f_comments=''
317
+ },
318
+ cancel () {
319
+ this.$dispatch('close')
320
+ }
321
+ }
322
+ }
323
+ </script>
package/src/filiale/bayan/PosList.vue ADDED
@@ -0,0 +1,297 @@
1
+ <template>
2
+ <div class="flex">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+
5
+ <criteria partial='criteria' style="background-color: white;" @condition-changed='$parent.selfSearch' v-ref:cri>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="col-sm-3 form-group">
9
+ <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
10
+ <res-select restype='organization'
11
+ is-mul="false"
12
+ @res-select="$parent.$parent.getorg"
13
+ :initresid="$parent.$parent.curorgid">
14
+ </res-select>
15
+ </div>
16
+ <div class="col-sm-3 form-group">
17
+ <label class="font_normal_body">设备编号</label>
18
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
19
+ condition="f_terminal_number like '%{}%'" placeholder="设备编号">
20
+ </div>
21
+
22
+
23
+ <div class="span" style="float:right;margin-top: 6px">
24
+ <button type="button" class="btn-success btn " style="border-radius: 4px"
25
+ @click="$parent.$parent.batchRoot('1')">批量启用
26
+ </button>
27
+ <button type="button" class="btn-danger btn " style="border-radius: 4px"
28
+ @click="$parent.$parent.batchRoot('0')">批量停用
29
+ </button>
30
+ <button type="button" class="button_search btn" @click="search()" v-el:cx>查询</button>
31
+ <button type="button" class="button_search btn" @click="$parent.$parent.add() " v-el:cx>新增</button>
32
+ <div style="float: right" class="button_spacing"
33
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
34
+ @click="$parent.$parent.hidden()"></div>
35
+ </div>
36
+ </div>
37
+ <div class="row" v-show="$parent.$parent.criteriaShow">
38
+ <div class="col-sm-3 form-group">
39
+ <label class="font_normal_body">所属人员</label>
40
+ <right-tree @re-res="$parent.$parent.getRes" :source="$parent.$parent.source"></right-tree>
41
+ </div>
42
+ <div class="col-sm-3 form-group">
43
+ <label class="font_normal_body">所在地</label>
44
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
45
+ condition="f_address like '%{}%'" placeholder="所在地">
46
+ </div>
47
+ <div class="col-sm-3 form-group">
48
+ <label class="font_normal_body">设备名称</label>
49
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
50
+ condition="f_terminal_name like '%{}%'" placeholder="设备名称">
51
+ </div>
52
+ <div class="col-sm-3 form-group">
53
+ <label class="font_normal_body">机器编号</label>
54
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_machine_number"
55
+ condition="f_machine_number like '%{}%'" placeholder="机器编号">
56
+ </div>
57
+ <div class="col-sm-3 form-group">
58
+ <label class="font_normal_body">所属银行</label>
59
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_bank_name"
60
+ condition="f_bank_name like '%{}%'" placeholder="所属银行">
61
+ </div>
62
+ <div class="col-sm-3 form-group">
63
+ <label class="font_normal_body">联系电话</label>
64
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_phone"
65
+ condition="f_phone like '%{}%'" placeholder="联系电话">
66
+ </div>
67
+ </div>
68
+ </div>
69
+ </criteria>
70
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
71
+ <template partial='head'>
72
+ <tr>
73
+ <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
74
+ <th style="text-align:center;white-space:nowrap;">序号</th>
75
+ <th style="text-align:center;white-space:nowrap;">设备编号</th>
76
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
77
+ <th style="text-align:center;white-space:nowrap;">设备名称</th>
78
+ <th style="text-align:center;white-space:nowrap;">所属公司</th>
79
+ <th style="text-align:center;white-space:nowrap;">所属部门</th>
80
+ <th style="text-align:center;white-space:nowrap;">所属人员</th>
81
+ <th style="text-align:center;white-space:nowrap;">状态</th>
82
+ <th style="text-align:center;white-space:nowrap;">联系电话</th>
83
+ <th style="text-align:center;white-space:nowrap;">所在地</th>
84
+ <th style="text-align:center;white-space:nowrap;">所属银行</th>
85
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
86
+ <!-- <th style="text-align:center;white-space:nowrap;">使用人员</th>-->
87
+ <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
88
+ <th style="text-align:center;white-space:nowrap;">失联状态</th>
89
+ <th style="text-align:center;white-space:nowrap;">操作</th>
90
+ </tr>
91
+ </template>
92
+ <template partial='body':model="model">
93
+ <tr>
94
+ <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
95
+ <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
96
+ <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
97
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
98
+ <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
99
+ <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
100
+ <td style="text-align:center;white-space:nowrap;">{{row.f_depname}}</td>
101
+ <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
102
+
103
+ <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
104
+ <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
105
+ <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
106
+ <td style="text-align:center;white-space:nowrap;">{{row.f_bank_name}}</td>
107
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>
108
+ <!-- <td style="text-align:center;white-space:nowrap;" >{{row.f_username}}</td>-->
109
+ <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
110
+ <td style="text-align:center;white-space:nowrap;" >{{row.isunknown}}</td>
111
+ <td style="text-align:center">
112
+ <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
113
+ </td>
114
+ </tr>
115
+ </template>
116
+ </data-grid>
117
+ </criteria-paged>
118
+ </div>
119
+ <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
120
+ <article slot="modal-body" class="modal-body">
121
+ <criteria-paged :model="model2" v-ref:paged2>
122
+ <data-grid :model="model2" v-ref:grid2 partial='list'>
123
+ <template partial='head'>
124
+ <tr>
125
+ <!--<th style="padding: 0;border: 0">
126
+ <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
127
+ @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
128
+ </th>-->
129
+ <th><nobr>序号</nobr></th>
130
+ <th><nobr>终端号</nobr></th>
131
+ <th><nobr>上次上报时间</nobr></th>
132
+ <th><nobr>本次上报时间</nobr></th>
133
+ <th><nobr><b>状态</b></nobr></th>
134
+ </tr>
135
+ </template>
136
+ <template partial='body'>
137
+ <td style="text-align: center;">{{$index + 1}}</td>
138
+ <td style="text-align: center;">{{row.f_terminal_number}}</td>
139
+ <td style="text-align: center;">{{row.f_update_date}}</td>
140
+ <td style="text-align: center;">{{row.f_update_date }}</td>
141
+ <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
142
+ </template>
143
+ </data-grid>
144
+ </criteria-paged>
145
+ </article>
146
+ <footer slot="modal-footer" class="modal-footer">
147
+ <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
148
+ </footer>
149
+ </modal>
150
+ </template>
151
+
152
+ <script>
153
+
154
+ import {PagedList} from 'vue-client'
155
+
156
+ export default {
157
+ title: '终端控制',
158
+ components: {},
159
+ data () {
160
+ return {
161
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
162
+ model: new PagedList('rs/sql/equipmentQuery', 20),
163
+ model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
164
+ curorgid: [this.f_filialeid],
165
+ f_orgid: '',
166
+ f_filialeids: '',
167
+ criteriaShow: false,
168
+ infoadd: false,
169
+ selPos: [],
170
+ isSelAll: false, // 默认不全选
171
+ infoshow: false
172
+ }
173
+ },
174
+ props: ['f_filialeid','isshowless'],
175
+ ready () {
176
+ this.search()
177
+ },
178
+ watch:{
179
+ // 'selPos'(val){
180
+ // console.log(val)
181
+ // },
182
+ 'isSelAll'(val){
183
+ console.log('-------', val)
184
+ if (val) {
185
+ // 对当前页面全选
186
+ this.selPos = []
187
+ for (const sel of this.model.rows) {
188
+ // if (this.selPos.indexOf(sel.id) < 0){
189
+ this.selPos.push(sel)
190
+ // }
191
+ }
192
+ } else {
193
+ // 取消全选
194
+ this.selPos = []
195
+ }
196
+ }
197
+ },
198
+ methods: {
199
+ getRes(val){
200
+ if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
201
+ this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
202
+ this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
203
+ } else {
204
+ this.$refs.paged.$refs.cri.model.f_user_operatorid=''
205
+ this.$refs.paged.$refs.cri.model.f_user_operator=''
206
+ }
207
+ },
208
+ infoclose(){
209
+ this.infoshow=false
210
+ },
211
+ // 批量操作
212
+ async batchRoot(val) {
213
+ let arrs = []
214
+ let alertMessage = ''
215
+ let selPos = this.selPos
216
+ if (val === '0') {
217
+ alertMessage = '停用'
218
+ for (const tmp of selPos) {
219
+ if (tmp.f_state === '正常') arrs.push(tmp)
220
+ }
221
+ } else if (val === '1') {
222
+ alertMessage = '启用'
223
+ for (const tmp of selPos) {
224
+ if (tmp.f_state === '停用') arrs.push(tmp)
225
+ }
226
+ } else if (val === '2') {
227
+ alertMessage = '升级'
228
+ for (const tmp of selPos) {
229
+ if (tmp.f_state === '正常') arrs.push(tmp)
230
+ }
231
+ } else {
232
+ this.showAlert('出现异常，请重新进操作')
233
+ return
234
+ }
235
+ await this.$resetpost('rs/logic/batchPos', {data: {tasks: arrs, taskState: val}}, {
236
+ rejectMsg: null,
237
+ resolveMsg: null
238
+ })
239
+ // 需要提示
240
+ this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`,'success', 2500)
241
+ this.$dispatch('close')
242
+ },
243
+ abcd (row) {
244
+ console.log("chakan",row)
245
+ let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
246
+ this.model2.search(condition)
247
+ this.infoshow = true
248
+ },
249
+ search () {
250
+ console.log("111111111111111111111111111111111111")
251
+ this.$refs.paged.$refs.cri.search()
252
+ },
253
+
254
+ selfSearch (args) {
255
+ console.log(args)
256
+ if (args.model.f_user_operatorid && args.model.f_user_operator){
257
+ args.condition = `${args.condition} and f_user_operatorid = '${args.model.f_user_operatorid}'
258
+ and f_user_operator = '${args.model.f_user_operator}'`
259
+ }
260
+ args.condition = `${args.condition} and f_equipment_type = 'POS' and f_state != '已删除' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
261
+ this.model.search(args.condition, this.model)
262
+ this.$dispatch('research')
263
+ },
264
+
265
+ add () {
266
+ this.infoadd=false
267
+ // if (this.f_filialeid) {
268
+ this.$dispatch('add', this.f_filialeid)
269
+ // } else {
270
+ // this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
271
+ // }
272
+ },
273
+ del (row) {
274
+ console.log('要删除了', row)
275
+ row.f_state = '已删除'
276
+ this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
277
+ this.$dispatch('refresh')
278
+ }).catch((error) => {
279
+ this.$dispatch('refresh')
280
+ })
281
+ },
282
+
283
+ getorg (val) {
284
+ console.log("====================", val)
285
+ this.f_orgid = val[0]
286
+ this.f_filialeid = val[0]
287
+ // this.search()
288
+ },
289
+ hidden(){
290
+ this.criteriaShow = !this.criteriaShow
291
+ }
292
+ },
293
+ computed: {
294
+
295
+ }
296
+ }
297
+ </script>
package/src/filiale/bayan/PosManage.vue ADDED
@@ -0,0 +1,138 @@
1
+ <template>
2
+ <div class="flex-row">
3
+ <div :class="{'basic-main':!isChange,'binary-left':isChange}">
4
+ <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></pos-list>
5
+ </div>
6
+ <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
7
+ <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
8
+ </div>
9
+
10
+ <!-- <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >-->
11
+ <!-- <header slot="modal-header" class="modal-header">-->
12
+ <!-- <button type="button" class="close" @click="close"><span>&times;</span></button>-->
13
+ <!-- <h4 class="modal-title">批量操作</h4>-->
14
+ <!-- </header>-->
15
+ <!-- <article slot="modal-body" class="modal-body">-->
16
+ <!-- <form class="form-horizontal">-->
17
+ <!-- <div class="row">-->
18
+ <!-- <div>-->
19
+ <!-- <h4>注意事项</h4>-->
20
+ <!-- <p>1.如果需要对POS设备进行升级，批量选择的POS设备包含非正常状态，则只会对状态为正常的设备进行升级。</p>-->
21
+ <!-- <p>2.如果POS设备处于停用状态，则可以进行启用操作。如果设备处于启用状态，则可以进行停用和升级操作。</p>-->
22
+ <!-- <p>3.批量操作可能耗时较长，请刷新列表查看结果。</p>-->
23
+ <!-- </div>-->
24
+ <!-- </div>-->
25
+ <!-- </form>-->
26
+ <!-- </article>-->
27
+ <!-- <footer slot="modal-footer" class="modal-footer">-->
28
+ <!--&lt;!&ndash; <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>&ndash;&gt;-->
29
+ <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>-->
30
+ <!-- <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>-->
31
+ <!-- <button type="button" class="button_clear button_spacing" @click='close'>退出</button>-->
32
+ <!-- </footer>-->
33
+ <!-- </modal>-->
34
+ </div>
35
+ </template>
36
+ <script>
37
+
38
+ import PosList from './PosList'
39
+ import PosAdd from './PosAdd'
40
+
41
+ export default {
42
+ title: 'POS终端管理',
43
+ components: {
44
+ PosList, PosAdd
45
+ },
46
+ data () {
47
+ return {
48
+ isChange: false,
49
+ row: null,
50
+ infoadd: true, // 判断是否显示 升级 等按钮（true/false）
51
+ batchPos: false,
52
+ f_filialeids: ''
53
+ }
54
+ },
55
+ methods: {
56
+ // 批量操作
57
+ // async batchRoot(val){
58
+ // let arrs = []
59
+ // let alertMessage=''
60
+ // let selPos = this.$refs.list.selPos
61
+ // if (val==='0'){
62
+ // alertMessage='停用'
63
+ // for (const tmp of selPos) {
64
+ // if (tmp.f_state==='正常') arrs.push(tmp)
65
+ // }
66
+ // } else if (val==='1'){
67
+ // alertMessage='启用'
68
+ // for (const tmp of selPos) {
69
+ // if (tmp.f_state==='停用') arrs.push(tmp)
70
+ // }
71
+ // } else if(val==='2'){
72
+ // alertMessage='升级'
73
+ // for (const tmp of selPos) {
74
+ // if (tmp.f_state==='正常') arrs.push(tmp)
75
+ // }
76
+ // } else {
77
+ // this.showAlert('出现异常，请重新进操作')
78
+ // return
79
+ // }
80
+ //
81
+ // await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
82
+ //
83
+ // // 需要提示
84
+ // this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)
85
+ // this.isChange = false
86
+ // this.close()
87
+ // },
88
+ close(){
89
+ this.batchPos = false
90
+ },
91
+ selected(obj, idx) {
92
+ console.log(obj)
93
+ if (!(obj instanceof MouseEvent)) {
94
+ this.isChange = true
95
+ this.infoadd = true
96
+ this.row = obj
97
+ } else {
98
+ this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
99
+ }
100
+ }
101
+ },
102
+ events: {
103
+ 'search' () {
104
+ this.infoadd=true
105
+ this.isChange = false
106
+ this.row = null
107
+ this.$refs.list.$refs.paged.$refs.cri.search()
108
+ },
109
+ 'research' () {
110
+ console.log('重新查询')
111
+ this.isChange = false
112
+ this.row = null
113
+ },
114
+ 'refresh' () {
115
+ this.isChange = false
116
+ this.row = null
117
+ this.$refs.list.search()
118
+ },
119
+ 'error' (name, row, res) {
120
+ this.isChange = false
121
+ this.row = null
122
+ },
123
+ 'close' () {
124
+ this.isChange = false
125
+ this.row = null
126
+
127
+ // this.$refs.list.search()
128
+ },
129
+ 'add' (val) {
130
+ this.f_filialeids = val
131
+ this.infoadd=false
132
+ this.row = null
133
+ this.isChange = true
134
+ this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
135
+ }
136
+ }
137
+ }
138
+ </script>
package/src/filiale/bayan/system.js ADDED
@@ -0,0 +1,6 @@
1
+ // 分公司特殊组件页面注册
2
+
3
+
4
+ exports.specialComp = {
5
+ 'pos-manage': (resolve) => { require(['./PosManage'], resolve) }
6
+ }
package/src/plugins/validation.js CHANGED
@@ -1,15 +1,15 @@
1
- import Vue from 'vue'
2
- import Validator from 'vue-validator'
3
- Vue.use(Validator)
4
- //密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
5
- Vue.validator('strongpassword', function (val) {
6
- return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
7
- });
8
- Vue.validator('chinesePassword', function (val) {
9
- var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
10
- return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
11
- });
12
- // 潜能要求8~16位数字字母组合；
13
- Vue.validator('numbersAndLetter8to16', function (val) {
14
- return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
15
- });
1
+ import Vue from 'vue'
2
+ import Validator from 'vue-validator'
3
+ Vue.use(Validator)
4
+ //密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
5
+ Vue.validator('strongpassword', function (val) {
6
+ return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
7
+ });
8
+ Vue.validator('chinesePassword', function (val) {
9
+ var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
10
+ return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
11
+ });
12
+ // 潜能要求8~16位数字字母组合；
13
+ Vue.validator('numbersAndLetter8to16', function (val) {
14
+ return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
15
+ });