sale-client 4.2.153 → 4.2.155

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 (6) hide show
  1. package/build/dev-server.js +49 -49
  2. package/package.json +1 -1
  3. package/src/components/common/userinfo_detail/SplitPrice.vue +1 -1
  4. package/src/filiale/ronghao/ChangeMeter.vue +5 -3
  5. package/src/filiale/xihu/UserBaseInfoNew.vue +1 -1
  6. package/src/main.js +2 -2
package/build/dev-server.js CHANGED
@@ -1,7 +1,7 @@
1
1
  var path = require('path')
2
2
  var checkVersion = require('./versionCheck.js')
3
3
  checkVersion()
4
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://127.0.0.1:9026']
4
+ const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://127.0.0.1:9026']
5
5
  var merge = require('webpack-merge')
6
6
  var baseConfig = require('./webpack.dev.conf')
7
7
  var devConfig = {
@@ -19,59 +19,59 @@ var devConfig = {
19
19
  children: false // 不输出子模块构建信息
20
20
  },
21
21
  proxy: {
22
- '/api/af-revenue/logic/depositCharge': {
23
- pathRewrite: {
24
- '/api/af-revenue/logic': '/logic'
25
- },
26
- target: localUrl,
27
- changeOrigin: true
28
- },
29
- '/api/af-revenue/logic': {
30
- pathRewrite: {
31
- '/api/af-revenue/logic': '/logic'
32
- },
33
- target: localUrl,
34
- changeOrigin: true
35
- },
36
- '/api/af-revenue/file': {
37
- pathRewrite: {
38
- '/api/af-revenue/file': '/file'
39
- },
40
- target: localUrl,
41
- changeOrigin: true
42
- },
43
- 'api/af-revenue/entity/save': {
44
- pathRewrite: {
45
- '/api/af-revenue/entity/save': '/entity/save'
46
- },
47
- target: localUrl,
48
- changeOrigin: true
49
- },
50
- '/singlepage': {
51
- // pathRewrite: {
52
- // '/weixin2/rs': '/rs'
53
- // },
54
- target: localUrl,
55
- changeOrigin: true
56
- },
57
- '/weixin2/rs': {
58
- pathRewrite: {
59
- '/weixin2/rs': '/singlepage/weixin2/rs'
60
- },
61
- target: serverRul,
62
- changeOrigin: true
63
- },
64
- // '/api/af-revenue/sql': {
22
+ // '/api/af-revenue/logic/depositCharge': {
65
23
  // pathRewrite: {
66
- // '/api/af-revenue/sql': '/sql'
24
+ // '/api/af-revenue/logic': '/logic'
67
25
  // },
68
26
  // target: localUrl,
69
27
  // changeOrigin: true
70
28
  // },
71
- '/rs/pay': {
72
- target: serverRul,
73
- changeOrigin: true
74
- },
29
+ // '/api/af-revenue/logic': {
30
+ // pathRewrite: {
31
+ // '/api/af-revenue/logic': '/logic'
32
+ // },
33
+ // target: localUrl,
34
+ // changeOrigin: true
35
+ // },
36
+ // '/api/af-revenue/file': {
37
+ // pathRewrite: {
38
+ // '/api/af-revenue/file': '/file'
39
+ // },
40
+ // target: localUrl,
41
+ // changeOrigin: true
42
+ // },
43
+ // 'api/af-revenue/entity/save': {
44
+ // pathRewrite: {
45
+ // '/api/af-revenue/entity/save': '/entity/save'
46
+ // },
47
+ // target: localUrl,
48
+ // changeOrigin: true
49
+ // },
50
+ // '/singlepage': {
51
+ // // pathRewrite: {
52
+ // // '/weixin2/rs': '/rs'
53
+ // // },
54
+ // target: localUrl,
55
+ // changeOrigin: true
56
+ // },
57
+ // '/weixin2/rs': {
58
+ // pathRewrite: {
59
+ // '/weixin2/rs': '/singlepage/weixin2/rs'
60
+ // },
61
+ // target: serverRul,
62
+ // changeOrigin: true
63
+ // },
64
+ // // '/api/af-revenue/sql': {
65
+ // // pathRewrite: {
66
+ // // '/api/af-revenue/sql': '/sql'
67
+ // // },
68
+ // // target: localUrl,
69
+ // // changeOrigin: true
70
+ // // },
71
+ // '/rs/pay': {
72
+ // target: serverRul,
73
+ // changeOrigin: true
74
+ // },
75
75
  '/api': {
76
76
  target: serverRul,
77
77
  changeOrigin: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.153",
3
+ "version": "4.2.155",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/common/userinfo_detail/SplitPrice.vue CHANGED
@@ -142,7 +142,7 @@
142
142
  },
143
143
  async ready () {
144
144
  let data = {
145
- condition: 'f_filialeid in (' + this.$login.f.orgid + ')',
145
+ condition: `f_filialeid in ( '${this.$login.f.orgid}')`,
146
146
  orderitem: this.orderitem
147
147
  }
148
148
  let res = await this.$resetpost('api/af-revenue/sql/getGasPriceInfo', {'data': data}, {
package/src/filiale/ronghao/ChangeMeter.vue CHANGED
@@ -211,15 +211,17 @@
211
211
  <!-- <input class="input_search" style="width:60%" type="text"-->
212
212
  <!-- v-model="model.f_serial_number" placeholder="业务单号">-->
213
213
  <!-- </div>-->
214
- <div class="col-sm-4 ">
214
+ <div class="col-sm-4" :class="[$v.ladder_sync.required ? 'has-error' : '']">
215
215
  <label class=" font_normal_body">阶梯累计</label>
216
+ <input type="text" v-show="false" v-model="$refs.ladder_sync.selectedItems" v-validate:ladder_sync='{required: true }'>
216
217
  <v-select id="f_ladder_sync"
217
- v-model="f_ladder_sync"
218
+ v-model="f_payment"
218
219
  placeholder='是否累计'
219
220
  :search="false"
220
221
  :value-single="true"
221
222
  :value.sync="model.f_ladder_sync"
222
223
  :options='ladder'
224
+ v-ref:ladder_sync
223
225
  close-on-select clear-button></v-select>
224
226
  </div>
225
227
  <div class="col-sm-4" v-if="!config.f_change_reason">
@@ -466,7 +468,7 @@ export default {
466
468
  billType: '其他费用', // 票据类型（燃气费，其他费用，调用的发票代码不同）
467
469
  printType: '普通收据', // 收据/电子票/专用发票/国税发票
468
470
  payment: '现金缴费',
469
- ladderSync: '同步',
471
+ ladderSync: '',
470
472
  open_way: '发卡开户',
471
473
  hasArrearsChange: false, // 是否可以有欠费换表
472
474
  f_change_operator: false, // 换表人是否必填
package/src/filiale/xihu/UserBaseInfoNew.vue CHANGED
@@ -191,7 +191,7 @@
191
191
  <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
192
192
  class="button_search" type="button" @click="clearBarrier">清除障碍
193
193
  </button>
194
- <button v-if="row.f_meter_brand.includes('美华') && row.f_meter_type.includes('物联网表')"
194
+ <button v-if="row.f_meter_type.includes('物联网表')"
195
195
  class="button_search" type="button" @click="userFilesSync">档案同步
196
196
  </button>
197
197
  <button v-if="row.f_meter_type.includes('物联网表')"
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- // import FilialeSale from './filiale/meihekou/sale'
5
+ import FilialeSale from './filiale/ronghao/sale'
6
6
  import sale from './sale'
7
7
  // import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'
@@ -24,7 +24,7 @@ system(false)
24
24
  sale()
25
25
  // address()
26
26
  ldap()
27
- // FilialeSale()
27
+ FilialeSale()
28
28
  require('system-clients/src/styles/less/bootstrap.less')
29
29
 
30
30
  new Vue({