sale-client 4.2.126 → 4.2.128

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.
@@ -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://192.168.50.67:31567/']
4
+ const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
5
5
  var merge = require('webpack-merge')
6
6
  var baseConfig = require('./webpack.dev.conf')
7
7
  var devConfig = {
@@ -51,10 +51,10 @@ var devConfig = {
51
51
  target: 'http://localhost:8080'
52
52
  },
53
53
  '/api/af-revenue': {
54
- pathRewrite: {
55
- '/api/af-revenue': '/af-revenue'
56
- },
57
- target: "http://localhost:8080"
54
+ // pathRewrite: {
55
+ // '/api/af-revenue': '/af-revenue'
56
+ // },
57
+ target: serverRul
58
58
  },
59
59
  '/api': {
60
60
  target: serverRul
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.126",
3
+ "version": "4.2.128",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -19,6 +19,11 @@
19
19
  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" placeholder='客户名称'
20
20
  @keyup.enter="$parent.$parent.clean()" condition="f_user_name like '%{}%'">
21
21
  </div>
22
+ <div class="form-group col-sm-3">
23
+ <label class="font_normal_body">电&emsp;&emsp;话</label>
24
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone" placeholder='电话'
25
+ condition="f_user_phone like '%{}%'">
26
+ </div>
22
27
  <!--<div class="row" >-->
23
28
  <div v-show="$parent.$parent.criteriaShow">
24
29
  <!--<div class="form-group col-sm-4" v-if="$parent.$parent.clientWidth<1600">-->
@@ -32,11 +37,6 @@
32
37
  condition="f_olduserinfo_code = '{}'">
33
38
  </div>
34
39
 
35
- <div class="form-group col-sm-3">
36
- <label class="font_normal_body">电&emsp;&emsp;话</label>
37
- <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone" placeholder='电话'
38
- condition="f_user_phone like '%{}%'">
39
- </div>
40
40
  <div class="form-group col-sm-3">
41
41
  <label class="font_normal_body">客户地址</label>
42
42
  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_address" placeholder='客户地址'
@@ -350,7 +350,7 @@ let getPrice = async function (self) {
350
350
  }
351
351
 
352
352
  self.hasValidateBill = self.config.hasBillManage
353
-
353
+ self.f_meter_base_new = self.row.f_meter_base
354
354
  self.isGas = (self.row.f_collection_type == '按气量')
355
355
 
356
356
  let http = new HttpResetClass()
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/TaiYuan/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'