manage-client 3.3.185 → 3.3.187

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.
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.3.185",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "crypto-js": "^4.1.1",
11
- "swiper": "^5.4.5"
12
- },
13
- "devDependencies": {
14
- "axios": "0.15.3",
15
- "babel-core": "^6.0.0",
16
- "babel-loader": "^6.0.0",
17
- "babel-plugin-transform-runtime": "^6.0.0",
18
- "babel-preset-es2015": "^6.0.0",
19
- "babel-preset-stage-2": "^6.0.0",
20
- "chai": "^3.5.0",
21
- "co": "^4.6.0",
22
- "connect-history-api-fallback": "^1.1.0",
23
- "cross-env": "^1.0.7",
24
- "cross-spawn": "^2.1.5",
25
- "css-loader": "^0.23.0",
26
- "echarts": "^4.1.0",
27
- "eslint": "^2.0.0",
28
- "eslint-config-standard": "^5.1.0",
29
- "eslint-friendly-formatter": "^1.2.2",
30
- "eslint-loader": "^1.3.0",
31
- "eslint-plugin-html": "^1.3.0",
32
- "eslint-plugin-promise": "^1.0.8",
33
- "eslint-plugin-standard": "^1.3.2",
34
- "eslint-plugin-vue": "^0.1.1",
35
- "eventsource-polyfill": "^0.9.6",
36
- "express": "^4.13.3",
37
- "extract-text-webpack-plugin": "^1.0.1",
38
- "filemanager-webpack-plugin": "^2.0.5",
39
- "file-loader": "^0.8.4",
40
- "function-bind": "^1.0.2",
41
- "html-webpack-plugin": "^2.8.1",
42
- "http-proxy-middleware": "^0.11.0",
43
- "inject-loader": "^2.0.1",
44
- "isparta-loader": "^2.0.0",
45
- "jasmine-core": "^2.4.1",
46
- "jquery": "^3.3.1",
47
- "jsencrypt": "3.0.0-rc.1",
48
- "json-loader": "^0.5.4",
49
- "karma": "^1.4.1",
50
- "karma-chrome-launcher": "^2.2.0",
51
- "karma-coverage": "^1.1.1",
52
- "karma-mocha": "^1.3.0",
53
- "karma-sinon-chai": "^1.3.1",
54
- "karma-sourcemap-loader": "^0.3.7",
55
- "karma-spec-reporter": "0.0.31",
56
- "karma-webpack": "^2.0.2",
57
- "ldap-clients": "3.0.7",
58
- "less": "^2.7.3",
59
- "mkdirp": "^0.5.1",
60
- "mocha": "^3.2.0",
61
- "moment": "2.24.0",
62
- "ncp": "^2.0.0",
63
- "rimraf": "^2.5.0",
64
- "sale-client": "3.4.14",
65
- "selenium-server": "2.52.0",
66
- "sinon": "^2.1.0",
67
- "sinon-chai": "^2.8.0",
68
- "style": "0.0.3",
69
- "style-loader": "^0.20.3",
70
- "swiper": "^5.4.5",
71
- "system-clients": "3.2.61",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.141",
75
- "vue-hot-reload-api": "^1.2.0",
76
- "vue-html-loader": "^1.0.0",
77
- "vue-loader": "8.2.1",
78
- "vue-resource": "^1.5.0",
79
- "vue-router": "^0.7.13",
80
- "vue-strap": "^1.0.9",
81
- "vue-style-loader": "^1.0.0",
82
- "vue-validator": "2.1.7",
83
- "webpack": "1.12.2",
84
- "webpack-dev-middleware": "^1.4.0",
85
- "webpack-hot-middleware": "^2.6.0",
86
- "webpack-merge": "^0.8.3",
87
- "webpack-parallel-uglify-plugin": "^1.0.0"
88
- },
89
- "scripts": {
90
- "unit": "karma start test/unit/karma.conf.js --single-run",
91
- "example": "node build/example-server.js",
92
- "dev": "node build/dev-server.js",
93
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
- "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
- "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
- "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
- "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
- "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
- "e2e": "node test/e2e/runner.js",
100
- "release": "bash build/release.sh"
101
- },
102
- "repository": {
103
- "type": "git",
104
- "url": "https://gitee.com/aote/management_modules.git"
105
- },
106
- "keywords": [
107
- "manage"
108
- ],
109
- "author": "liuxudong",
110
- "license": "ISC"
111
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.3.187",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "crypto-js": "^4.1.1",
11
+ "swiper": "^5.4.5"
12
+ },
13
+ "devDependencies": {
14
+ "axios": "0.15.3",
15
+ "babel-core": "^6.0.0",
16
+ "babel-loader": "^6.0.0",
17
+ "babel-plugin-transform-runtime": "^6.0.0",
18
+ "babel-preset-es2015": "^6.0.0",
19
+ "babel-preset-stage-2": "^6.0.0",
20
+ "chai": "^3.5.0",
21
+ "co": "^4.6.0",
22
+ "connect-history-api-fallback": "^1.1.0",
23
+ "cross-env": "^1.0.7",
24
+ "cross-spawn": "^2.1.5",
25
+ "css-loader": "^0.23.0",
26
+ "echarts": "^4.1.0",
27
+ "eslint": "^2.0.0",
28
+ "eslint-config-standard": "^5.1.0",
29
+ "eslint-friendly-formatter": "^1.2.2",
30
+ "eslint-loader": "^1.3.0",
31
+ "eslint-plugin-html": "^1.3.0",
32
+ "eslint-plugin-promise": "^1.0.8",
33
+ "eslint-plugin-standard": "^1.3.2",
34
+ "eslint-plugin-vue": "^0.1.1",
35
+ "eventsource-polyfill": "^0.9.6",
36
+ "express": "^4.13.3",
37
+ "extract-text-webpack-plugin": "^1.0.1",
38
+ "filemanager-webpack-plugin": "^2.0.5",
39
+ "file-loader": "^0.8.4",
40
+ "function-bind": "^1.0.2",
41
+ "html-webpack-plugin": "^2.8.1",
42
+ "http-proxy-middleware": "^0.11.0",
43
+ "inject-loader": "^2.0.1",
44
+ "isparta-loader": "^2.0.0",
45
+ "jasmine-core": "^2.4.1",
46
+ "jquery": "^3.3.1",
47
+ "jsencrypt": "3.0.0-rc.1",
48
+ "json-loader": "^0.5.4",
49
+ "karma": "^1.4.1",
50
+ "karma-chrome-launcher": "^2.2.0",
51
+ "karma-coverage": "^1.1.1",
52
+ "karma-mocha": "^1.3.0",
53
+ "karma-sinon-chai": "^1.3.1",
54
+ "karma-sourcemap-loader": "^0.3.7",
55
+ "karma-spec-reporter": "0.0.31",
56
+ "karma-webpack": "^2.0.2",
57
+ "ldap-clients": "3.0.7",
58
+ "less": "^2.7.3",
59
+ "mkdirp": "^0.5.1",
60
+ "mocha": "^3.2.0",
61
+ "moment": "2.24.0",
62
+ "ncp": "^2.0.0",
63
+ "rimraf": "^2.5.0",
64
+ "sale-client": "3.4.14",
65
+ "selenium-server": "2.52.0",
66
+ "sinon": "^2.1.0",
67
+ "sinon-chai": "^2.8.0",
68
+ "style": "0.0.3",
69
+ "style-loader": "^0.20.3",
70
+ "swiper": "^5.4.5",
71
+ "system-clients": "3.2.61",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.141",
75
+ "vue-hot-reload-api": "^1.2.0",
76
+ "vue-html-loader": "^1.0.0",
77
+ "vue-loader": "8.2.1",
78
+ "vue-resource": "^1.5.0",
79
+ "vue-router": "^0.7.13",
80
+ "vue-strap": "^1.0.9",
81
+ "vue-style-loader": "^1.0.0",
82
+ "vue-validator": "2.1.7",
83
+ "webpack": "1.12.2",
84
+ "webpack-dev-middleware": "^1.4.0",
85
+ "webpack-hot-middleware": "^2.6.0",
86
+ "webpack-merge": "^0.8.3",
87
+ "webpack-parallel-uglify-plugin": "^1.0.0"
88
+ },
89
+ "scripts": {
90
+ "unit": "karma start test/unit/karma.conf.js --single-run",
91
+ "example": "node build/example-server.js",
92
+ "dev": "node build/dev-server.js",
93
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
+ "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
+ "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
+ "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
+ "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
+ "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
+ "e2e": "node test/e2e/runner.js",
100
+ "release": "bash build/release.sh"
101
+ },
102
+ "repository": {
103
+ "type": "git",
104
+ "url": "https://gitee.com/aote/management_modules.git"
105
+ },
106
+ "keywords": [
107
+ "manage"
108
+ ],
109
+ "author": "liuxudong",
110
+ "license": "ISC"
111
+ }
@@ -24,27 +24,7 @@
24
24
  :show-reset-button="reset">
25
25
  </datepicker>
26
26
  </div>
27
- <div class="col-sm-2 form-group">
28
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
29
- <right-tree @re-res="$parent.$parent.getRes"></right-tree>
30
- </div>
31
- <div class="col-sm-2 form-group">
32
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
- <res-select restype='department'
34
- @res-select="$parent.$parent.getdep"
35
- :parentresid ="$parent.$parent.depresid"
36
- :initresid='$parent.$parent.depid'>
37
- </res-select>
38
-
39
- </div>
40
- <div class="col-sm-2 form-group">
41
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
42
- <res-select restype='user'
43
- @res-select="$parent.$parent.getuser"
44
- :parentresid="$parent.$parent.userresid"
45
- :initresid='$parent.$parent.operatorid'>
46
- </res-select>
47
- </div>
27
+ <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
48
28
  <div class="col-sm-2 form-group">
49
29
  <label class="font_normal_body" title="分组项一">分组项一</label>
50
30
  <v-select :value.sync="model.f_public_group1"
@@ -141,6 +121,7 @@
141
121
  f_orgid: this.$login.f.orgid,
142
122
  f_depid: this.$login.f.depids,
143
123
  f_operatorid: this.$login.f.id,
124
+ resshow:['company','department','operator'],
144
125
  operatorid: [],
145
126
  depid: [],
146
127
  orgname: '',
@@ -178,15 +159,6 @@
178
159
  this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
179
160
  this.$refs.paged.$refs.criteria.model.group2Name = this.$refs.paged.$refs.criteria.$refs.grouptwo.selectedItems
180
161
  let orgcondition = '1 = 1'
181
- if (this.f_orgid[0]) {
182
- orgcondition += ` and t1.f_orgid in ('${this.f_orgid}')`
183
- }
184
- if (this.f_depid[0]) {
185
- orgcondition += ` and t1.f_depid in ('${this.f_depid}')`
186
- }
187
- if(this.f_operatorid[0]) {
188
- orgcondition += ` and t1.f_operatorid in ('${this.f_operatorid}')`
189
- }
190
162
  let name1 = args.model.f_public_group1
191
163
  let name2 = args.model.f_public_group2
192
164
  if (name1 == null || name1 == '' || name2 == null || name2 == ''){
@@ -201,10 +173,11 @@
201
173
  this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
202
174
  this.$refs.paged.search(args)
203
175
  },
204
- getRes (obj) {
205
- this.orgname = obj.res[0]
206
- this.depresid = obj.resids
207
- this.f_orgid = obj.resids
176
+ getRes (condition, obj) {
177
+ this.orgCondtionStr = condition
178
+ this.orgname = obj.orgnames[0]
179
+ this.depname = obj.depnames[0]
180
+ this.operatorname = obj.operatornames[0]
208
181
  },
209
182
  getdep (obj, val) {
210
183
  this.depname = val[0]
@@ -216,9 +216,6 @@
216
216
  <th>
217
217
  <nobr>累购金额</nobr>
218
218
  </th>
219
- <th>
220
- <nobr>客户电话</nobr>
221
- </th>
222
219
  <th>
223
220
  <!--<nobr>客户地址</nobr>-->
224
221
  <data-order field="f_address" name="客户地址"
@@ -308,9 +305,6 @@
308
305
  <td style="text-align: center;">
309
306
  <nobr>{{row.leigoumoney}}</nobr>
310
307
  </td>
311
- <td style="text-align: center;">
312
- <nobr>{{row.f_user_phone}}</nobr>
313
- </td>
314
308
  <td style="text-align: center;">
315
309
  <nobr>{{row.f_address}}</nobr>
316
310
  </td>
@@ -6,7 +6,6 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
8
  <div class="row">
9
- <res-select-group :show-component="['company','department']" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
10
9
  <div class="col-sm-2 form-group">
11
10
  <label for="startDate" class="font_normal_body">开始日期</label>
12
11
  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -47,6 +46,7 @@
47
46
  </div>
48
47
  </div>
49
48
  <div class="row" v-show="$parent.$parent.criteriaShow">
49
+ <res-select-group :show-component="['company','department','operator']" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
50
50
  <div class="col-sm-2 form-group">
51
51
  <label class="font_normal_body">客户名称</label>
52
52
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"