manage-client 3.2.218 → 3.2.219
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.
package/build/dev-server.js
CHANGED
|
@@ -19,8 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
|
|
23
|
-
var bendi = 'http://119.187.112.234:8400/'
|
|
22
|
+
var bendi = 'http://192.168.50.4:8400'
|
|
23
|
+
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
+
var wode = 'http://127.0.0.1:8080'
|
|
24
25
|
// 192.168.
|
|
25
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
26
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
@@ -80,11 +81,11 @@ var proxyTable = {
|
|
|
80
81
|
'/rs/file': {
|
|
81
82
|
target: bendi
|
|
82
83
|
},
|
|
83
|
-
'/rs/
|
|
84
|
-
target:
|
|
84
|
+
'/rs/sql/singleTable': {
|
|
85
|
+
target: bendi
|
|
85
86
|
},
|
|
86
87
|
'/rs': {
|
|
87
|
-
target:
|
|
88
|
+
target: wode
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.219",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"karma-sourcemap-loader": "^0.3.7",
|
|
54
54
|
"karma-spec-reporter": "0.0.31",
|
|
55
55
|
"karma-webpack": "^2.0.2",
|
|
56
|
-
"ldap-clients": "3.0.
|
|
56
|
+
"ldap-clients": "3.0.55-test-1",
|
|
57
57
|
"less": "^2.7.3",
|
|
58
58
|
"mkdirp": "^0.5.1",
|
|
59
59
|
"mocha": "^3.2.0",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"style": "0.0.3",
|
|
68
68
|
"style-loader": "^0.20.3",
|
|
69
69
|
"swiper": "^5.4.5",
|
|
70
|
-
"system-clients": "3.
|
|
70
|
+
"system-clients": "3.2.54-test-1",
|
|
71
71
|
"url-loader": "^0.5.7",
|
|
72
72
|
"vue-amap": "0.5.10",
|
|
73
73
|
"vue-client": "1.24.51",
|
|
@@ -356,9 +356,9 @@
|
|
|
356
356
|
<th>
|
|
357
357
|
<nobr>合计欠费</nobr>
|
|
358
358
|
</th>
|
|
359
|
-
<th title="实际欠费=合计欠费-上期结余"
|
|
360
|
-
<nobr>实际欠费</nobr
|
|
361
|
-
</th
|
|
359
|
+
<!-- <th title="实际欠费=合计欠费-上期结余">-->
|
|
360
|
+
<!-- <nobr>实际欠费</nobr>-->
|
|
361
|
+
<!-- </th>-->
|
|
362
362
|
<th>
|
|
363
363
|
<nobr>抄表员</nobr>
|
|
364
364
|
</th>
|
|
@@ -459,9 +459,9 @@
|
|
|
459
459
|
<td style="text-align: center;">
|
|
460
460
|
<nobr>{{ row.f_oughtfee_all }}</nobr>
|
|
461
461
|
</td>
|
|
462
|
-
<td style="text-align: center;"
|
|
463
|
-
<nobr>{{ row.f_oughtfee_col }}</nobr
|
|
464
|
-
</td
|
|
462
|
+
<!-- <td style="text-align: center;">-->
|
|
463
|
+
<!-- <nobr>{{ row.f_oughtfee_col }}</nobr>-->
|
|
464
|
+
<!-- </td>-->
|
|
465
465
|
<td style="text-align: center;">
|
|
466
466
|
<nobr>{{ row.f_inputtor }}</nobr>
|
|
467
467
|
</td>
|
|
@@ -591,8 +591,7 @@ export default {
|
|
|
591
591
|
f_oughtfee_new: 0,
|
|
592
592
|
overdue: 0,
|
|
593
593
|
f_garbage_fee: 0,
|
|
594
|
-
f_oughtfee_all: 0
|
|
595
|
-
f_oughtfee_col: 0
|
|
594
|
+
f_oughtfee_all: 0
|
|
596
595
|
}),
|
|
597
596
|
criteriaShow: false,
|
|
598
597
|
orgCondtionStr: '',
|
|
@@ -101,7 +101,13 @@
|
|
|
101
101
|
close-on-select></v-select>
|
|
102
102
|
</div>-->
|
|
103
103
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
104
|
-
|
|
104
|
+
<div class="col-sm-2 form-group">
|
|
105
|
+
<label class="font_normal_body">气价名称</label>
|
|
106
|
+
<v-select :value.sync="model.f_price_name"
|
|
107
|
+
:options='$parent.$parent.priceName' placeholder='请选择' v-model="model.f_price_name"
|
|
108
|
+
condition="f_price_name = '{}'"
|
|
109
|
+
close-on-select></v-select>
|
|
110
|
+
</div>
|
|
105
111
|
</div>
|
|
106
112
|
</div>
|
|
107
113
|
</criteria>
|
|
@@ -457,6 +463,9 @@
|
|
|
457
463
|
},
|
|
458
464
|
whetherPay() {
|
|
459
465
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
466
|
+
},
|
|
467
|
+
priceName() {
|
|
468
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
460
469
|
}
|
|
461
470
|
},
|
|
462
471
|
events:{
|
|
@@ -133,6 +133,13 @@
|
|
|
133
133
|
close-on-select></v-select>
|
|
134
134
|
</div>-->
|
|
135
135
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
136
|
+
<div class="col-sm-2 form-group">
|
|
137
|
+
<label class="font_normal_body">气价名称</label>
|
|
138
|
+
<v-select :value.sync="model.f_price_name"
|
|
139
|
+
:options='$parent.$parent.priceName' placeholder='请选择' v-model="model.f_price_name"
|
|
140
|
+
condition="f_price_name = '{}'"
|
|
141
|
+
close-on-select></v-select>
|
|
142
|
+
</div>
|
|
136
143
|
</div>
|
|
137
144
|
</div>
|
|
138
145
|
</criteria>
|
|
@@ -586,6 +593,9 @@
|
|
|
586
593
|
},
|
|
587
594
|
whetherPay() {
|
|
588
595
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
596
|
+
},
|
|
597
|
+
priceName() {
|
|
598
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
589
599
|
}
|
|
590
600
|
},
|
|
591
601
|
events:{
|