manage-client 3.3.80 → 3.3.82
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/package.json +2 -2
- package/src/filiale/WEINAN/config/exportConfig.js +1 -1
- package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue +44 -4
- package/src/filiale/macheng/ArrearsQuery.vue +1 -1
- package/src/filiale/macheng/DayGasQuery.vue +1 -1
- package/src/filiale/macheng/FMYGasQuery.vue +1 -1
- package/src/filiale/macheng/HandplanQuery.vue +1 -1
- package/src/filiale/macheng/MeterQuery.vue +1 -1
- package/src/filiale/macheng/MonthGasQuery.vue +1 -1
- package/src/filiale/macheng/RecordInfoQuery.vue +1 -1
- package/src/filiale/qianneng/QnAqzzYsmx.vue +1 -0
- package/src/filiale/shexian/ChangeMeterQuery.vue +1 -1
- package/src/main.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.82",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"system-clients": "3.2.61",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.24.
|
|
74
|
+
"vue-client": "1.24.104",
|
|
75
75
|
"vue-hot-reload-api": "^1.2.0",
|
|
76
76
|
"vue-html-loader": "^1.0.0",
|
|
77
77
|
"vue-loader": "8.2.1",
|
|
@@ -179,7 +179,7 @@ export default{
|
|
|
179
179
|
|
|
180
180
|
|
|
181
181
|
changemeterConfig: {
|
|
182
|
-
'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址','f_type': '换表类型','f_meternumber_old': '旧表号','f_meternumber': '新表号','f_meter_brand_old': '旧气表品牌',
|
|
182
|
+
'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址','f_residential_area': '小区','f_type': '换表类型','f_meternumber_old': '旧表号','f_meternumber': '新表号','f_meter_brand_old': '旧气表品牌',
|
|
183
183
|
'f_meter_brand': '新气表品牌','f_remanent_gas': '补气量','f_remanent_money': '补气金额','f_comments': '备注',
|
|
184
184
|
'f_change_operator': '换表人','f_state': '状态','f_operate_date': '换表日期','f_operator': '人员','f_depname': '部门',
|
|
185
185
|
'f_orgname': '公司','f_meter_type_old': '旧表类型','f_meter_type': '新表类型','f_user_type': '用户类型'
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
condition="f_operate_date <= '{}'">
|
|
28
28
|
</datepicker>
|
|
29
29
|
</div>
|
|
30
|
-
<div class="col-sm-2 form-group"
|
|
30
|
+
<div class="col-sm-2 form-group" >
|
|
31
31
|
<label class="font_normal_body">客户编号</label>
|
|
32
32
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
33
33
|
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
34
34
|
</div>
|
|
35
|
-
<div class="col-sm-2 form-group"
|
|
35
|
+
<div class="col-sm-2 form-group" >
|
|
36
36
|
<label class="font_normal_body">客户名称</label>
|
|
37
37
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
38
38
|
condition="f_user_name = '{}'" placeholder="客户名称">
|
|
@@ -71,6 +71,24 @@
|
|
|
71
71
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_address"
|
|
72
72
|
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
73
73
|
</div>
|
|
74
|
+
<!--<div class="col-sm-2 form-group">-->
|
|
75
|
+
<!--<label class="font_normal_body">小区</label>-->
|
|
76
|
+
<!--<input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
|
|
77
|
+
<!--condition="f_residential_area like '%{}%'" placeholder='小区'>-->
|
|
78
|
+
<!--</div>-->
|
|
79
|
+
<div class="col-sm-2 form-group">
|
|
80
|
+
<label class="font_normal_body"> 小区 </label>
|
|
81
|
+
<v-select :value.sync="model.f_residential_area"
|
|
82
|
+
class="select_list select"
|
|
83
|
+
v-model="model.f_residential_area"
|
|
84
|
+
style="width: 60%"
|
|
85
|
+
multiple
|
|
86
|
+
condition="f_residential_area in {}"
|
|
87
|
+
:options='$parent.$parent.residentialArea' placeholder='选择小区'
|
|
88
|
+
close-on-select>
|
|
89
|
+
|
|
90
|
+
</v-select>
|
|
91
|
+
</div>
|
|
74
92
|
<div class="col-sm-2 form-group">
|
|
75
93
|
<label class="font_normal_body">用户类型</label>
|
|
76
94
|
<v-select :value.sync="model.f_user_type"
|
|
@@ -217,6 +235,9 @@
|
|
|
217
235
|
<th>
|
|
218
236
|
<nobr>客户地址</nobr>
|
|
219
237
|
</th>
|
|
238
|
+
<th>
|
|
239
|
+
<nobr>小区</nobr>
|
|
240
|
+
</th>
|
|
220
241
|
<th>
|
|
221
242
|
<nobr>换表类型</nobr>
|
|
222
243
|
</th>
|
|
@@ -284,7 +305,9 @@
|
|
|
284
305
|
<td style="text-align: center;">
|
|
285
306
|
<nobr>{{row.f_address}}</nobr>
|
|
286
307
|
</td>
|
|
287
|
-
|
|
308
|
+
<td style="text-align: center;">
|
|
309
|
+
<nobr>{{row.f_residential_area}}</nobr>
|
|
310
|
+
</td>
|
|
288
311
|
<td style="text-align: center;">
|
|
289
312
|
<nobr>{{row.f_type}}</nobr>
|
|
290
313
|
</td>
|
|
@@ -405,7 +428,7 @@
|
|
|
405
428
|
</div>
|
|
406
429
|
</template>
|
|
407
430
|
<script>
|
|
408
|
-
import {PagedList} from 'vue-client'
|
|
431
|
+
import {PagedList, HttpResetClass} from 'vue-client'
|
|
409
432
|
import defaultPrint from '../config/DefaultPrint'
|
|
410
433
|
import exportConfig from '../config/exportConfig'
|
|
411
434
|
|
|
@@ -418,6 +441,7 @@
|
|
|
418
441
|
// self.$refs.paged.$refs.cri.search()
|
|
419
442
|
await self.$MagLoadParams.loadParam()
|
|
420
443
|
self.initParams()
|
|
444
|
+
self.getaddress()
|
|
421
445
|
// self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
|
|
422
446
|
}
|
|
423
447
|
export default {
|
|
@@ -459,6 +483,7 @@
|
|
|
459
483
|
sumsmodel: {},
|
|
460
484
|
useinstitutions: [],
|
|
461
485
|
userusenatures: [],
|
|
486
|
+
residentialArea: [],
|
|
462
487
|
changemeter_fee:[
|
|
463
488
|
{label: '全部', value: ''},
|
|
464
489
|
{label: '销售', value: '> 0'},
|
|
@@ -480,6 +505,21 @@
|
|
|
480
505
|
readySomething(this)
|
|
481
506
|
},
|
|
482
507
|
methods: {
|
|
508
|
+
// 获取小区
|
|
509
|
+
async getaddress(){
|
|
510
|
+
let HttpReset = new HttpResetClass()
|
|
511
|
+
var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
|
|
512
|
+
data: {
|
|
513
|
+
condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
|
|
514
|
+
}
|
|
515
|
+
}, {resolveMsg: null, rejectMsg: '获取小区失败!'})
|
|
516
|
+
console.log('小区',data)
|
|
517
|
+
let house = [{label: '全部', value: ''}]
|
|
518
|
+
for (let row of data.data){
|
|
519
|
+
house.push({label: row.f_residential_area, value: row.f_residential_area})
|
|
520
|
+
}
|
|
521
|
+
this.residentialArea = house
|
|
522
|
+
},
|
|
483
523
|
userUseInstitutionChange () {
|
|
484
524
|
this.userusenatures = []
|
|
485
525
|
this.$refs.paged.$refs.cri.model.f_user_usenature = ''
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
<div class="col-sm-2 form-group">
|
|
85
85
|
<label class="font_normal_body">客户名称</label>
|
|
86
86
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
87
|
-
condition="f_user_name
|
|
87
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
88
88
|
</div>
|
|
89
89
|
|
|
90
90
|
<!--<div class="col-sm-2 form-group">-->
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
<div class="col-sm-2 form-group">
|
|
57
57
|
<label class="font_normal_body">客户名称</label>
|
|
58
58
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
59
|
-
condition="f_user_name
|
|
59
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
60
60
|
</div>
|
|
61
61
|
<div class="col-sm-2 form-group">
|
|
62
62
|
<label class="font_normal_body">客户地址</label>
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
<div class="col-sm-2 form-group">
|
|
82
82
|
<label class="font_normal_body">客户名称</label>
|
|
83
83
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
84
|
-
condition="f_user_name
|
|
84
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
85
85
|
</div>
|
|
86
86
|
<div class="col-sm-2 form-group">
|
|
87
87
|
<label class="font_normal_body" title="旧客户编号">档案编号</label>
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
<div class="col-sm-2 form-group">
|
|
60
60
|
<label class="font_normal_body">客户名称</label>
|
|
61
61
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
62
|
-
condition="f_user_name
|
|
62
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
63
63
|
</div>
|
|
64
64
|
|
|
65
65
|
<div class="col-sm-2 form-group">
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<div class="col-sm-2 form-group">
|
|
16
16
|
<label class="font_normal_body">客户名称</label>
|
|
17
17
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
18
|
-
condition="f_user_name
|
|
18
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
19
19
|
</div>
|
|
20
20
|
<div class="col-sm-2 form-group">
|
|
21
21
|
<label class="font_normal_body">客户电话</label>
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
<div class="col-sm-2 form-group">
|
|
58
58
|
<label class="font_normal_body">客户名称</label>
|
|
59
59
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
60
|
-
condition="f_user_name
|
|
60
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
61
61
|
</div>
|
|
62
62
|
<div class="col-sm-2 form-group">
|
|
63
63
|
<label class="font_normal_body">客户地址</label>
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<div class="col-sm-2 form-group" >
|
|
16
16
|
<label class="font_normal_body">客户名称</label>
|
|
17
17
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
|
|
18
|
-
condition="f_user_name
|
|
18
|
+
condition="f_user_name like '%{}%'" placeholder="客户名称">
|
|
19
19
|
</div>
|
|
20
20
|
<div class="col-sm-2 form-group" >
|
|
21
21
|
<label class="font_normal_body">客户状态</label>
|
|
@@ -510,7 +510,7 @@
|
|
|
510
510
|
</div>
|
|
511
511
|
<modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
|
|
512
512
|
<article slot="modal-body">
|
|
513
|
-
<upload :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
|
|
513
|
+
<upload :blodid="selected.f_userinfo_id" :businessid="selected.id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
|
|
514
514
|
</article>
|
|
515
515
|
<footer slot="modal-footer" class="modal-footer">
|
|
516
516
|
</footer>
|
package/src/main.js
CHANGED
|
@@ -6,7 +6,7 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/tongchuan/sale'
|
|
10
10
|
import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
|
|
11
11
|
import webmeterManage from './webmeterManage'
|
|
12
12
|
import reportManage from './reportManage'
|