sale-client 4.2.61 → 4.2.63

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 (23) hide show
  1. package/build/dev-server.js +68 -68
  2. package/package.json +1 -1
  3. package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue +2 -2
  4. package/src/components/revenue/machineHandManage/machineHand.vue +12 -1
  5. package/src/filiale/yangchun/FilesManage/UserGeneralInfoTest.vue +837 -837
  6. package/src/filiale/yangchun/MeterinfoTest.vue +1212 -1206
  7. package/src/main.js +1 -1
  8. package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
  9. package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
  10. package/.gradle/5.2.1/gc.properties +0 -0
  11. package/.gradle/8.5/checksums/checksums.lock +0 -0
  12. package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
  13. package/.gradle/8.5/dependencies-accessors/gc.properties +0 -0
  14. package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
  15. package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
  16. package/.gradle/8.5/fileChanges/last-build.bin +0 -0
  17. package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
  18. package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
  19. package/.gradle/8.5/gc.properties +0 -0
  20. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  21. package/.gradle/buildOutputCleanup/cache.properties +0 -2
  22. package/.gradle/file-system.probe +0 -0
  23. package/.gradle/vcs-1/gc.properties +0 -0
package/build/dev-server.js CHANGED
@@ -1,68 +1,68 @@
1
- var path = require('path')
2
- var checkVersion = require('./versionCheck.js')
3
- checkVersion()
4
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
5
- var merge = require('webpack-merge')
6
- var baseConfig = require('./webpack.dev.conf')
7
- var devConfig = {
8
- devServer: {
9
- contentBase: path.join(__dirname, 'src'),
10
- hot: true,
11
- publicPath: baseConfig.output.publicPath,
12
- historyApiFallback: true,
13
- host: '127.0.0.1',
14
- port: 8089,
15
- open: false,
16
- stats: {
17
- colors: false, // 配置控制台输出彩色日志
18
- chunks: false, // 不输出构建 chunk 信息
19
- children: false // 不输出子模块构建信息
20
- },
21
- proxy: {
22
- // '/api/af-revenue/batchdeduction/all': {
23
- // pathRewrite: {
24
- // '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
25
- // },
26
- // target: localUrl
27
- // },
28
- // '/api/af-revenue/logic': {
29
- // pathRewrite: {
30
- // '/api/af-revenue/logic': '/logic'
31
- // },
32
- // target: localUrl
33
- // },
34
- // '/api/af-revenue/file': {
35
- // // pathRewrite: {
36
- // // '/api/af-revenue/file': '/file'
37
- // // },
38
- // target: localUrl
39
- // },
40
- // '/weixin2/rs':{
41
- //
42
- // target: 'http://410663id1ia4.vicp.fun'
43
- // },
44
- // '/api/af-revenue/sql': {
45
- // pathRewrite: {
46
- // '/api/af-revenue/sql': '/sql'
47
- // },
48
- // target: localUrl
49
- // },
50
- '/rs/pay': {
51
- target: 'http://localhost:8080'
52
- },
53
- '/api/af-revenue': {
54
- pathRewrite: {
55
- '/api/af-revenue': '/af-revenue'
56
- },
57
- target: "http://localhost:8080"
58
- },
59
- '/api': {
60
- target: serverRul
61
- },
62
- '/rs': {
63
- target: serverRul
64
- }
65
- }
66
- }
67
- }
68
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ var checkVersion = require('./versionCheck.js')
3
+ checkVersion()
4
+ const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
5
+ var merge = require('webpack-merge')
6
+ var baseConfig = require('./webpack.dev.conf')
7
+ var devConfig = {
8
+ devServer: {
9
+ contentBase: path.join(__dirname, 'src'),
10
+ hot: true,
11
+ publicPath: baseConfig.output.publicPath,
12
+ historyApiFallback: true,
13
+ host: '127.0.0.1',
14
+ port: 8089,
15
+ open: false,
16
+ stats: {
17
+ colors: false, // 配置控制台输出彩色日志
18
+ chunks: false, // 不输出构建 chunk 信息
19
+ children: false // 不输出子模块构建信息
20
+ },
21
+ proxy: {
22
+ // '/api/af-revenue/batchdeduction/all': {
23
+ // pathRewrite: {
24
+ // '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
25
+ // },
26
+ // target: localUrl
27
+ // },
28
+ // '/api/af-revenue/logic': {
29
+ // pathRewrite: {
30
+ // '/api/af-revenue/logic': '/logic'
31
+ // },
32
+ // target: localUrl
33
+ // },
34
+ // '/api/af-revenue/file': {
35
+ // // pathRewrite: {
36
+ // // '/api/af-revenue/file': '/file'
37
+ // // },
38
+ // target: localUrl
39
+ // },
40
+ // '/weixin2/rs':{
41
+ //
42
+ // target: 'http://410663id1ia4.vicp.fun'
43
+ // },
44
+ // '/api/af-revenue/sql': {
45
+ // pathRewrite: {
46
+ // '/api/af-revenue/sql': '/sql'
47
+ // },
48
+ // target: localUrl
49
+ // },
50
+ '/rs/pay': {
51
+ target: 'http://localhost:8080'
52
+ },
53
+ // '/api/af-revenue': {
54
+ // pathRewrite: {
55
+ // '/api/af-revenue': '/af-revenue'
56
+ // },
57
+ // target: "http://localhost:8080"
58
+ // },
59
+ '/api': {
60
+ target: serverRul
61
+ },
62
+ '/rs': {
63
+ target: serverRul
64
+ }
65
+ }
66
+ }
67
+ }
68
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.61",
3
+ "version": "4.2.63",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue CHANGED
@@ -15,7 +15,7 @@
15
15
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
16
16
  v-if="!$parent.$parent.$parent.isdetail">
17
17
  <label class="font_normal_body">用户姓名</label>
18
- <input class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%" style="width: 90px"
18
+ <input class="input_search" condition="f_user_name like '%{}%'" placeholder="用户姓名" style="width:60%" style="width: 90px"
19
19
  type="text" v-model="model.name"
20
20
  />
21
21
  </div>
@@ -47,7 +47,7 @@
47
47
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
48
48
  v-if="$parent.$parent.$parent.isdetail">
49
49
  <label class="font_normal_body">用户姓名</label>
50
- <input class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%" style="width: 90px"
50
+ <input class="input_search" condition="f_user_name like '%{}%'" placeholder="用户姓名" style="width:60%" style="width: 90px"
51
51
  type="text" v-model="model.name"
52
52
  />
53
53
  </div>
package/src/components/revenue/machineHandManage/machineHand.vue CHANGED
@@ -95,7 +95,7 @@
95
95
  <div class="col-sm-2 form-group">
96
96
  <label class="font_normal_body">客户姓名</label>
97
97
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name" placeholder='客户姓名'
98
- condition="f_user_name = '{}'">
98
+ condition="f_user_name like '%{}%'">
99
99
  </div>
100
100
  <div class="col-sm-2 form-group">
101
101
  <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>
@@ -215,6 +215,11 @@
215
215
  </div>
216
216
  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
217
217
  v-ref:sel></res-select-group>
218
+ <div class="col-sm-2 form-group">
219
+ <label class="font_normal_body">旧客户编号</label>
220
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
221
+ condition="f_olduserinfo_code='{}'" placeholder='客户编号'>
222
+ </div>
218
223
  </div>
219
224
 
220
225
 
@@ -253,6 +258,11 @@
253
258
  :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
254
259
  </nobr>
255
260
  </th>
261
+ <th>
262
+ <nobr>
263
+ 旧客户编号
264
+ </nobr>
265
+ </th>
256
266
  <!-- <th>-->
257
267
  <!-- <nobr>表编号</nobr>-->
258
268
  <!-- </th>-->
@@ -371,6 +381,7 @@
371
381
  <!--</td>-->
372
382
  <td style="text-align: center;">{{$index + 1}}</td>
373
383
  <td>{{row.f_userinfo_code}}</td>
384
+ <td>{{row.f_olduserinfo_code}}</td>
374
385
  <td style="text-align: center;">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_address}}</td>
375
386
  <td style="text-align: center;">{{row.f_user_level}}</td>
376
387
  <!--<td>{{row.f_building}}</td>-->