manage-client 1.22.6-ca → 1.22.7-ca

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.
@@ -8,7 +8,7 @@ var app = express()
8
8
  var compiler = webpack(config)
9
9
  // var proxy = httpProxy.createProxyServer()
10
10
 
11
- var bendi = 'http://127.0.0.1:8081/', changan = 'http://192.168.2.79:7003/'
11
+ var bendi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
12
12
  var proxyTable = {
13
13
  // 查找资源服务数据
14
14
  '/rs/sql/manageSingleTable': {
@@ -36,6 +36,9 @@ var proxyTable = {
36
36
  '/rs/license': {
37
37
  target: changan
38
38
  },
39
+ '/rs/sql/nosaleQuery': {
40
+ target: 'http://127.0.0.1:8081/'
41
+ },
39
42
  '/rs/sql': {
40
43
  target: bendi
41
44
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.22.6-ca",
3
+ "version": "1.22.7-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -108,7 +108,7 @@
108
108
  :value.sync="model.startDate"
109
109
  :format="'yyyy-MM-dd'"
110
110
  :show-reset-button="true"
111
- condition="f_input_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')">
111
+ condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')">
112
112
 
113
113
  </datepicker>
114
114
  </div>
@@ -119,7 +119,7 @@
119
119
  :value.sync="model.endDate"
120
120
  :format="'yyyy-MM-dd'"
121
121
  :show-reset-button="true"
122
- condition="f_input_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')">
122
+ condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')">
123
123
  </datepicker>
124
124
  </div>
125
125
  <div class="col-sm-2 form-group form-fix-width">
@@ -135,6 +135,14 @@
135
135
  </div>
136
136
  </div>
137
137
  <div class="row">
138
+ <div class="col-sm-2 form-group form-fix-width" style = "float:left;margin-top:10px">
139
+ <label class="font_normal_body _zoom4">收费金额</label>
140
+ <v-select :value.sync="model.f_collection"
141
+ v-model="model.f_collection"
142
+ :options='$parent.$parent.moneys' placeholder='请选择'
143
+ condition="f_collection = {}"
144
+ close-on-select></v-select>
145
+ </div>
138
146
  <div style = "float:right;margin-top:10px">
139
147
  <button class="btn btn-success" @click="search()">查询</button>
140
148
  <button class="btn btn-default" @click="$parent.$parent.clear()">清空</button>
@@ -404,6 +412,9 @@ export default {
404
412
  tablestate () {
405
413
  return [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}]
406
414
  },
415
+ moneys () {
416
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费金额')]
417
+ },
407
418
  sliceArea () {
408
419
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('所属区域')]
409
420
  }