system-clients 3.1.106-aode → 3.1.108-aode

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 +102 -102
  2. package/src/components/equipment/EquipmentManage.vue +3 -3
  3. package/src/components/equipment/PosAdd.vue +23 -4
  4. package/src/components/equipment/PosList.vue +10 -10
  5. package/src/components/equipment/PosManage.vue +3 -2
  6. package/src/plugins/GetLoginInfoService.js +518 -518
  7. package/static/ewmlogo.png +0 -0
package/package.json CHANGED
@@ -1,102 +1,102 @@
1
- {
2
- "name": "system-clients",
3
- "version": "3.1.106-aode",
4
- "description": "系统基础框架",
5
- "main": "src/index.js",
6
- "directories": {
7
- "example": "examples",
8
- "test": "test"
9
- },
10
- "scripts": {
11
- "example": "node build/example-server.js",
12
- "dev": "node build/dev-server.js",
13
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
14
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
15
- "e2e": "node test/e2e/runner.js",
16
- "unit": "karma start test/unit/karma.conf.js",
17
- "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
18
- },
19
- "dependencies": {
20
- "base64-js": "^1.3.0",
21
- "js-base64": "^2.4.9",
22
- "less": "^2.7.1",
23
- "less-loader": "^2.2.3",
24
- "src": "^1.1.2",
25
- "vue": "^1.0.17"
26
- },
27
- "devDependencies": {
28
- "babel-core": "^6.0.0",
29
- "babel-loader": "^6.0.0",
30
- "babel-plugin-transform-runtime": "^6.0.0",
31
- "babel-preset-es2015": "^6.0.0",
32
- "babel-preset-stage-2": "^6.0.0",
33
- "chai": "^3.5.0",
34
- "connect-history-api-fallback": "^1.1.0",
35
- "cross-env": "^1.0.7",
36
- "cross-spawn": "^2.1.5",
37
- "css-loader": "^0.23.0",
38
- "eslint": "^2.0.0",
39
- "eslint-config-standard": "^5.1.0",
40
- "eslint-friendly-formatter": "^1.2.2",
41
- "eslint-loader": "^1.3.0",
42
- "eslint-plugin-html": "^1.3.0",
43
- "eslint-plugin-promise": "^1.0.8",
44
- "eslint-plugin-standard": "^1.3.2",
45
- "eslint-plugin-vue": "^0.1.1",
46
- "eventsource-polyfill": "^0.9.6",
47
- "express": "^4.13.3",
48
- "extract-text-webpack-plugin": "^1.0.1",
49
- "file-loader": "^0.8.4",
50
- "function-bind": "^1.0.2",
51
- "html-webpack-plugin": "^2.8.1",
52
- "http-proxy-middleware": "^0.11.0",
53
- "inject-loader": "^2.0.1",
54
- "isparta-loader": "^2.0.0",
55
- "jasmine-core": "^2.4.1",
56
- "jquery": "^3.3.1",
57
- "json-loader": "^0.5.4",
58
- "karma": "^1.4.1",
59
- "karma-chrome-launcher": "^2.2.0",
60
- "karma-coverage": "^1.1.1",
61
- "karma-mocha": "^1.3.0",
62
- "karma-sinon-chai": "^1.3.1",
63
- "karma-sourcemap-loader": "^0.3.7",
64
- "karma-spec-reporter": "0.0.31",
65
- "karma-webpack": "^2.0.2",
66
- "manage-client": "^1.4.20",
67
- "mkdirp": "^0.5.1",
68
- "mocha": "^3.2.0",
69
- "ncp": "^2.0.0",
70
- "nightwatch": "^0.8.18",
71
- "rimraf": "^2.5.0",
72
- "selenium-server": "2.52.0",
73
- "sinon": "^2.1.0",
74
- "sinon-chai": "^2.8.0",
75
- "style": "0.0.3",
76
- "style-loader": "^0.20.3",
77
- "url-loader": "^0.5.7",
78
- "vue-client": "1.21.60",
79
- "vue-hot-reload-api": "^1.2.0",
80
- "vue-html-loader": "^1.0.0",
81
- "vue-loader": "^8.2.1",
82
- "vue-resource": "^1.5.0",
83
- "vue-router": "^0.7.13",
84
- "vue-strap": "^1.0.9",
85
- "vue-style-loader": "^1.0.0",
86
- "vue-validator": "^3.0.0-alpha.2",
87
- "webpack": "^1.12.2",
88
- "jsencrypt": "3.0.0-rc.1",
89
- "webpack-dev-middleware": "^1.4.0",
90
- "webpack-hot-middleware": "^2.6.0",
91
- "webpack-merge": "^0.8.3"
92
- },
93
- "repository": {
94
- "type": "git",
95
- "url": "https://gitee.com/aotu/System"
96
- },
97
- "keywords": [
98
- "system_clients"
99
- ],
100
- "author": "杨文宇",
101
- "license": "ISC"
102
- }
1
+ {
2
+ "name": "system-clients",
3
+ "version": "3.1.108-aode",
4
+ "description": "系统基础框架",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "example": "examples",
8
+ "test": "test"
9
+ },
10
+ "scripts": {
11
+ "example": "node build/example-server.js",
12
+ "dev": "node build/dev-server.js",
13
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
14
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
15
+ "e2e": "node test/e2e/runner.js",
16
+ "unit": "karma start test/unit/karma.conf.js",
17
+ "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
18
+ },
19
+ "dependencies": {
20
+ "base64-js": "^1.3.0",
21
+ "js-base64": "^2.4.9",
22
+ "less": "^2.7.1",
23
+ "less-loader": "^2.2.3",
24
+ "src": "^1.1.2",
25
+ "vue": "^1.0.17"
26
+ },
27
+ "devDependencies": {
28
+ "babel-core": "^6.0.0",
29
+ "babel-loader": "^6.0.0",
30
+ "babel-plugin-transform-runtime": "^6.0.0",
31
+ "babel-preset-es2015": "^6.0.0",
32
+ "babel-preset-stage-2": "^6.0.0",
33
+ "chai": "^3.5.0",
34
+ "connect-history-api-fallback": "^1.1.0",
35
+ "cross-env": "^1.0.7",
36
+ "cross-spawn": "^2.1.5",
37
+ "css-loader": "^0.23.0",
38
+ "eslint": "^2.0.0",
39
+ "eslint-config-standard": "^5.1.0",
40
+ "eslint-friendly-formatter": "^1.2.2",
41
+ "eslint-loader": "^1.3.0",
42
+ "eslint-plugin-html": "^1.3.0",
43
+ "eslint-plugin-promise": "^1.0.8",
44
+ "eslint-plugin-standard": "^1.3.2",
45
+ "eslint-plugin-vue": "^0.1.1",
46
+ "eventsource-polyfill": "^0.9.6",
47
+ "express": "^4.13.3",
48
+ "extract-text-webpack-plugin": "^1.0.1",
49
+ "file-loader": "^0.8.4",
50
+ "function-bind": "^1.0.2",
51
+ "html-webpack-plugin": "^2.8.1",
52
+ "http-proxy-middleware": "^0.11.0",
53
+ "inject-loader": "^2.0.1",
54
+ "isparta-loader": "^2.0.0",
55
+ "jasmine-core": "^2.4.1",
56
+ "jquery": "^3.3.1",
57
+ "json-loader": "^0.5.4",
58
+ "karma": "^1.4.1",
59
+ "karma-chrome-launcher": "^2.2.0",
60
+ "karma-coverage": "^1.1.1",
61
+ "karma-mocha": "^1.3.0",
62
+ "karma-sinon-chai": "^1.3.1",
63
+ "karma-sourcemap-loader": "^0.3.7",
64
+ "karma-spec-reporter": "0.0.31",
65
+ "karma-webpack": "^2.0.2",
66
+ "manage-client": "^1.4.20",
67
+ "mkdirp": "^0.5.1",
68
+ "mocha": "^3.2.0",
69
+ "ncp": "^2.0.0",
70
+ "nightwatch": "^0.8.18",
71
+ "rimraf": "^2.5.0",
72
+ "selenium-server": "2.52.0",
73
+ "sinon": "^2.1.0",
74
+ "sinon-chai": "^2.8.0",
75
+ "style": "0.0.3",
76
+ "style-loader": "^0.20.3",
77
+ "url-loader": "^0.5.7",
78
+ "vue-client": "1.21.60",
79
+ "vue-hot-reload-api": "^1.2.0",
80
+ "vue-html-loader": "^1.0.0",
81
+ "vue-loader": "^8.2.1",
82
+ "vue-resource": "^1.5.0",
83
+ "vue-router": "^0.7.13",
84
+ "vue-strap": "^1.0.9",
85
+ "vue-style-loader": "^1.0.0",
86
+ "vue-validator": "^3.0.0-alpha.2",
87
+ "webpack": "^1.12.2",
88
+ "jsencrypt": "3.0.0-rc.1",
89
+ "webpack-dev-middleware": "^1.4.0",
90
+ "webpack-hot-middleware": "^2.6.0",
91
+ "webpack-merge": "^0.8.3"
92
+ },
93
+ "repository": {
94
+ "type": "git",
95
+ "url": "https://gitee.com/aotu/System"
96
+ },
97
+ "keywords": [
98
+ "system_clients"
99
+ ],
100
+ "author": "杨文宇",
101
+ "license": "ISC"
102
+ }
package/src/components/equipment/EquipmentManage.vue CHANGED
@@ -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) {
package/src/components/equipment/PosAdd.vue CHANGED
@@ -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,12 +99,17 @@
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
package/src/components/equipment/PosList.vue CHANGED
@@ -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>
@@ -111,7 +111,7 @@
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_orgid = '${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
  },
package/src/components/equipment/PosManage.vue CHANGED
@@ -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
  },