manage-client 3.3.90 → 3.3.92

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.
@@ -0,0 +1,190 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-2 form-group" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd HH:mm:ss'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-2 form-group" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd HH:mm:ss'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
29
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
30
+ </div>
31
+ <div class="col-sm-2 form-group">
32
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <res-select restype='department'
34
+ @res-select="$parent.$parent.getdep"
35
+ :parentresid ="$parent.$parent.depresid"
36
+ :initresid='$parent.$parent.depid'>
37
+ </res-select>
38
+
39
+ </div>
40
+
41
+
42
+ <div style = "float:right;">
43
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
44
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
45
+ <report-excel id='gasprice'></report-excel>
46
+ </div>
47
+ </div>
48
+ </div>
49
+ </criteria>
50
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
51
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
52
+ <thead>
53
+ <tr>
54
+ <th colspan='3' style="font-weight: bold; text-align: left;">
55
+ <h3 style="text-align: center">抄表用气性质统计报表</h3>
56
+ </th>
57
+ </tr>
58
+ <tr>
59
+ <th colspan='3' style="font-weight: normal; text-align: center;">
60
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
61
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;
62
+ </th>
63
+ </tr>
64
+ <tr>
65
+ <th colspan='3' style="font-weight: normal; text-align: center;">
66
+ 打印时间:{{{$parent.printTime}}}
67
+ </th>
68
+ </tr>
69
+ <tr>
70
+ <th colspan='3' style="font-weight: normal; text-align: center;">
71
+ <div>
72
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
73
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
74
+ </div>
75
+ </th>
76
+ </tr>
77
+ </thead>
78
+ <tr>
79
+ <td colspan='3' style="font-weight: normal;" id="test">
80
+ {{{ model.data.substring(26,model.data.length-8) }}}
81
+ </td>
82
+ </tr>
83
+ </table>
84
+ {{{ $parent.reportStr}}}
85
+ </div>
86
+ </criteria-paged>
87
+ </div>
88
+ </template>
89
+
90
+ <script>
91
+ import { DataModel } from 'vue-client'
92
+ import co from 'co'
93
+ export default {
94
+ title: '抄表用气性质统计报表',
95
+ props: ['data'],
96
+ data () {
97
+ return {
98
+ printTime: this.$login.toStandardTimeString(),
99
+ depresid: [],
100
+ userresid: [],
101
+ initres: {
102
+ org:[this.$login.f.orgid],
103
+ dep:[],
104
+ user:[]
105
+ },
106
+ f_public_group1: '',
107
+ f_orgid: this.$login.f.orgid,
108
+ f_depid: this.$login.f.depids,
109
+ f_operatorid: this.$login.f.id,
110
+ operatorid: [],
111
+ depid: [],
112
+ orgname: '',
113
+ depname: '',
114
+ operatorname: '',
115
+ orgCondtionStr: '1=1',
116
+ model: new DataModel('rs/report/HandGasproperties_hd',
117
+ {startDate: 'this.model.startDate',
118
+ endDate: 'this.model.endDate',
119
+ f_orgid: 'this.model.f_orgid'
120
+ }
121
+ ),
122
+ reportStr: null,
123
+ show: false,
124
+ spans: ''
125
+ }
126
+ },
127
+ ready () {
128
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
129
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
130
+ // this.$refs.paged.$refs.criteria.search()
131
+ },
132
+ methods: {
133
+ searchData () {
134
+ this.$refs.paged.$refs.criteria.search()
135
+ },
136
+ selfSearch (args) {
137
+ this.printTime = this.$login.toStandardTimeString()
138
+ let orgcondition = '1 = 1'
139
+ if (this.f_orgid[0]) {
140
+ orgcondition += ` and f_orgid in ('${this.f_orgid}')`
141
+ }
142
+ if (this.f_depid[0]) {
143
+ orgcondition += ` and f_depid in ('${this.f_depid}')`
144
+ }
145
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
146
+ this.$refs.paged.search(args)
147
+ },
148
+ getRes (obj) {
149
+ this.orgname = obj.res[0]
150
+ this.depresid = obj.resids
151
+ this.f_orgid = obj.resids
152
+ },
153
+ getdep (obj, val) {
154
+ this.depname = val[0]
155
+ this.userresid = obj
156
+ this.f_depid = obj
157
+ },
158
+ getuser ( obj, val) {
159
+ this.operatorname = val[0]
160
+ this.f_operatorid = obj
161
+ }
162
+ },
163
+ watch: {
164
+ 'data' (val) {
165
+ if (val.f_files_path) {
166
+ this.getFileContent(val.f_files_path)
167
+ } else {
168
+ this.reportStr = null
169
+ }
170
+ },
171
+ 'model.data' (val) {
172
+ let tab = document.getElementById('test').children[0]
173
+ var tds = tab.getElementsByTagName('td')
174
+ var num = 0
175
+ for (let td of tds) {
176
+ let span = td.getAttribute('colspan')
177
+ num = num + ((span ? span : 1) - 0)
178
+ }
179
+ this.spans = num
180
+ }
181
+ },
182
+ computed: {
183
+ }
184
+ }
185
+ </script>
186
+ <style scoped>
187
+ .noborder{
188
+ border: none;
189
+ }
190
+ </style>
@@ -0,0 +1,190 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-2 form-group" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd HH:mm:ss'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-2 form-group" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd HH:mm:ss'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
29
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
30
+ </div>
31
+ <div class="col-sm-2 form-group">
32
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <res-select restype='department'
34
+ @res-select="$parent.$parent.getdep"
35
+ :parentresid ="$parent.$parent.depresid"
36
+ :initresid='$parent.$parent.depid'>
37
+ </res-select>
38
+
39
+ </div>
40
+
41
+
42
+ <div style = "float:right;">
43
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
44
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
45
+ <report-excel id='gasprice'></report-excel>
46
+ </div>
47
+ </div>
48
+ </div>
49
+ </criteria>
50
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
51
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
52
+ <thead>
53
+ <tr>
54
+ <th colspan='6' style="font-weight: bold; text-align: left;">
55
+ <h3 style="text-align: center">抄表气价统计报表</h3>
56
+ </th>
57
+ </tr>
58
+ <tr>
59
+ <th colspan='6' style="font-weight: normal; text-align: center;">
60
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
61
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;
62
+ </th>
63
+ </tr>
64
+ <tr>
65
+ <th colspan='6' style="font-weight: normal; text-align: center;">
66
+ 打印时间:{{{$parent.printTime}}}
67
+ </th>
68
+ </tr>
69
+ <tr>
70
+ <th colspan='6' style="font-weight: normal; text-align: center;">
71
+ <div>
72
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
73
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
74
+ </div>
75
+ </th>
76
+ </tr>
77
+ </thead>
78
+ <tr>
79
+ <td colspan='6' style="font-weight: normal;" id="test">
80
+ {{{ model.data.substring(26,model.data.length-8) }}}
81
+ </td>
82
+ </tr>
83
+ </table>
84
+ {{{ $parent.reportStr}}}
85
+ </div>
86
+ </criteria-paged>
87
+ </div>
88
+ </template>
89
+
90
+ <script>
91
+ import { DataModel } from 'vue-client'
92
+ import co from 'co'
93
+ export default {
94
+ title: '抄表气价统计报表',
95
+ props: ['data'],
96
+ data () {
97
+ return {
98
+ printTime: this.$login.toStandardTimeString(),
99
+ depresid: [],
100
+ userresid: [],
101
+ initres: {
102
+ org:[this.$login.f.orgid],
103
+ dep:[],
104
+ user:[]
105
+ },
106
+ f_public_group1: '',
107
+ f_orgid: this.$login.f.orgid,
108
+ f_depid: this.$login.f.depids,
109
+ f_operatorid: this.$login.f.id,
110
+ operatorid: [],
111
+ depid: [],
112
+ orgname: '',
113
+ depname: '',
114
+ operatorname: '',
115
+ orgCondtionStr: '1=1',
116
+ model: new DataModel('rs/report/HandPrice_hd',
117
+ {startDate: 'this.model.startDate',
118
+ endDate: 'this.model.endDate',
119
+ f_orgid: 'this.model.f_orgid'
120
+ }
121
+ ),
122
+ reportStr: null,
123
+ show: false,
124
+ spans: ''
125
+ }
126
+ },
127
+ ready () {
128
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
129
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
130
+ // this.$refs.paged.$refs.criteria.search()
131
+ },
132
+ methods: {
133
+ searchData () {
134
+ this.$refs.paged.$refs.criteria.search()
135
+ },
136
+ selfSearch (args) {
137
+ this.printTime = this.$login.toStandardTimeString()
138
+ let orgcondition = '1 = 1'
139
+ if (this.f_orgid[0]) {
140
+ orgcondition += ` and f_orgid in ('${this.f_orgid}')`
141
+ }
142
+ if (this.f_depid[0]) {
143
+ orgcondition += ` and f_depid in ('${this.f_depid}')`
144
+ }
145
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
146
+ this.$refs.paged.search(args)
147
+ },
148
+ getRes (obj) {
149
+ this.orgname = obj.res[0]
150
+ this.depresid = obj.resids
151
+ this.f_orgid = obj.resids
152
+ },
153
+ getdep (obj, val) {
154
+ this.depname = val[0]
155
+ this.userresid = obj
156
+ this.f_depid = obj
157
+ },
158
+ getuser ( obj, val) {
159
+ this.operatorname = val[0]
160
+ this.f_operatorid = obj
161
+ }
162
+ },
163
+ watch: {
164
+ 'data' (val) {
165
+ if (val.f_files_path) {
166
+ this.getFileContent(val.f_files_path)
167
+ } else {
168
+ this.reportStr = null
169
+ }
170
+ },
171
+ 'model.data' (val) {
172
+ let tab = document.getElementById('test').children[0]
173
+ var tds = tab.getElementsByTagName('td')
174
+ var num = 0
175
+ for (let td of tds) {
176
+ let span = td.getAttribute('colspan')
177
+ num = num + ((span ? span : 1) - 0)
178
+ }
179
+ this.spans = num
180
+ }
181
+ },
182
+ computed: {
183
+ }
184
+ }
185
+ </script>
186
+ <style scoped>
187
+ .noborder{
188
+ border: none;
189
+ }
190
+ </style>
@@ -0,0 +1,190 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-2 form-group" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd HH:mm:ss'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-2 form-group" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd HH:mm:ss'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
29
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
30
+ </div>
31
+ <div class="col-sm-2 form-group">
32
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <res-select restype='department'
34
+ @res-select="$parent.$parent.getdep"
35
+ :parentresid ="$parent.$parent.depresid"
36
+ :initresid='$parent.$parent.depid'>
37
+ </res-select>
38
+
39
+ </div>
40
+
41
+
42
+ <div style = "float:right;">
43
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
44
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
45
+ <report-excel id='gasprice'></report-excel>
46
+ </div>
47
+ </div>
48
+ </div>
49
+ </criteria>
50
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
51
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
52
+ <thead>
53
+ <tr>
54
+ <th colspan='5' style="font-weight: bold; text-align: left;">
55
+ <h3 style="text-align: center">抄表性质统计报表</h3>
56
+ </th>
57
+ </tr>
58
+ <tr>
59
+ <th colspan='5' style="font-weight: normal; text-align: center;">
60
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
61
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;
62
+ </th>
63
+ </tr>
64
+ <tr>
65
+ <th colspan='5' style="font-weight: normal; text-align: center;">
66
+ 打印时间:{{{$parent.printTime}}}
67
+ </th>
68
+ </tr>
69
+ <tr>
70
+ <th colspan='5' style="font-weight: normal; text-align: center;">
71
+ <div>
72
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
73
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
74
+ </div>
75
+ </th>
76
+ </tr>
77
+ </thead>
78
+ <tr>
79
+ <td colspan='5' style="font-weight: normal;" id="test">
80
+ {{{ model.data.substring(26,model.data.length-8) }}}
81
+ </td>
82
+ </tr>
83
+ </table>
84
+ {{{ $parent.reportStr}}}
85
+ </div>
86
+ </criteria-paged>
87
+ </div>
88
+ </template>
89
+
90
+ <script>
91
+ import { DataModel } from 'vue-client'
92
+ import co from 'co'
93
+ export default {
94
+ title: '抄表性质统计报表',
95
+ props: ['data'],
96
+ data () {
97
+ return {
98
+ printTime: this.$login.toStandardTimeString(),
99
+ depresid: [],
100
+ userresid: [],
101
+ initres: {
102
+ org:[this.$login.f.orgid],
103
+ dep:[],
104
+ user:[]
105
+ },
106
+ f_public_group1: '',
107
+ f_orgid: this.$login.f.orgid,
108
+ f_depid: this.$login.f.depids,
109
+ f_operatorid: this.$login.f.id,
110
+ operatorid: [],
111
+ depid: [],
112
+ orgname: '',
113
+ depname: '',
114
+ operatorname: '',
115
+ orgCondtionStr: '1=1',
116
+ model: new DataModel('rs/report/WebGasType_hd',
117
+ {startDate: 'this.model.startDate',
118
+ endDate: 'this.model.endDate',
119
+ f_orgid: 'this.model.f_orgid'
120
+ }
121
+ ),
122
+ reportStr: null,
123
+ show: false,
124
+ spans: ''
125
+ }
126
+ },
127
+ ready () {
128
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
129
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
130
+ // this.$refs.paged.$refs.criteria.search()
131
+ },
132
+ methods: {
133
+ searchData () {
134
+ this.$refs.paged.$refs.criteria.search()
135
+ },
136
+ selfSearch (args) {
137
+ this.printTime = this.$login.toStandardTimeString()
138
+ let orgcondition = '1 = 1'
139
+ if (this.f_orgid[0]) {
140
+ orgcondition += ` and f_orgid in ('${this.f_orgid}')`
141
+ }
142
+ if (this.f_depid[0]) {
143
+ orgcondition += ` and f_depid in ('${this.f_depid}')`
144
+ }
145
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
146
+ this.$refs.paged.search(args)
147
+ },
148
+ getRes (obj) {
149
+ this.orgname = obj.res[0]
150
+ this.depresid = obj.resids
151
+ this.f_orgid = obj.resids
152
+ },
153
+ getdep (obj, val) {
154
+ this.depname = val[0]
155
+ this.userresid = obj
156
+ this.f_depid = obj
157
+ },
158
+ getuser ( obj, val) {
159
+ this.operatorname = val[0]
160
+ this.f_operatorid = obj
161
+ }
162
+ },
163
+ watch: {
164
+ 'data' (val) {
165
+ if (val.f_files_path) {
166
+ this.getFileContent(val.f_files_path)
167
+ } else {
168
+ this.reportStr = null
169
+ }
170
+ },
171
+ 'model.data' (val) {
172
+ let tab = document.getElementById('test').children[0]
173
+ var tds = tab.getElementsByTagName('td')
174
+ var num = 0
175
+ for (let td of tds) {
176
+ let span = td.getAttribute('colspan')
177
+ num = num + ((span ? span : 1) - 0)
178
+ }
179
+ this.spans = num
180
+ }
181
+ },
182
+ computed: {
183
+ }
184
+ }
185
+ </script>
186
+ <style scoped>
187
+ .noborder{
188
+ border: none;
189
+ }
190
+ </style>
@@ -106,6 +106,19 @@
106
106
 
107
107
  </v-select>
108
108
  </div>
109
+ <div class="col-sm-2 form-group" >
110
+ <label class="font_normal_body">设备类型</label>
111
+ <v-select :value.sync="model.f_devices_type"
112
+ v-model="model.f_devices_type"
113
+ :options='$parent.$parent.deviceTypes' placeholder='请选择'
114
+ condition="f_devices_type = '{}'"
115
+ close-on-select></v-select>
116
+ </div>
117
+ <div class="col-sm-2 form-group" >
118
+ <label class="font_normal_body">设备品牌</label>
119
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_brand"
120
+ condition="f_brand like '%{}%'" placeholder='设备品牌'>
121
+ </div>
109
122
  </div>
110
123
  </div>
111
124
  </criteria>
@@ -472,6 +485,7 @@
472
485
  titles:'',
473
486
  other:[],
474
487
  footer:[],
488
+ deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
475
489
  model: new PagedList('rs/sql/fmyGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
476
490
  criteriaShow: false,
477
491
  orgCondtionStr: '',
@@ -112,6 +112,19 @@
112
112
  close-on-select>
113
113
  </v-select>
114
114
  </div>
115
+ <div class="col-sm-2 form-group" >
116
+ <label class="font_normal_body">设备类型</label>
117
+ <v-select :value.sync="model.f_devices_type"
118
+ v-model="model.f_devices_type"
119
+ :options='$parent.$parent.deviceTypes' placeholder='请选择'
120
+ condition="f_devices_type = '{}'"
121
+ close-on-select></v-select>
122
+ </div>
123
+ <div class="col-sm-2 form-group" >
124
+ <label class="font_normal_body">设备品牌</label>
125
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_brand"
126
+ condition="f_brand like '%{}%'" placeholder='设备品牌'>
127
+ </div>
115
128
  </div>
116
129
  </div>
117
130
  </criteria>
@@ -571,6 +584,7 @@
571
584
  titles:'',
572
585
  other:[],
573
586
  footer:[],
587
+ deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
574
588
  model: new PagedList('rs/sql/myGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
575
589
  criteriaShow: false,
576
590
  orgCondtionStr: '',
@@ -127,10 +127,8 @@
127
127
  <!-- </td>-->
128
128
  <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
129
129
  <!-- 用气量:&emsp;{{ sumsmodel.f_oughtamount }}m³-->
130
- <!-- </td>-->
131
- <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
132
- <!-- 售气量:&emsp;{{ sumsmodel.f_pregas }}m³-->
133
- <!-- </td>-->
130
+ <!-- <' and f_user_usetype in (\'居民用气\')'d style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
131
+ <!-- ' and f_user_usetype in (\'公福用气\',\'商业用户\',\'工业用户\')' <!-- </td>-->
134
132
  <!-- </tr>-->
135
133
  <!-- </table>-->
136
134
  </div>
@@ -226,6 +224,20 @@ export default {
226
224
  args.condition = `${args.condition} and f_corporate_name_id = '${this.data.id}'`
227
225
  this.$refs.paged.$refs.cri.model.startDate = this.data.startDate
228
226
  this.$refs.paged.$refs.cri.model.endDate = this.data.endDate
227
+ if (this.data.f_user_type == '民用' && !this.data.f_user_usetype) {
228
+ args.condition = args.condition + " and f_user_usetype in ('居民用气')"
229
+ } else if (this.data.f_user_type == '非民用' && !this.data.f_user_usetype) {
230
+ args.condition = args.condition + " and f_user_usetype in ('公福用气','商业用户','工业用户')"
231
+ }
232
+ if (this.data.f_user_usetype) {
233
+ args.condition = args.condition + ` and f_user_usetype in (${this.data.f_user_usetype})`
234
+ }
235
+ if (this.data.f_user_usenature) {
236
+ args.condition = args.condition + ` and f_user_usenature in ('${this.data.f_user_usetype}')`
237
+ }
238
+ if (this.data.f_use_institution) {
239
+ args.condition = args.condition + ` and f_use_institution in ('${this.data.f_user_usetype}')`
240
+ }
229
241
  this.condition = args.condition
230
242
  console.log('查看条件', this.condition)
231
243
  this.model.search(args.condition, args.model)