sale-client 3.5.72 → 3.5.74

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.
@@ -12,7 +12,7 @@ var compiler = webpack(config)
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
14
14
  // 公司测试服务
15
- var fuwu = 'http://39.108.82.124:8400/'
15
+ var fuwu = 'http://139.214.92.34:7450'
16
16
  // var fuwu = 'http://121.36.106.17:8400/'
17
17
  // 铜川正式
18
18
  // var fuwu = 'http://61.134.55.234:9999/'
@@ -98,7 +98,7 @@ var proxyTable = {
98
98
  target: fuwu
99
99
  },
100
100
  '/webmeter': {
101
- target: 'http://39.108.82.124:8400/'
101
+ target: 'http://192.168.50.4:8450'
102
102
  },
103
103
  '/rs': {
104
104
  // target: 'http://192.168.30.63:8081/'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.72",
3
+ "version": "3.5.74",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -51,7 +51,9 @@ let specialComp = {
51
51
  'file-user-essential-info-new': (resolve) => { require(['./FilesManageNew/UserEssentialInfoTest'], resolve) },
52
52
  // 机表抄表
53
53
  'machine-hand': (resolve) => { require(['./revenue/machineHandManage/machineHand'], resolve) },
54
- //抄表审核
54
+ // 下发计划
55
+ 'machine-down': (resolve) => { require(['./revenue/machineHandManage/machineDown'], resolve) },
56
+ // 抄表审核
55
57
  'machine-hand-audit': (resolve) => { require(['./revenue/machineHandManage/machineHandAudit'], resolve) },
56
58
 
57
59
  // 用户综合信息
@@ -85,20 +85,20 @@
85
85
  v-scale="[model.f_curbalance, 2]" placeholder="本期结余" disabled>
86
86
  </div>
87
87
 
88
- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"
89
- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
90
- <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
91
- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
92
- v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
93
- v-el:sk v-scale="[model.f_totalcost, 2]">
94
- </div>
95
- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"
96
- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
97
- <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
98
- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
99
- v-el:sk v-scale="[model.f_totalcost, 2]">
100
- </div>
101
- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按金额'">
88
+ <!-- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"-->
89
+ <!-- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
90
+ <!-- <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>-->
91
+ <!-- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
92
+ <!-- v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'-->
93
+ <!-- v-el:sk v-scale="[model.f_totalcost, 2]">-->
94
+ <!-- </div>-->
95
+ <!-- <div class="col-sm-4 form-group" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"-->
96
+ <!-- :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
97
+ <!-- <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>-->
98
+ <!-- <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
99
+ <!-- v-el:sk v-scale="[model.f_totalcost, 2]">-->
100
+ <!-- </div>-->
101
+ <div class="col-sm-4 form-group">
102
102
  <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
103
103
  <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
104
104
  v-el:sk v-scale="[model.f_collection, 2]" disabled>