manage-client 3.2.104 → 3.2.107

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.
Files changed (41) hide show
  1. package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
  2. package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
  3. package/.gradle/{buildOutputCleanup/outputFiles.bin → 4.4/fileHashes/fileHashes.bin} +0 -0
  4. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  5. package/.gradle/buildOutputCleanup/built.bin +0 -0
  6. package/.gradle/buildOutputCleanup/cache.properties.lock +1 -0
  7. package/build/webpack.base.conf.js +1 -0
  8. package/package.json +2 -2
  9. package/src/components/daping/DataManagement.vue +34 -35
  10. package/src/components/sale/businessquery/BusinessManage.vue +12 -0
  11. package/src/components/sale/businessquery/FillCardQuery.vue +39 -2
  12. package/src/components/sale/businessquery/sellingChargePrice.vue +716 -716
  13. package/src/components/sale/config/exportConfig.js +21 -1
  14. package/src/components/sale/config/tableConfig.js +48 -48
  15. package/src/components/valueaddinfo/ValueAddinfoQuery.vue +408 -0
  16. package/src/components/valueaddinfo/renewalvalueAddUserQuery.vue +371 -0
  17. package/src/components/valueaddinfo/valueAddCountQuery.vue +315 -0
  18. package/src/components/valueaddinfo/valueAddUserQuery.vue +392 -0
  19. package/src/components/webmeter/DrillData/UserGasAll.vue +607 -607
  20. package/src/components/webmeter/WebmeterQuery.vue +64 -64
  21. package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue +28 -9
  22. package/src/components/webmeter/report/ReportList.vue +420 -420
  23. package/src/components/webmeter/reportdata/ReportDataQuery.vue +279 -279
  24. package/src/filiale/jingwei/RecordInfoQuery.vue +40 -1
  25. package/src/filiale/qianneng/BusinessManage.vue +179 -0
  26. package/src/filiale/qianneng/ChargeQuery.vue +191 -184
  27. package/src/filiale/qianneng/HandplanQuery.vue +130 -117
  28. package/src/filiale/qianneng/OtherChargeQuery.vue +33 -31
  29. package/src/filiale/qianneng/SellDepReport.vue +27 -7
  30. package/src/filiale/qianneng/UserQuery.vue +938 -0
  31. package/src/filiale/qianneng/sale.js +5 -1
  32. package/src/filiale/shaoguan/TransferQuery.vue +8 -3
  33. package/src/main.js +66 -66
  34. package/src/newmanage.js +11 -1
  35. package/src/saleManage.js +15 -1
  36. package/src/webmeterManage.js +121 -121
  37. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  38. package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
  39. package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
  40. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  41. package/build/tmp/jar/MANIFEST.MF +0 -2
@@ -1,279 +1,279 @@
1
- <template>
2
- <div id="unit" class="flex-row">
3
- <div class="basic-main" @keyup.enter="search">
4
- <div class="flex">
5
- <criteria-paged :model="model" v-ref:paged>
6
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
7
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
- <div class="row">
9
- <div class="col-sm-2 form-group">
10
- <label class="font_normal_body">客户编号</label>
11
- <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
12
- condition="f_userinfo_code = '{}' " placeholder="客户编号">
13
- </div>
14
- <div class="col-sm-2 form-group">
15
- <label class="font_normal_body">客户名称</label>
16
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
17
- condition=" f_user_name like '%{}%'" placeholder='客户名称'>
18
- </div>
19
- <!-- <div class="col-sm-2">-->
20
- <!-- <label class="font_normal_body">组织机构</label>-->
21
- <!-- <res-select :initresid="$parent.$parent.org"-->
22
- <!-- style="width:60%"-->
23
- <!-- @res-select="$parent.$parent.getorg"-->
24
- <!-- restype='organization'>-->
25
- <!-- </res-select>-->
26
-
27
- <!-- </div>-->
28
- <div class="col-sm-2">
29
- <label class="font_normal_body">&emsp;公司&emsp;</label>
30
- <right-tree @re-res="$parent.$parent.getorg"
31
- :initresid='$parent.$parent.org'></right-tree>
32
- </div>
33
- <div class="span" style="float:right;">
34
- <button class="button_search button_spacing" @click="search()">查询</button>
35
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
36
- <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
37
- :field="$parent.$parent.getfield" :header="$parent.$parent.other"
38
- sqlurl="rs/logic/exportfile" sql-name="manage_getReportDataQuery" template-name='结算查询导出'
39
- :choose-col="true"></export-excel>
40
- <div style="float: right" class="button_spacing"
41
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
42
- @click="$parent.$parent.hidden()"></div>
43
- </div>
44
-
45
- </div>
46
-
47
- <div class="row" v-show="$parent.$parent.criteriaShow">
48
- <div class="col-sm-2 form-group">
49
- <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
50
- <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
51
- condition="f_meternumber like '%{}%'" placeholder='表号'>
52
- </div>
53
- <div class="col-sm-2 form-group">
54
- <label class="font_normal_body">气表品牌</label>
55
- <v-select
56
- placeholder='气表品牌'
57
- :value.sync="model.f_meter_brand"
58
- v-model="model.f_meter_brand"
59
- :options='$parent.$parent.meterbrands'
60
- close-on-select
61
- condition="f_meter_brand='{}'">
62
- </v-select>
63
- </div>
64
- <div class="col-sm-2 form-group" >
65
- <label class="font_normal_body">气表型号</label>
66
- <v-select
67
- placeholder='气表型号'
68
- :value.sync="model.f_meter_style"
69
- v-model="model.f_meter_style"
70
- :options='$parent.$parent.metertypes'
71
- close-on-select
72
- condition="f_meter_style='{}'">
73
- </v-select>
74
- </div>
75
- <div class="col-sm-2 form-group">
76
- <label for="startDate" class="font_normal_body">插入时间</label>
77
- <datepicker id="startDate" placeholder="插入时间" style="width:60%"
78
- v-model="model.startDate"
79
- :value.sync="model.startDate"
80
- :format="'yyyy-MM-dd 00:00:00'"
81
- :show-reset-button="true"
82
- condition="f_insert_date >= '{}'">
83
- </datepicker>
84
- </div>
85
- <div class="col-sm-2 form-group">
86
- <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
87
- <datepicker id="endDate" placeholder="插入时间" style="width:60%"
88
- v-model="model.endDate"
89
- :value.sync="model.endDate"
90
- :format="'yyyy-MM-dd 23:59:59'"
91
- :show-reset-button="true"
92
- condition="f_insert_date <= '{}'">
93
- </datepicker>
94
- </div>
95
- </div>
96
-
97
- </div>
98
- </criteria>
99
-
100
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
101
- <template partial='head'>
102
- <tr>
103
- <th v-for="row in $parent.$parent.$parent.headData">
104
- <nobr>{{row}}</nobr>
105
- </th>
106
- </tr>
107
- </template>
108
- <template partial='body'>
109
- <tr v-for="row in $parent.$parent.$parent.model.rows">
110
- <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
111
- <nobr v-if="item == 'f_lowlithiumbattery'">{{row[item] == 1 ? '是' : '否'}}</nobr>
112
- <nobr v-if="item == 'f_magneticinterference'">{{row[item] == 1 ? '异常' : '正常'}}</nobr>
113
- <nobr v-if="item != 'f_magneticinterference' && item != 'f_lowlithiumbattery'">{{row[item]}}</nobr>
114
- </td>
115
- </tr>
116
- </template>
117
- <template partial='foot'></template>
118
- </data-grid>
119
- </criteria-paged>
120
- </div>
121
- </div>
122
- </div>
123
- </template>
124
-
125
- <script>
126
- import {HttpResetClass, PagedList} from 'vue-client'
127
- import tableConfig from './../../sale/config/tableConfig'
128
- import exportConfig from '../../sale/config/exportConfig'
129
- import plugins from '../../../plugins/GetLoginInfoService'
130
- import plugin from 'system-clients/src/plugins/GetLoginInfoService'
131
-
132
- let readySomething = async function (self) {
133
- await self.$MagLoadParams.loadParam()
134
- self.initParams()
135
- // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
136
- }
137
- export default {
138
- title: '上报数据查询',
139
- data() {
140
- return {
141
- other:[],
142
- footer:[],
143
- model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
144
- criteriaShow: false,
145
- config: {
146
- fieldMapping: {
147
- f_userinfo_code: '客户编号',
148
- f_user_name: '客户名称'
149
- }
150
- },
151
- WarningType: [
152
- {label: '全部', value: ''}
153
- ],
154
- Warningstyles: [
155
- {label: '全部', value: ''}
156
- ],
157
- styles:false,
158
- headData: [],
159
- bodyData: [],
160
- orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
161
- resshow:['company'],
162
- org:[this.$login.f.orgid],
163
- meterbrands:[]
164
- }
165
- },
166
- created () {
167
- this.config.fieldMapping=tableConfig.ReportDataQuery
168
- console.log("========================")
169
- console.log(this.config.fieldMapping)
170
- var item="用户编号"
171
- console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
172
- console.log(this.config.fieldMapping[item])
173
- this.headData=Object.keys(this.config.fieldMapping)
174
- // for(var i=0;i<this.config.fieldMapping;i++){
175
- // this.headData.push(this.config.fieldMapping[i])
176
- // }
177
-
178
- },
179
- ready() {
180
- this.$refs.paged.$refs.cri.search()
181
- readySomething(this).then(() => {
182
- this.$emit('ready')
183
- }).catch((error) => {
184
- this.$emit('error', error)
185
- })
186
- },
187
- methods: {
188
- initParams() {
189
- // 初始化气表品牌
190
- let brandArr = []
191
- this.$MagGetSaleParam.getGasbrand().forEach((item) => {
192
- let temp = {}
193
- temp.label = item.label
194
- temp.value = item.value.f_meter_brand
195
- brandArr.push(temp)
196
- })
197
- this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
198
- //初始化气表价格
199
- this.prices = this.$MagGetSaleParam.getPrices();
200
- },
201
- showMeterStyle() {
202
- this.styles = true
203
- },
204
- search() {
205
- this.$refs.paged.$refs.cri.search()
206
- },
207
- async selfSearch(args) {
208
- args.condition = `${args.condition}` + this.orgCondtionStr
209
- await this.model.search(args.condition, args.model)
210
- // 查询到数据进行处理
211
- // if (this.model.rows.length > 0) {
212
- // this.bodyData = Object.keys(this.model.rows[0])
213
- // }
214
- },
215
- getorg(obj) {
216
- if (obj.resids.length>0) {
217
- this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
218
- }else
219
- {
220
- this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
221
- }
222
- },
223
- // getorg(obj) {
224
- // // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
225
- // // this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
226
- // // }else{
227
- // // this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
228
- // // }
229
- // // this.orgname = obj.res
230
- // },
231
- clear() {
232
- //清空部门和人员
233
- this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
234
- this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
235
- //部门和人员变为全选
236
- this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
237
- this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
238
- Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
239
- this.$refs.paged.$refs.cri.model[key] = []
240
- })
241
- },
242
- hidden() {
243
- this.criteriaShow = !this.criteriaShow
244
- },
245
-
246
- // getRes(obj) {
247
- // this.orgCondtionStr = obj
248
- // }
249
- getotherfooter () {
250
- // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
251
- // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
252
- this.other = [];
253
- this.footer = [];
254
- let otherInData = [];
255
- otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
256
- let footerData = []
257
- this.footer.push(footerData);
258
- this.other.push(otherInData);
259
- }
260
- },
261
- watch: {
262
- },
263
- computed: {
264
- metertypes() {
265
- return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
266
- },
267
- getCondition() {
268
- return {
269
- startDate: this.$refs.paged.$refs.cri.model.startDate,
270
- endDate: this.$refs.paged.$refs.cri.model.endDate,
271
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
272
- }
273
- },
274
- getfield() {
275
- return exportConfig.ReportDataConfig
276
- }
277
- }
278
- }
279
- </script>
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main" @keyup.enter="search">
4
+ <div class="flex">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group">
10
+ <label class="font_normal_body">客户编号</label>
11
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
12
+ condition="f_userinfo_code = '{}' " placeholder="客户编号">
13
+ </div>
14
+ <div class="col-sm-2 form-group">
15
+ <label class="font_normal_body">客户名称</label>
16
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
17
+ condition=" f_user_name like '%{}%'" placeholder='客户名称'>
18
+ </div>
19
+ <!-- <div class="col-sm-2">-->
20
+ <!-- <label class="font_normal_body">组织机构</label>-->
21
+ <!-- <res-select :initresid="$parent.$parent.org"-->
22
+ <!-- style="width:60%"-->
23
+ <!-- @res-select="$parent.$parent.getorg"-->
24
+ <!-- restype='organization'>-->
25
+ <!-- </res-select>-->
26
+
27
+ <!-- </div>-->
28
+ <div class="col-sm-2">
29
+ <label class="font_normal_body">&emsp;公司&emsp;</label>
30
+ <right-tree @re-res="$parent.$parent.getorg"
31
+ :initresid='$parent.$parent.org'></right-tree>
32
+ </div>
33
+ <div class="span" style="float:right;">
34
+ <button class="button_search button_spacing" @click="search()">查询</button>
35
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
36
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
37
+ :field="$parent.$parent.getfield" :header="$parent.$parent.other"
38
+ sqlurl="rs/logic/exportfile" sql-name="manage_getReportDataQuery" template-name='结算查询导出'
39
+ :choose-col="true"></export-excel>
40
+ <div style="float: right" class="button_spacing"
41
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
42
+ @click="$parent.$parent.hidden()"></div>
43
+ </div>
44
+
45
+ </div>
46
+
47
+ <div class="row" v-show="$parent.$parent.criteriaShow">
48
+ <div class="col-sm-2 form-group">
49
+ <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
50
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
51
+ condition="f_meternumber like '%{}%'" placeholder='表号'>
52
+ </div>
53
+ <div class="col-sm-2 form-group">
54
+ <label class="font_normal_body">气表品牌</label>
55
+ <v-select
56
+ placeholder='气表品牌'
57
+ :value.sync="model.f_meter_brand"
58
+ v-model="model.f_meter_brand"
59
+ :options='$parent.$parent.meterbrands'
60
+ close-on-select
61
+ condition="f_meter_brand='{}'">
62
+ </v-select>
63
+ </div>
64
+ <div class="col-sm-2 form-group" >
65
+ <label class="font_normal_body">气表型号</label>
66
+ <v-select
67
+ placeholder='气表型号'
68
+ :value.sync="model.f_meter_style"
69
+ v-model="model.f_meter_style"
70
+ :options='$parent.$parent.metertypes'
71
+ close-on-select
72
+ condition="f_meter_style='{}'">
73
+ </v-select>
74
+ </div>
75
+ <div class="col-sm-2 form-group">
76
+ <label for="startDate" class="font_normal_body">插入时间</label>
77
+ <datepicker id="startDate" placeholder="插入时间" style="width:60%"
78
+ v-model="model.startDate"
79
+ :value.sync="model.startDate"
80
+ :format="'yyyy-MM-dd 00:00:00'"
81
+ :show-reset-button="true"
82
+ condition="f_insert_date >= '{}'">
83
+ </datepicker>
84
+ </div>
85
+ <div class="col-sm-2 form-group">
86
+ <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
87
+ <datepicker id="endDate" placeholder="插入时间" style="width:60%"
88
+ v-model="model.endDate"
89
+ :value.sync="model.endDate"
90
+ :format="'yyyy-MM-dd 23:59:59'"
91
+ :show-reset-button="true"
92
+ condition="f_insert_date <= '{}'">
93
+ </datepicker>
94
+ </div>
95
+ </div>
96
+
97
+ </div>
98
+ </criteria>
99
+
100
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
101
+ <template partial='head'>
102
+ <tr>
103
+ <th v-for="row in $parent.$parent.$parent.headData">
104
+ <nobr>{{row}}</nobr>
105
+ </th>
106
+ </tr>
107
+ </template>
108
+ <template partial='body'>
109
+ <tr v-for="row in $parent.$parent.$parent.model.rows">
110
+ <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
111
+ <nobr v-if="item == 'f_lowlithiumbattery'">{{row[item] == 1 ? '是' : '否'}}</nobr>
112
+ <nobr v-if="item == 'f_magneticinterference'">{{row[item] == 1 ? '异常' : '正常'}}</nobr>
113
+ <nobr v-if="item != 'f_magneticinterference' && item != 'f_lowlithiumbattery'">{{row[item]}}</nobr>
114
+ </td>
115
+ </tr>
116
+ </template>
117
+ <template partial='foot'></template>
118
+ </data-grid>
119
+ </criteria-paged>
120
+ </div>
121
+ </div>
122
+ </div>
123
+ </template>
124
+
125
+ <script>
126
+ import {HttpResetClass, PagedList} from 'vue-client'
127
+ import tableConfig from './../../sale/config/tableConfig'
128
+ import exportConfig from '../../sale/config/exportConfig'
129
+ import plugins from '../../../plugins/GetLoginInfoService'
130
+ import plugin from 'system-clients/src/plugins/GetLoginInfoService'
131
+
132
+ let readySomething = async function (self) {
133
+ await self.$MagLoadParams.loadParam()
134
+ self.initParams()
135
+ // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
136
+ }
137
+ export default {
138
+ title: '上报数据查询',
139
+ data() {
140
+ return {
141
+ other:[],
142
+ footer:[],
143
+ model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
144
+ criteriaShow: false,
145
+ config: {
146
+ fieldMapping: {
147
+ f_userinfo_code: '客户编号',
148
+ f_user_name: '客户名称'
149
+ }
150
+ },
151
+ WarningType: [
152
+ {label: '全部', value: ''}
153
+ ],
154
+ Warningstyles: [
155
+ {label: '全部', value: ''}
156
+ ],
157
+ styles:false,
158
+ headData: [],
159
+ bodyData: [],
160
+ orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
161
+ resshow:['company'],
162
+ org:[this.$login.f.orgid],
163
+ meterbrands:[]
164
+ }
165
+ },
166
+ created () {
167
+ this.config.fieldMapping=tableConfig.ReportDataQuery
168
+ console.log("========================")
169
+ console.log(this.config.fieldMapping)
170
+ var item="用户编号"
171
+ console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
172
+ console.log(this.config.fieldMapping[item])
173
+ this.headData=Object.keys(this.config.fieldMapping)
174
+ // for(var i=0;i<this.config.fieldMapping;i++){
175
+ // this.headData.push(this.config.fieldMapping[i])
176
+ // }
177
+
178
+ },
179
+ ready() {
180
+ this.$refs.paged.$refs.cri.search()
181
+ readySomething(this).then(() => {
182
+ this.$emit('ready')
183
+ }).catch((error) => {
184
+ this.$emit('error', error)
185
+ })
186
+ },
187
+ methods: {
188
+ initParams() {
189
+ // 初始化气表品牌
190
+ let brandArr = []
191
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
192
+ let temp = {}
193
+ temp.label = item.label
194
+ temp.value = item.value.f_meter_brand
195
+ brandArr.push(temp)
196
+ })
197
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
198
+ //初始化气表价格
199
+ this.prices = this.$MagGetSaleParam.getPrices();
200
+ },
201
+ showMeterStyle() {
202
+ this.styles = true
203
+ },
204
+ search() {
205
+ this.$refs.paged.$refs.cri.search()
206
+ },
207
+ async selfSearch(args) {
208
+ args.condition = `${args.condition}` + this.orgCondtionStr
209
+ await this.model.search(args.condition, args.model)
210
+ // 查询到数据进行处理
211
+ // if (this.model.rows.length > 0) {
212
+ // this.bodyData = Object.keys(this.model.rows[0])
213
+ // }
214
+ },
215
+ getorg(obj) {
216
+ if (obj.resids.length>0) {
217
+ this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
218
+ }else
219
+ {
220
+ this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
221
+ }
222
+ },
223
+ // getorg(obj) {
224
+ // // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
225
+ // // this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
226
+ // // }else{
227
+ // // this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
228
+ // // }
229
+ // // this.orgname = obj.res
230
+ // },
231
+ clear() {
232
+ //清空部门和人员
233
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
234
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
235
+ //部门和人员变为全选
236
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
237
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
238
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
239
+ this.$refs.paged.$refs.cri.model[key] = []
240
+ })
241
+ },
242
+ hidden() {
243
+ this.criteriaShow = !this.criteriaShow
244
+ },
245
+
246
+ // getRes(obj) {
247
+ // this.orgCondtionStr = obj
248
+ // }
249
+ getotherfooter () {
250
+ // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
251
+ // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
252
+ this.other = [];
253
+ this.footer = [];
254
+ let otherInData = [];
255
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
256
+ let footerData = []
257
+ this.footer.push(footerData);
258
+ this.other.push(otherInData);
259
+ }
260
+ },
261
+ watch: {
262
+ },
263
+ computed: {
264
+ metertypes() {
265
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
266
+ },
267
+ getCondition() {
268
+ return {
269
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
270
+ endDate: this.$refs.paged.$refs.cri.model.endDate,
271
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
272
+ }
273
+ },
274
+ getfield() {
275
+ return exportConfig.ReportDataConfig
276
+ }
277
+ }
278
+ }
279
+ </script>
@@ -311,6 +311,42 @@
311
311
  condition="f_adjustable_id = '{}'"
312
312
  :search='true'></v-select>
313
313
  </div>
314
+ <div class="col-sm-2 form-group">
315
+ <label class="font_normal_body">波&ensp;纹&ensp;管</label>
316
+ <v-select :options='$parent.$parent.writePays'
317
+ :value.sync="model.f_bellows_tf"
318
+ style="width:60%"
319
+ condition="f_bellows_tf='{}'"
320
+ placeholder='是否波纹管'
321
+ v-model="model.f_bellows_tf"
322
+ value-single="true"
323
+ close-on-select>
324
+ </v-select>
325
+ </div>
326
+ <div class="col-sm-2 form-group">
327
+ <label class="font_normal_body">安&ensp;全&ensp;阀</label>
328
+ <v-select :options='$parent.$parent.writePays'
329
+ :value.sync="model.f_safety_tf"
330
+ style="width:60%"
331
+ condition="f_safety_tf='{}'"
332
+ placeholder='是否安全阀'
333
+ v-model="model.f_safety_tf"
334
+ value-single="true"
335
+ close-on-select>
336
+ </v-select>
337
+ </div>
338
+ <div class="col-sm-2 form-group">
339
+ <label class="font_normal_body">是否熄保</label>
340
+ <v-select :options='$parent.$parent.writePays'
341
+ :value.sync="model.f_flameoutpro_tf"
342
+ style="width:60%"
343
+ condition="f_flameoutpro_tf='{}'"
344
+ placeholder='是否熄保'
345
+ v-model="model.f_flameoutpro_tf"
346
+ value-single="true"
347
+ close-on-select>
348
+ </v-select>
349
+ </div>
314
350
  </div>
315
351
 
316
352
  </div>
@@ -646,7 +682,7 @@
646
682
  other:[],
647
683
  footer:[],
648
684
  model: new PagedList('rs/sql/compreQuery', 20,
649
- {items: this.orderitem ? this.orderitem : `'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},
685
+ {orderitem: this.orderitem ? this.orderitem : `'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},
650
686
  {
651
687
  'f_total_gas': 0,
652
688
  'f_balance': 0
@@ -1080,6 +1116,9 @@
1080
1116
  tablestate() {
1081
1117
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('表具状态')]
1082
1118
  },
1119
+ writePays () {
1120
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('是否')]
1121
+ },
1083
1122
 
1084
1123
  // getPricenames() {
1085
1124
  // let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;