manage-client 1.60.12-4 → 1.60.12-5

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 (3) hide show
  1. package/build/dev-server.js +44 -16
  2. package/package.json +1 -1
  3. package/src/components/sale/businessquery/NotUseQuery.vue +2 -2
package/build/dev-server.js CHANGED
@@ -7,53 +7,81 @@ var httpProxy = require('http-proxy')
7
7
  var app = express()
8
8
  var compiler = webpack(config)
9
9
  var proxy = httpProxy.createProxyServer()
10
- let server = 'http://192.168.1.212:8300/'
10
+
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var proxyTable = {
14
14
  '/images': {
15
- target : server
15
+ // target: 'http://localhost:8086'
16
+ target: 'http://192.168.1.212:8300/ldap'
16
17
  },
17
18
  // 查找资源服务数据
18
19
  '/rs/search': {
19
- target : server
20
+ // target: 'http://192.168.50.202:8099'
21
+ // target: 'http://192.168.20.2:8081'
22
+ target: 'http://192.168.1.212:8300/ldap'
23
+ // target: 'http://192.168.20.191:8011'
20
24
  },
21
25
  // 用户登录服务地址
22
26
  '/rs/user': {
23
- target : server
27
+ // target: 'http://192.168.50.202:8099'
28
+ // target: 'http://192.168.2.77:8081'
29
+ target: 'http://192.168.1.212:8300/'
30
+ // target: 'http://192.168.20.191:8011'
24
31
  },
25
32
  '/rs/path/getParams': {
26
- target : server
33
+ // target: 'http://192.168.50.202:8099'
34
+ //target: 'http://127.0.0.1:8888/product'
35
+ target: 'http://192.168.50.220:8200/system'
36
+ // target: 'http://192.168.20.191:8011'
27
37
  },
28
38
  '/rs/logic/getInitData': {
29
- target : server
39
+ // target: 'http://192.168.50.202:8099'
40
+ //target: 'http://127.0.0.1:8888/product'
41
+ target: 'http://192.168.1.212:8300/system'
42
+ // target: 'http://192.168.20.191:8011'
30
43
  },
31
44
  '/rs/sql/saleSingleTable': {
32
- target : server
45
+ // target: 'http://192.168.50.202:8099'
46
+ //target: 'http://127.0.0.1:8888/product'
47
+ target: 'http://192.168.50.220:8300'
48
+ // target: 'http://192.168.20.191:8011'
33
49
  },
34
50
  '/rs/sql/singleTable_OrderBy': {
35
- target : server
51
+ // target: 'http://192.168.50.202:8099'
52
+ //target: 'http://127.0.0.1:8888/product'
53
+ target: 'http://192.168.1.212:8300/system'
54
+ // target: 'http://192.168.20.191:8011'
36
55
  },
37
56
  '/rs/logic/getLogin': {
38
- target : 'http://192.168.1.212:8300/system'
57
+ // target: 'http://192.168.50.202:8099'
58
+ //target: 'http://127.0.0.1:8888/product'
59
+ target: 'http://192.168.1.212:8300/system'
60
+ // target: 'http://192.168.20.191:8011'
39
61
  },
40
62
  '/rs/db': {
41
- target : server
63
+ target: 'http://192.168.1.212:8300/ldap'
64
+ // target: 'http://127.0.0.1:8012'
65
+ // target: 'http://192.168.20.191:s8011'
42
66
  },
43
67
  '/excel': {
44
- target : server
68
+ target: 'http://192.168.1.212:8300/'
69
+ // target: 'http://127.0.0.1:8080/manager'
70
+ // target: 'http://192.168.50.220:8300'
45
71
  },
46
72
  '/rs/file': {
47
- target : server
73
+ target: 'http://192.168.1.212:8300/'
48
74
  },
49
75
  '/rs/logic/getSaleInitData':{
50
- target : server
76
+ target: 'http://192.168.1.212:8300/'
51
77
  },
52
78
  '/rs/vue': {
53
- target : server
79
+ target: 'http://192.168.1.212:8300/system'
54
80
  },
55
- '/rs': {
56
- target : server
81
+ '/rs': {//rs/sql/newsellQuery
82
+ // target: 'http://127.0.0.1:8088/mamage'
83
+ target: 'http://192.168.1.212:8300/'
84
+ // target: 'http://192.168.50.220:8300'
57
85
  }
58
86
  }
59
87
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.60.12-4",
3
+ "version": "1.60.12-5",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/NotUseQuery.vue CHANGED
@@ -336,8 +336,8 @@ export default {
336
336
  other: [],
337
337
  footer: [],
338
338
  model: new PagedList('rs/sql/getnogas', 30, {
339
- startDate: 'this.model.startDate != null && this.model.startDate != "" ? this.model.startDate : this.model.startHandDate',
340
- endDate: 'this.model.endDate != null && this.model.endDate != "" ? this.model.endDate : this.model.endHandDate'
339
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
340
+ endDate: this.$refs.paged.$refs.cri.model.endDate
341
341
  }),
342
342
  initres: {
343
343
  org: [this.$login.f.orgid],