manage-client-xy 3.2.14 → 3.2.16

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 (4) hide show
  1. package/build/dev-server.js +28 -27
  2. package/package.json +1 -1
  3. package/src/components/sale/businessquery/CMHGasQuery.vue +1 -1
  4. package/src/components/sale/businessquery/ChangeMeterQuery.vue +12 -0
package/build/dev-server.js CHANGED
@@ -10,87 +10,88 @@ const compiler = webpack(config)
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- // const bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- const bendi = 'http://127.0.0.1:8888/'
15
- const fuwu = 'http://192.168.153.129:8300'
16
- // ,fuwu = 'http://172.16.16.163:8300/'
13
+ // const bendi = 'http://127.0.0.1:8089/manage', server = 'http://36.103.224.217:6300/'
14
+
15
+ const server = 'http://192.168.153.129:8300'
16
+ const local = 'http://127.0.0.1:8888/'
17
+ // ,server = 'http://172.16.16.163:8300/'
17
18
  const proxyTable = {
18
19
  '/resource': {
19
20
  target: 'http://192.168.13.135:31577/'
20
21
  },
21
22
 
22
23
  '/rs/logic/exportfile': {
23
- target: fuwu
24
+ target: server
24
25
  },
25
26
  '/rs/logic/saleExport': {
26
- target: fuwu
27
+ target: server
27
28
  },
28
29
  '/rs/sql/qc_statistics_manage': {
29
- target: fuwu
30
+ target: server
30
31
  },
31
32
  '/files': {
32
- target: fuwu
33
+ target: server
33
34
  },
34
35
  '/webapps': {
35
- target: fuwu
36
+ target: server
36
37
  },
37
38
  '/rs/sql': {
38
- target: fuwu
39
+ target: local
39
40
  },
40
41
  // 查找资源服务数据
41
42
  '/rs/search': {
42
- target: fuwu
43
+ target: server
43
44
  },
44
45
  // 查找资源服务数据
45
46
  '/rs/logic/getLogin': {
46
- target: fuwu
47
+ target: server
47
48
  },
48
49
  // 查找资源服务数据
49
50
  '/rs/logic/getInitData': {
50
- target: fuwu
51
+ target: server
51
52
  },
52
53
  '/rs/logic/getSaleInitData': {
53
- target: fuwu
54
+ target: server
54
55
  },
55
56
  // 用户登录服务地址
56
57
  '/rs/user': {
57
- target: fuwu
58
+ target: server
58
59
  },
59
60
  '/rs/path/getParams': {
60
- target: fuwu
61
+ target: server
61
62
  },
62
63
  '/rs/data': {
63
- target: fuwu
64
+ target: server
64
65
  },
65
66
  '/rs/license': {
66
- target: fuwu
67
+ target: server
67
68
  },
68
69
  '/rs/db': {
69
- target: fuwu
70
+ target: server
70
71
  },
71
72
  '/excel': {
72
- target: fuwu
73
+ target: server
73
74
  },
74
75
  '/rs/config': {
75
- target: fuwu
76
+ target: server
76
77
  },
77
78
  '/rs/sql/getLicenseById': {
78
- target: fuwu
79
+ target: server
79
80
  },
80
81
  '/rs/report': {
81
- target: fuwu
82
+ target: server
82
83
  },
83
84
  '/rs/vue': {
84
- target: fuwu
85
+ target: server
85
86
  },
86
87
  '/rs/file': {
87
- target: fuwu
88
+ target: server
88
89
  },
89
90
  '/rs/logic/SumSettleFileImport': {
90
- target: fuwu
91
+ target: server
91
92
  },
92
93
  '/rs': {
93
- target: fuwu
94
+ target: server
94
95
  }
95
96
  }
96
97
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client-xy",
3
- "version": "3.2.14",
3
+ "version": "3.2.16",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/CMHGasQuery.vue CHANGED
@@ -72,7 +72,7 @@
72
72
  <v-select :value.sync="model.opType"
73
73
  :search="false"
74
74
  :options='$parent.$parent.opType' placeholder='请选择' v-model="model.opType"
75
- condition="f_operat_type = '{}'"
75
+ condition="tsb.f_operat_type = '{}'"
76
76
  close-on-select></v-select>
77
77
  </div>
78
78
  <div class="col-sm-2 form-group">
package/src/components/sale/businessquery/ChangeMeterQuery.vue CHANGED
@@ -208,6 +208,12 @@
208
208
  <th>
209
209
  <nobr>旧表识别码</nobr>
210
210
  </th>
211
+ <th>
212
+ <nobr>旧表累购气量</nobr>
213
+ </th>
214
+ <th>
215
+ <nobr>旧表累购金额</nobr>
216
+ </th>
211
217
  <th>
212
218
  <nobr>旧表底数</nobr>
213
219
  </th>
@@ -291,6 +297,12 @@
291
297
  <td style="text-align: center;">
292
298
  <nobr>{{ row.f_old_imei }}</nobr>
293
299
  </td>
300
+ <td style="text-align: center;">
301
+ <nobr>{{ row.f_old_total_gas }}</nobr>
302
+ </td>
303
+ <td style="text-align: center;">
304
+ <nobr>{{ row.f_old_total_fee }}</nobr>
305
+ </td>
294
306
  <td style="text-align: center;">
295
307
  <nobr>{{ row.f_using_base_old }}</nobr>
296
308
  </td>