sale-client 3.6.78 → 3.6.79

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 (7) hide show
  1. package/build/dev-server.js +1 -1
  2. package/package.json +1 -1
  3. package/src/components/FilesManage/UserGeneralInfoTest.vue +1 -1
  4. package/src/filiale/wenxi/UserGeneralInfoTest.vue +1 -1
  5. package/src/filiale/wenxi/plugins/FileManageService.js +1 -1
  6. package/src/main.js +1 -1
  7. package/src/plugins/FileManageService.js +1 -1
package/build/dev-server.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var path = require('path')
2
- const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://localhost:8080/']
2
+ const [serverRul, localUrl ] = ['http://59.48.150.94:8300', 'http://59.48.150.94:8300']
3
3
  var merge = require('webpack-merge')
4
4
  var baseConfig = require('./webpack.dev.conf')
5
5
  var devConfig = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.78",
3
+ "version": "3.6.79",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/FilesManage/UserGeneralInfoTest.vue CHANGED
@@ -430,7 +430,7 @@ export default {
430
430
 
431
431
  // 将oldAddress 置为空，
432
432
  this.oldAddress = {}
433
- this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
433
+ this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
434
434
  // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
435
435
  // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
436
436
  this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
package/src/filiale/wenxi/UserGeneralInfoTest.vue CHANGED
@@ -440,7 +440,7 @@ export default {
440
440
 
441
441
  // 将oldAddress 置为空，
442
442
  this.oldAddress = {}
443
- this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
443
+ this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
444
444
  // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
445
445
  // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
446
446
  this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
package/src/filiale/wenxi/plugins/FileManageService.js CHANGED
@@ -209,7 +209,7 @@ let FileManageService = {
209
209
  meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
210
210
  meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
211
211
  // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
212
- meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
212
+ meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
213
213
  if (!meter.f_userfiles_id) {
214
214
  // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
215
215
  // 所有表变成未发
package/src/main.js CHANGED
@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
5
  import sale from './sale'
6
- import wenxi from './filiale/yuansheng/sale'
6
+ import wenxi from './filiale/wenxi/sale'
7
7
  // import FilialeSale from './filiale/yuansheng/sale'
8
8
  import address from 'address-client/src/address'
9
9
  import ldap from 'ldap-clients/src/ldap'
package/src/plugins/FileManageService.js CHANGED
@@ -210,7 +210,7 @@ let FileManageService = {
210
210
  meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
211
211
  meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
212
212
  // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
213
- meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
213
+ meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
214
214
  if (!meter.f_userfiles_id) {
215
215
  // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
216
216
  // 所有表变成未发