manage-client 4.1.86 → 4.1.87-ycls
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 +67 -44
- package/package.json +1 -1
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +6 -0
- package/src/components/sale/config/exportConfig.js +1 -0
- package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue +4 -4
- package/src/filiale/tongchuan/ChargeQuery.vue +45 -12
- package/src/filiale/tongchuan/HandplanQuery.vue +43 -11
- package/src/filiale/tongchuan/ResSelectUserGroup.vue +384 -0
- package/src/filiale/tongchuan/config/exportConfig.js +2 -2
- package/src/filiale/jinbin/exportConfig.js +0 -1110
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
- package/src/filiale/jinbin/sale.js +0 -7
package/build/dev-server.js
CHANGED
|
@@ -6,99 +6,122 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = '
|
|
10
|
-
const local = '
|
|
9
|
+
const server = 'https://yc.aofengcloud.com:31467/'
|
|
10
|
+
const local = 'https://yc.aofengcloud.com:31467/'
|
|
11
11
|
const proxyTable = {
|
|
12
12
|
'/rs/logic/exportfile': {
|
|
13
|
-
target: server
|
|
13
|
+
target: server,
|
|
14
|
+
secure: false
|
|
14
15
|
},
|
|
15
16
|
'/dataManage': {
|
|
16
|
-
target: server
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
17
|
+
target: server,
|
|
18
|
+
secure: false
|
|
19
|
+
},
|
|
20
|
+
// '/api/af-revenue/sql/': {
|
|
21
|
+
// pathRewrite: {
|
|
22
|
+
// '^/api/af-revenue': '/'
|
|
23
|
+
// },
|
|
24
|
+
// target: local
|
|
25
|
+
// },
|
|
26
|
+
// '/api/af-revenue/report/': {
|
|
27
|
+
// pathRewrite: {
|
|
28
|
+
// '^/api/af-revenue': '/'
|
|
29
|
+
// },
|
|
30
|
+
// target: local
|
|
31
|
+
// },
|
|
32
|
+
// '/api/af-revenue/logic': {
|
|
33
|
+
// pathRewrite: {
|
|
34
|
+
// '^/api/af-revenue': '/'
|
|
35
|
+
// },
|
|
36
|
+
// target: local
|
|
37
|
+
// },
|
|
36
38
|
'/api': {
|
|
37
|
-
target: server
|
|
39
|
+
target: server,
|
|
40
|
+
secure: false
|
|
38
41
|
},
|
|
39
42
|
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
40
|
-
target: server
|
|
43
|
+
target: server,
|
|
44
|
+
secure: false
|
|
41
45
|
},
|
|
42
46
|
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
43
|
-
target: server
|
|
47
|
+
target: server,
|
|
48
|
+
secure: false
|
|
44
49
|
},
|
|
45
50
|
'/files': {
|
|
46
|
-
target: server
|
|
51
|
+
target: server,
|
|
52
|
+
secure: false
|
|
47
53
|
},
|
|
48
54
|
// 查找资源服务数据
|
|
49
55
|
'/rs/search': {
|
|
50
|
-
target: server
|
|
56
|
+
target: server,
|
|
57
|
+
secure: false
|
|
51
58
|
},
|
|
52
59
|
// 查找资源服务数据
|
|
53
60
|
'/rs/logic/getLogin': {
|
|
54
|
-
target: server
|
|
61
|
+
target: server,
|
|
62
|
+
secure: false
|
|
55
63
|
},
|
|
56
64
|
// 查找资源服务数据
|
|
57
65
|
'/rs/logic/getInitData': {
|
|
58
|
-
target: server
|
|
66
|
+
target: server,
|
|
67
|
+
secure: false
|
|
59
68
|
},
|
|
60
69
|
'/rs/logic/getSaleInitData': {
|
|
61
|
-
target: server
|
|
70
|
+
target: server,
|
|
71
|
+
secure: false
|
|
62
72
|
},
|
|
63
73
|
// 用户登录服务地址
|
|
64
74
|
'/rs/user': {
|
|
65
|
-
target: server
|
|
75
|
+
target: server,
|
|
76
|
+
secure: false
|
|
66
77
|
},
|
|
67
78
|
'/rs/path/getParams': {
|
|
68
|
-
target: server
|
|
79
|
+
target: server,
|
|
80
|
+
secure: false
|
|
69
81
|
},
|
|
70
82
|
'/rs/data': {
|
|
71
|
-
target: server
|
|
83
|
+
target: server,
|
|
84
|
+
secure: false
|
|
72
85
|
},
|
|
73
86
|
'/rs/license': {
|
|
74
|
-
target: server
|
|
87
|
+
target: server,
|
|
88
|
+
secure: false
|
|
75
89
|
},
|
|
76
90
|
'/rs/db': {
|
|
77
|
-
target: server
|
|
91
|
+
target: server,
|
|
92
|
+
secure: false
|
|
78
93
|
},
|
|
79
94
|
'/excel': {
|
|
80
|
-
target: server
|
|
95
|
+
target: server,
|
|
96
|
+
secure: false
|
|
81
97
|
},
|
|
82
98
|
'/rs/config': {
|
|
83
|
-
target: server
|
|
99
|
+
target: server,
|
|
100
|
+
secure: false
|
|
84
101
|
},
|
|
85
102
|
'/rs/sql/getLicenseById': {
|
|
86
|
-
target: server
|
|
103
|
+
target: server,
|
|
104
|
+
secure: false
|
|
87
105
|
},
|
|
88
106
|
'/rs/report': {
|
|
89
|
-
target: server
|
|
107
|
+
target: server,
|
|
108
|
+
secure: false
|
|
90
109
|
},
|
|
91
110
|
'/rs/vue': {
|
|
92
|
-
target: server
|
|
111
|
+
target: server,
|
|
112
|
+
secure: false
|
|
93
113
|
},
|
|
94
114
|
'/rs/file': {
|
|
95
|
-
target: server
|
|
115
|
+
target: server,
|
|
116
|
+
secure: false
|
|
96
117
|
},
|
|
97
118
|
'/rs/sql/singleTable': {
|
|
98
|
-
target: server
|
|
119
|
+
target: server,
|
|
120
|
+
secure: false
|
|
99
121
|
},
|
|
100
122
|
'/rs': {
|
|
101
|
-
target: server
|
|
123
|
+
target: server,
|
|
124
|
+
secure: false
|
|
102
125
|
}
|
|
103
126
|
}
|
|
104
127
|
|
package/package.json
CHANGED
|
@@ -195,6 +195,9 @@
|
|
|
195
195
|
<data-order field="f_userinfo_code" name="客户编号"
|
|
196
196
|
:order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
197
197
|
</th>
|
|
198
|
+
<th>
|
|
199
|
+
<nobr>换表编号</nobr>
|
|
200
|
+
</th>
|
|
198
201
|
<th>
|
|
199
202
|
<nobr>客户名称</nobr>
|
|
200
203
|
</th>
|
|
@@ -287,6 +290,9 @@
|
|
|
287
290
|
<td style="text-align: center;"><nobr>
|
|
288
291
|
<span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
|
|
289
292
|
</nobr> </td>
|
|
293
|
+
<td style="text-align: center;">
|
|
294
|
+
<nobr>{{row.id}}</nobr>
|
|
295
|
+
</td>
|
|
290
296
|
<td style="text-align: center;">
|
|
291
297
|
<nobr>{{row.f_user_name}}</nobr>
|
|
292
298
|
</td>
|
|
@@ -469,9 +469,9 @@
|
|
|
469
469
|
let load = new HttpResetClass()
|
|
470
470
|
load.load('POST', 'api/af-revenue/sql/singleTableParam', {
|
|
471
471
|
data: {
|
|
472
|
-
items:'
|
|
472
|
+
items:'name',
|
|
473
473
|
tablename:'t_paramvalue',
|
|
474
|
-
condition:'processid in (select id from t_parameter where
|
|
474
|
+
condition:'processid in (select id from t_parameter where name='+ `'${this.$refs.paged.$refs.cri.model.f_error_level[0]}'` + ')'
|
|
475
475
|
}
|
|
476
476
|
},{warnMsg:null,resolveMsg:null}).then((res) => {
|
|
477
477
|
let i = 0
|
|
@@ -481,8 +481,8 @@
|
|
|
481
481
|
console.log("rows========",rows)
|
|
482
482
|
for (i = 0; i < rows.length; i++) {
|
|
483
483
|
let dr = {label: '全部', value: ''}
|
|
484
|
-
dr.label=rows[i].
|
|
485
|
-
dr.value=rows[i].
|
|
484
|
+
dr.label=rows[i].name
|
|
485
|
+
dr.value=rows[i].name
|
|
486
486
|
array1.push(dr)
|
|
487
487
|
console.log("rows[i]========",rows[i],dr)
|
|
488
488
|
}
|
|
@@ -60,7 +60,14 @@
|
|
|
60
60
|
</div>
|
|
61
61
|
</div>
|
|
62
62
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
63
|
-
<res-select-
|
|
63
|
+
<res-select-user-group
|
|
64
|
+
:operator-initres="$parent.$parent.initres"
|
|
65
|
+
:user-initres="$parent.$parent.userInitres"
|
|
66
|
+
:show-component="['company','department','operator','slicearea','user_company','user_department']"
|
|
67
|
+
@re-res="$parent.$parent.getRes"
|
|
68
|
+
@re-us-res="$parent.$parent.getUserRes"
|
|
69
|
+
v-ref:usersel>
|
|
70
|
+
</res-select-user-group>
|
|
64
71
|
<div class="col-sm-2 form-group">
|
|
65
72
|
<label class="font_normal_body">收费编号</label>
|
|
66
73
|
<input type="text" style="width:60%" class="input_search" v-model="model.id"
|
|
@@ -480,13 +487,19 @@
|
|
|
480
487
|
<nobr>补打次数</nobr>
|
|
481
488
|
</th>
|
|
482
489
|
<th>
|
|
483
|
-
<nobr
|
|
490
|
+
<nobr>操作员人员</nobr>
|
|
484
491
|
</th>
|
|
485
492
|
<th>
|
|
486
|
-
<nobr
|
|
493
|
+
<nobr>操作员部门</nobr>
|
|
487
494
|
</th>
|
|
488
495
|
<th>
|
|
489
|
-
<nobr
|
|
496
|
+
<nobr>操作员公司</nobr>
|
|
497
|
+
</th>
|
|
498
|
+
<th>
|
|
499
|
+
<nobr>用户公司</nobr>
|
|
500
|
+
</th>
|
|
501
|
+
<th>
|
|
502
|
+
<nobr>用户部门</nobr>
|
|
490
503
|
</th>
|
|
491
504
|
<th>
|
|
492
505
|
<nobr>流水号</nobr>
|
|
@@ -679,6 +692,12 @@
|
|
|
679
692
|
<td style="text-align: center;">
|
|
680
693
|
<nobr>{{row.f_orgname}}</nobr>
|
|
681
694
|
</td>
|
|
695
|
+
<td style="text-align: center;">
|
|
696
|
+
<nobr>{{row.f_us_orgname}}</nobr>
|
|
697
|
+
</td>
|
|
698
|
+
<td style="text-align: center;">
|
|
699
|
+
<nobr>{{row.f_us_depname}}</nobr>
|
|
700
|
+
</td>
|
|
682
701
|
<td style="text-align: center;">
|
|
683
702
|
<nobr>{{row.f_serial_id}}</nobr>
|
|
684
703
|
</td>
|
|
@@ -834,6 +853,7 @@
|
|
|
834
853
|
<script>
|
|
835
854
|
import {HttpResetClass, PagedList} from 'vue-client'
|
|
836
855
|
import exportConfig from './config/exportConfig'
|
|
856
|
+
import ResSelectUserGroup from './ResSelectUserGroup.vue'
|
|
837
857
|
let cardBtnGen = async function (self, val) {
|
|
838
858
|
self.cardInfo = val.data
|
|
839
859
|
|
|
@@ -870,6 +890,9 @@
|
|
|
870
890
|
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
|
|
871
891
|
}
|
|
872
892
|
export default {
|
|
893
|
+
components: {
|
|
894
|
+
'res-select-user-group': ResSelectUserGroup
|
|
895
|
+
},
|
|
873
896
|
props:['data'],
|
|
874
897
|
title: '收费查询',
|
|
875
898
|
data() {
|
|
@@ -917,6 +940,11 @@
|
|
|
917
940
|
dep:[],
|
|
918
941
|
user:[]
|
|
919
942
|
},
|
|
943
|
+
userInitres: {
|
|
944
|
+
org: [],
|
|
945
|
+
dep: [],
|
|
946
|
+
user: []
|
|
947
|
+
},
|
|
920
948
|
operatornames: [],
|
|
921
949
|
model: new PagedList('api/af-revenue/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
|
|
922
950
|
f_pregas: 0,
|
|
@@ -935,6 +963,7 @@
|
|
|
935
963
|
}),
|
|
936
964
|
criteriaShow: false,
|
|
937
965
|
orgCondtionStr: '',
|
|
966
|
+
userOrgConditionStr: '',
|
|
938
967
|
// 下拉框
|
|
939
968
|
meterbrands: [],
|
|
940
969
|
pricenames: [],
|
|
@@ -1004,7 +1033,7 @@
|
|
|
1004
1033
|
f_serial_number: this.f_serial_number,
|
|
1005
1034
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
1006
1035
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
1007
|
-
condition: `${this.$refs.paged.$refs.cri.condition}
|
|
1036
|
+
condition: `${this.$refs.paged.$refs.cri.condition}${this.orgCondtionStr}${this.userOrgConditionStr}`,
|
|
1008
1037
|
orderitem: this.orderitem ? `${this.orderitem}` : " f_operate_date desc"
|
|
1009
1038
|
}
|
|
1010
1039
|
let http = new HttpResetClass()
|
|
@@ -1242,13 +1271,13 @@
|
|
|
1242
1271
|
}
|
|
1243
1272
|
|
|
1244
1273
|
let f_orgstr = this.orgCondtionStr
|
|
1245
|
-
args.condition = `${args.condition} ` + f_orgstr
|
|
1246
1274
|
if(this.card!=''){
|
|
1247
1275
|
args.condition+=` and f_card_id='${this.card}'`
|
|
1248
1276
|
}
|
|
1249
1277
|
if(this.IdCardInfo!=''){
|
|
1250
1278
|
args.condition +=` and f_idnumber='${this.IdCardInfo}'`
|
|
1251
1279
|
}
|
|
1280
|
+
args.condition = `${args.condition} ${f_orgstr} ${this.userOrgConditionStr}`
|
|
1252
1281
|
this.model.search(args.condition, args.model)
|
|
1253
1282
|
let condition1 = this.operatornames.length && this.operatornames[0] === this.$login.f.id
|
|
1254
1283
|
let condition2 = this.$refs.paged.$refs.cri.model.f_payment.length && this.$refs.paged.$refs.cri.model.f_payment[0].indexOf('现金') > -1
|
|
@@ -1259,12 +1288,16 @@
|
|
|
1259
1288
|
this.card=''
|
|
1260
1289
|
this.IdCardInfo=''
|
|
1261
1290
|
},
|
|
1291
|
+
getUserRes (condition) {
|
|
1292
|
+
this.userOrgConditionStr = condition
|
|
1293
|
+
},
|
|
1262
1294
|
clear() {
|
|
1263
|
-
|
|
1264
|
-
this.$refs.paged.$refs.cri.$refs.
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
this
|
|
1295
|
+
// 清空操作员/用户的组织选择
|
|
1296
|
+
if (this.$refs.paged.$refs.cri.$refs.usersel && this.$refs.paged.$refs.cri.$refs.usersel.resetAll) {
|
|
1297
|
+
this.$refs.paged.$refs.cri.$refs.usersel.resetAll()
|
|
1298
|
+
}
|
|
1299
|
+
this.orgCondtionStr = ''
|
|
1300
|
+
this.userOrgConditionStr = ''
|
|
1268
1301
|
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
1269
1302
|
this.$refs.paged.$refs.cri.model[key] = []
|
|
1270
1303
|
})
|
|
@@ -1435,7 +1468,7 @@
|
|
|
1435
1468
|
return {
|
|
1436
1469
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
1437
1470
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
1438
|
-
condition: `${this.$refs.paged.$refs.cri.condition}
|
|
1471
|
+
condition: `${this.$refs.paged.$refs.cri.condition}${this.orgCondtionStr}${this.userOrgConditionStr}`,
|
|
1439
1472
|
orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
|
|
1440
1473
|
}
|
|
1441
1474
|
},
|
|
@@ -60,7 +60,14 @@
|
|
|
60
60
|
</div>
|
|
61
61
|
</div>
|
|
62
62
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
63
|
-
<res-select-
|
|
63
|
+
<res-select-user-group
|
|
64
|
+
:operator-initres="$parent.$parent.initres"
|
|
65
|
+
:user-initres="$parent.$parent.userInitres"
|
|
66
|
+
:show-component="['company','department','operator','user_company','user_department']"
|
|
67
|
+
@re-res="$parent.$parent.getRes"
|
|
68
|
+
@re-us-res="$parent.$parent.getUserRes"
|
|
69
|
+
v-ref:usersel>
|
|
70
|
+
</res-select-user-group>
|
|
64
71
|
|
|
65
72
|
|
|
66
73
|
<div class="col-sm-2 form-group">
|
|
@@ -433,13 +440,19 @@
|
|
|
433
440
|
<nobr>状态</nobr>
|
|
434
441
|
</th>
|
|
435
442
|
<th>
|
|
436
|
-
<nobr
|
|
443
|
+
<nobr>操作员人员</nobr>
|
|
437
444
|
</th>
|
|
438
445
|
<th>
|
|
439
|
-
<nobr
|
|
446
|
+
<nobr>操作员部门</nobr>
|
|
440
447
|
</th>
|
|
441
448
|
<th>
|
|
442
|
-
<nobr
|
|
449
|
+
<nobr>操作员公司</nobr>
|
|
450
|
+
</th>
|
|
451
|
+
<th>
|
|
452
|
+
<nobr>用户公司</nobr>
|
|
453
|
+
</th>
|
|
454
|
+
<th>
|
|
455
|
+
<nobr>用户部门</nobr>
|
|
443
456
|
</th>
|
|
444
457
|
<th><nobr>附件</nobr></th>
|
|
445
458
|
</tr>
|
|
@@ -586,6 +599,12 @@
|
|
|
586
599
|
<td style="text-align: center;">
|
|
587
600
|
<nobr>{{row.f_orgname}}</nobr>
|
|
588
601
|
</td>
|
|
602
|
+
<td style="text-align: center;">
|
|
603
|
+
<nobr>{{row.f_us_orgname}}</nobr>
|
|
604
|
+
</td>
|
|
605
|
+
<td style="text-align: center;">
|
|
606
|
+
<nobr>{{row.f_us_depname}}</nobr>
|
|
607
|
+
</td>
|
|
589
608
|
<td style="text-align: center;"><nobr>
|
|
590
609
|
<button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
|
|
591
610
|
<button v-if="row.f_notified_path" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.imgShow(row.f_notified_path)">图像识别</button>
|
|
@@ -699,6 +718,7 @@
|
|
|
699
718
|
import defaultPrint from './config/DefaultPrint'
|
|
700
719
|
import exportConfig from './config/exportConfig'
|
|
701
720
|
import axios from 'axios'
|
|
721
|
+
import ResSelectUserGroup from './ResSelectUserGroup.vue'
|
|
702
722
|
|
|
703
723
|
let readySomething = async function (self) {
|
|
704
724
|
//加载抄表册
|
|
@@ -721,6 +741,9 @@
|
|
|
721
741
|
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
|
|
722
742
|
}
|
|
723
743
|
export default {
|
|
744
|
+
components: {
|
|
745
|
+
'res-select-user-group': ResSelectUserGroup
|
|
746
|
+
},
|
|
724
747
|
props:['data'],
|
|
725
748
|
title: '机表抄表查询',
|
|
726
749
|
data() {
|
|
@@ -750,11 +773,17 @@
|
|
|
750
773
|
dep:[],
|
|
751
774
|
user:[],
|
|
752
775
|
},
|
|
776
|
+
userInitres: {
|
|
777
|
+
org: [],
|
|
778
|
+
dep: [],
|
|
779
|
+
user: []
|
|
780
|
+
},
|
|
753
781
|
show:false,
|
|
754
782
|
rowdata:{},
|
|
755
783
|
criteriaShow: false,
|
|
756
784
|
residentialArea: [],
|
|
757
785
|
orgCondtionStr: '',
|
|
786
|
+
userOrgConditionStr: '',
|
|
758
787
|
modelval: [],
|
|
759
788
|
gasproperties:[],
|
|
760
789
|
inputtouPerson: [],
|
|
@@ -1055,16 +1084,16 @@
|
|
|
1055
1084
|
args.condition += ` and f_inputtor in ( ${str} )`
|
|
1056
1085
|
}
|
|
1057
1086
|
|
|
1058
|
-
args.condition = `${args.condition} ` + this.orgCondtionStr
|
|
1087
|
+
args.condition = `${args.condition} ` + this.orgCondtionStr + this.userOrgConditionStr
|
|
1059
1088
|
this.model.search(args.condition, args.model)
|
|
1060
1089
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
1061
1090
|
},
|
|
1062
1091
|
clear() {
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
this
|
|
1067
|
-
this
|
|
1092
|
+
if (this.$refs.paged.$refs.cri.$refs.usersel && this.$refs.paged.$refs.cri.$refs.usersel.resetAll) {
|
|
1093
|
+
this.$refs.paged.$refs.cri.$refs.usersel.resetAll()
|
|
1094
|
+
}
|
|
1095
|
+
this.orgCondtionStr = ''
|
|
1096
|
+
this.userOrgConditionStr = ''
|
|
1068
1097
|
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
1069
1098
|
this.$refs.paged.$refs.cri.model[key] = []
|
|
1070
1099
|
})
|
|
@@ -1080,6 +1109,9 @@
|
|
|
1080
1109
|
this.orgCondtionStr = condition
|
|
1081
1110
|
|
|
1082
1111
|
},
|
|
1112
|
+
getUserRes (condition) {
|
|
1113
|
+
this.userOrgConditionStr = condition
|
|
1114
|
+
},
|
|
1083
1115
|
stamp() {
|
|
1084
1116
|
this.all = false
|
|
1085
1117
|
//默认选择要打印的列
|
|
@@ -1199,7 +1231,7 @@
|
|
|
1199
1231
|
return {
|
|
1200
1232
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
1201
1233
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
1202
|
-
|
|
1234
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr + this.userOrgConditionStr}
|
|
1203
1235
|
},
|
|
1204
1236
|
getfield() {
|
|
1205
1237
|
return exportConfig.handplanConfig
|