manage-client 3.1.50 → 3.1.54

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 (42) hide show
  1. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  2. package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
  3. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  4. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  5. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  6. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  7. package/.gradle/{6.1 → configuration-cache}/gc.properties +0 -0
  8. package/build/dev-server.js +6 -6
  9. package/package.json +1 -1
  10. package/src/components/SellReport/OperatorCheckoutReport.vue +237 -250
  11. package/src/components/SellReport/OperatorCheckoutTwo.vue +237 -250
  12. package/src/components/SellReport/ReportItems.vue +241 -241
  13. package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue +67 -37
  14. package/src/components/sale/businessquery/FillGasQuery.vue +491 -491
  15. package/src/components/sale/filesquery/DeviceQuery.vue +524 -524
  16. package/src/filiale/WEINAN/ReportDataQuery.vue +249 -0
  17. package/src/filiale/WEINAN/config/tableConfig.js +0 -12
  18. package/src/filiale/WEINAN/sale.js +3 -1
  19. package/src/filiale/jingwei/ChargeQuery.vue +1241 -1241
  20. package/src/filiale/liaoyuan/ChargeQuery.vue +1284 -1284
  21. package/src/filiale/liaoyuan/exportConfig.js +718 -718
  22. package/src/filiale/meihekou/CardHandplanQuery.vue +541 -541
  23. package/src/filiale/meihekou/config/exportConfig.js +804 -804
  24. package/src/filiale/shaoguan/ChargeQuery.vue +1034 -1034
  25. package/src/filiale/shaoguan/OtherChargeQuery.vue +596 -596
  26. package/src/filiale/shaoguan/sale/businessquery/oldList.vue +41 -41
  27. package/src/filiale/shaoguan/sale/businessquery/oldMeterList.vue +290 -290
  28. package/src/filiale/shaoguan/sale.js +35 -35
  29. package/src/main.js +66 -66
  30. package/src/reportManage.js +478 -482
  31. package/.gradle/4.4/fileChanges/last-build.bin +0 -0
  32. package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
  33. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  34. package/.gradle/6.1/executionHistory/executionHistory.bin +0 -0
  35. package/.gradle/6.1/executionHistory/executionHistory.lock +0 -0
  36. package/.gradle/6.1/fileChanges/last-build.bin +0 -0
  37. package/.gradle/6.1/fileHashes/fileHashes.bin +0 -0
  38. package/.gradle/6.1/fileHashes/fileHashes.lock +0 -0
  39. package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
  40. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  41. package/build/tmp/jar/MANIFEST.MF +0 -2
  42. package/src/components/SellReport/AmountDay.vue +0 -257
@@ -1,241 +1,241 @@
1
- <template>
2
- <div class="flex">
3
- <partial-view v-ref:pv>
4
- <div class="span" v-show="!filtrate">
5
- <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0" title="选中报表后双击查看报表的配置信息" @dblclick="filtrate=!filtrate">报表类型</p>
6
- <div style="height: 94%;overflow: auto;width: 104%">
7
- <div style="padding:3px" :style="{background: index===row ? '#dfedfb' : 'white'}" :class="styles=='2'?'col-sm-6 auto':'col-sm-12 auto'" v-for="(index,type) in types"
8
- @click="$dispatch('select-type',index, type),changecolor(index,type)"
9
- :id="'div-'+index">
10
- <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;"></div>
11
- <div style="height:40px" class="row auto">{{index+1}}、{{type.f_report_name}}</div>
12
- </div>
13
- </div>
14
-
15
- </div>
16
- <div class="span" v-show="filtrate">
17
- <p class="bg-info text-center" style="padding: 8px;" @dblclick="filtrate=!filtrate">相关配置</p>
18
- <div style="height: 94%;overflow: auto;width: 104%">
19
- <table style="border-style: none;width: 95%;">
20
- <tr style="display:block;margin:15px 0;">
21
- <td style="text-align: left">
22
- <label class="font_normal_body">报表名称:</label>
23
- <v-select multiple
24
- :value.sync="modelinfo.f_report_name"
25
- class="select_list select"
26
- v-model="modelinfo.f_report_name"
27
- :options='reportNames' placeholder='请选择'
28
- close-on-select></v-select>
29
- </td>
30
- </tr>
31
- <tr style="display:block;margin:15px 0;">
32
- <td style="text-align: left">
33
- <label class="font_normal_body">报表类型:</label>
34
- <v-select
35
- :value.sync="modelinfo.f_report_type"
36
- :search="false"
37
- class="select_list select"
38
- v-model="modelinfo.f_report_type"
39
- :options='reportTypes' placeholder='请选择'
40
- close-on-select></v-select>
41
- </td>
42
- </tr>
43
- <tr style="display:block;margin:15px 0;">
44
- <td style="text-align: left">
45
- <label class="font_normal_body">报表状态:</label>
46
- <v-select
47
- :value.sync="modelinfo.f_rank"
48
- :search="false"
49
- class="select_list select"
50
- v-model="modelinfo.f_rank"
51
- :options='reportState' placeholder='请选择'
52
- close-on-select></v-select>
53
- </td>
54
- </tr>
55
- <tr style="display:block;margin:15px 0;">
56
- <td style="text-align: right;width: 50%;"><button class="button_clear button_spacing" @click="filtrate=!filtrate">返回</button></td>
57
- <td style="text-align: right;width: 25%;"><button class="button_clear button_spacing" @click="clear()">清空</button></td>
58
- <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="chaxun()">查询</button></td>
59
- </tr>
60
- <tr style="display:block;margin:15px 0;" v-for="(key,value) in infos">
61
- <td style="text-align: left;">
62
- <label class="font_normal_body" style="text-align: right;">{{key}}:</label>
63
- <input type="text" style="width: 70%;" class="input_search" v-model="value" v-bind:title="[key =='报表状态'?'1表示显示其他表示不显示':'']"/>
64
- </td>
65
- </tr>
66
- <tr style="display:block;margin:15px 0;">
67
- <td style="text-align: right;width: 50%;"><button class="button_clear button_spacing" @click="saveOrUpdate(1)">修改</button></td>
68
- <td style="text-align: right;width: 25%;"><button class="button_clear button_spacing" @click="clear(true)">清空</button></td>
69
- <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
70
- </tr>
71
- </table>
72
- </div>
73
-
74
- </div>
75
- </partial-view>
76
- </div>
77
- </template>
78
-
79
- <script>
80
- import {HttpResetClass} from "vue-client";
81
-
82
- export default {
83
- title: '报表选项',
84
- props: {
85
- inindex:{}
86
- },
87
- data () {
88
- return {
89
- types: [],
90
- row:null,
91
- infos: {
92
- '报表名称': '',
93
- '连接页面': '',
94
- '报表类型': '',
95
- '图片路径': '',
96
- '添 加 人': '',
97
- '报表状态': ''
98
- },
99
- styles:this.$appdata.getSingleValue('报表样式')?this.$appdata.getSingleValue('报表样式'):'2',
100
- saveinfo:{},
101
- filtrate:false,
102
- modelinfo: {
103
- f_report_name: '',
104
- f_report_type: '',
105
- f_rank: '1'
106
- },
107
- config:{
108
- f_report_name: '报表名称',
109
- f_report_path: '连接页面',
110
- f_report_type: '报表类型',
111
- f_image_path: '图片路径',
112
- f_operator: '添 加 人',
113
- f_rank: '报表状态'
114
- },
115
- conditionStr:'1=1',
116
- reportNames: [],
117
- reportTypes: [],
118
- reportState : [{label: '全部', value: ''},{label: '显示', value: '1'},{label: '未显示', value: 'null'},],
119
- tablename: 't_report_type'
120
- }
121
- },
122
- ready (){
123
- // 获取所有报表类型
124
- this.getReportInfo(null,'1=1 and f_rank=1')
125
- this.getReportName()
126
- this.getReportType()
127
- },
128
- methods: {
129
- getReportInfo(tname,cond){
130
- this.$refs.pv.load('rs/sql/manageSingleTable', {
131
- data: {
132
- tablename: tname ? tname:this.tablename,
133
- condition: cond ? cond:this.conditionStr
134
- }
135
- }).then((res) => {
136
- this.types = res.data
137
- }).catch((error) => {
138
-
139
- })
140
- },
141
- chaxun(){
142
- this.getReportInfo()
143
- this.filtrate = !this.filtrate
144
- },
145
- changecolor(index,type){
146
- this.row=index
147
- },
148
- async getReportName(){
149
- let HttpReset = new HttpResetClass()
150
- var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
151
- data: {
152
- condition: this.conditionStr,
153
- tablename: this.tablename,
154
- groupitem: 'f_report_name',
155
- orderitem: 'f_report_name',
156
- items: 'f_report_name'
157
- }
158
- }, {resolveMsg: null, rejectMsg: '获取报表名称失败!'})
159
- let nameArr = [{label: '全部', value: ''}]
160
- for (let row of data.data){
161
- nameArr.push({label: row.f_report_name, value: row.f_report_name})
162
- }
163
- this.reportNames = nameArr
164
- },
165
- clear(val){
166
- if(val){
167
- for (let key in this.infos) {
168
- this.infos[key] =''
169
- }
170
- }else{
171
- for (let key in this.modelinfo) {
172
- this.modelinfo[key] =[]
173
- }
174
- }
175
- },
176
- async getReportType(){
177
- let HttpReset = new HttpResetClass()
178
- var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
179
- data: {
180
- condition: this.conditionStr,
181
- tablename: this.tablename,
182
- groupitem: 'f_report_type',
183
- orderitem: 'f_report_type',
184
- items: 'f_report_type'
185
- }
186
- }, {resolveMsg: null, rejectMsg: '获取报表类型失败!'})
187
- let typeArr = [{label: '全部', value: ''}]
188
- for (let row of data.data){
189
- typeArr.push({label: row.f_report_type, value: row.f_report_type})
190
- }
191
- this.reportTypes = typeArr
192
- },
193
- saveOrUpdate(val){
194
- // let sv={}
195
- for(let [key, value] of Object.entries(this.config)){
196
- let vl=this.infos[value]
197
- this.saveinfo[key]=vl
198
- }
199
- this.saveinfo['type']=val
200
-
201
- this.$resetpost('rs/logic/saveReport', this.saveinfo, {resolveMsg: '恭喜!提交成功!', rejectMsg: '提交错误!'}).then((res) => {
202
- this.$showAlert('保存成功', 'success', 3000)
203
- this.getReportInfo(null,'1=1 and f_rank=1')
204
- this.filtrate=!this.filtrate
205
- })
206
- console.log('this.saveinfo+++++',this.saveinfo)
207
- }
208
- },
209
- watch :{
210
- 'modelinfo': {
211
- deep: true,
212
- handler(val) {
213
- let c='1=1 '
214
- for (let [key, value] of Object.entries(val)) {
215
- if (value && value!='') {
216
- if(key=='f_rank' && value=='null'){
217
- c+='and '+ key + " is " + value +' or '+ key +" = ''"
218
- }else{
219
- c+='and '+ key + " in ('" + value.toString().replace(new RegExp(',','g'),"','") + "') "
220
- }
221
-
222
- }
223
- }
224
- this.conditionStr = c
225
- }
226
- },
227
- 'inindex' (val){
228
- this.infos={}
229
- this.saveinfo=this.types[val]
230
- let flag={}
231
- for(let [key, value] of Object.entries(this.saveinfo)){
232
- let name=this.config[key]
233
- if (name!=null){
234
- flag[name]=value
235
- }
236
- }
237
- this.infos=flag
238
- }
239
- }
240
- }
241
- </script>
1
+ <template>
2
+ <div class="flex">
3
+ <partial-view v-ref:pv>
4
+ <div class="span" v-show="!filtrate">
5
+ <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0" title="选中报表后双击查看报表的配置信息" @dblclick="filtrate=!filtrate">报表类型</p>
6
+ <div style="height: 94%;overflow: auto;width: 104%">
7
+ <div style="padding:3px" :style="{background: index===row ? '#dfedfb' : 'white'}" :class="styles=='2'?'col-sm-6 auto':'col-sm-12 auto'" v-for="(index,type) in types"
8
+ @click="$dispatch('select-type',index, type),changecolor(index,type)"
9
+ :id="'div-'+index">
10
+ <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;"></div>
11
+ <div style="height:40px" class="row auto">{{index+1}}、{{type.f_report_name}}</div>
12
+ </div>
13
+ </div>
14
+
15
+ </div>
16
+ <div class="span" v-show="filtrate">
17
+ <p class="bg-info text-center" style="padding: 8px;" @dblclick="filtrate=!filtrate">相关配置</p>
18
+ <div style="height: 94%;overflow: auto;width: 104%">
19
+ <table style="border-style: none;width: 95%;">
20
+ <tr style="display:block;margin:15px 0;">
21
+ <td style="text-align: left">
22
+ <label class="font_normal_body">报表名称:</label>
23
+ <v-select multiple
24
+ :value.sync="modelinfo.f_report_name"
25
+ class="select_list select"
26
+ v-model="modelinfo.f_report_name"
27
+ :options='reportNames' placeholder='请选择'
28
+ close-on-select></v-select>
29
+ </td>
30
+ </tr>
31
+ <tr style="display:block;margin:15px 0;">
32
+ <td style="text-align: left">
33
+ <label class="font_normal_body">报表类型:</label>
34
+ <v-select
35
+ :value.sync="modelinfo.f_report_type"
36
+ :search="false"
37
+ class="select_list select"
38
+ v-model="modelinfo.f_report_type"
39
+ :options='reportTypes' placeholder='请选择'
40
+ close-on-select></v-select>
41
+ </td>
42
+ </tr>
43
+ <tr style="display:block;margin:15px 0;">
44
+ <td style="text-align: left">
45
+ <label class="font_normal_body">报表状态:</label>
46
+ <v-select
47
+ :value.sync="modelinfo.f_rank"
48
+ :search="false"
49
+ class="select_list select"
50
+ v-model="modelinfo.f_rank"
51
+ :options='reportState' placeholder='请选择'
52
+ close-on-select></v-select>
53
+ </td>
54
+ </tr>
55
+ <tr style="display:block;margin:15px 0;">
56
+ <td style="text-align: right;width: 50%;"><button class="button_clear button_spacing" @click="filtrate=!filtrate">返回</button></td>
57
+ <td style="text-align: right;width: 25%;"><button class="button_clear button_spacing" @click="clear()">清空</button></td>
58
+ <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="chaxun()">查询</button></td>
59
+ </tr>
60
+ <tr style="display:block;margin:15px 0;" v-for="(key,value) in infos">
61
+ <td style="text-align: left;">
62
+ <label class="font_normal_body" style="text-align: right;">{{key}}:</label>
63
+ <input type="text" style="width: 70%;" class="input_search" v-model="value" v-bind:title="[key =='报表状态'?'1表示显示其他表示不显示':'']"/>
64
+ </td>
65
+ </tr>
66
+ <tr style="display:block;margin:15px 0;">
67
+ <td style="text-align: right;width: 50%;"><button class="button_clear button_spacing" @click="saveOrUpdate(1)">修改</button></td>
68
+ <td style="text-align: right;width: 25%;"><button class="button_clear button_spacing" @click="clear(true)">清空</button></td>
69
+ <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
70
+ </tr>
71
+ </table>
72
+ </div>
73
+
74
+ </div>
75
+ </partial-view>
76
+ </div>
77
+ </template>
78
+
79
+ <script>
80
+ import {HttpResetClass} from "vue-client";
81
+
82
+ export default {
83
+ title: '报表选项',
84
+ props: {
85
+ inindex:{}
86
+ },
87
+ data () {
88
+ return {
89
+ types: [],
90
+ row:null,
91
+ infos: {
92
+ '报表名称': '',
93
+ '连接页面': '',
94
+ '报表类型': '',
95
+ '图片路径': '',
96
+ '添 加 人': '',
97
+ '报表状态': ''
98
+ },
99
+ styles:this.$appdata.getSingleValue('报表样式')?this.$appdata.getSingleValue('报表样式'):'2',
100
+ saveinfo:{},
101
+ filtrate:false,
102
+ modelinfo: {
103
+ f_report_name: '',
104
+ f_report_type: '',
105
+ f_rank: '1'
106
+ },
107
+ config:{
108
+ f_report_name: '报表名称',
109
+ f_report_path: '连接页面',
110
+ f_report_type: '报表类型',
111
+ f_image_path: '图片路径',
112
+ f_operator: '添 加 人',
113
+ f_rank: '报表状态'
114
+ },
115
+ conditionStr:'1=1',
116
+ reportNames: [],
117
+ reportTypes: [],
118
+ reportState : [{label: '全部', value: ''},{label: '显示', value: '1'},{label: '未显示', value: 'null'},],
119
+ tablename: 't_report_type'
120
+ }
121
+ },
122
+ ready (){
123
+ // 获取所有报表类型
124
+ this.getReportInfo(null,'1=1 and f_rank=1')
125
+ this.getReportName()
126
+ this.getReportType()
127
+ },
128
+ methods: {
129
+ getReportInfo(tname,cond){
130
+ this.$refs.pv.load('rs/sql/manageSingleTable', {
131
+ data: {
132
+ tablename: tname ? tname:this.tablename,
133
+ condition: cond ? cond:this.conditionStr
134
+ }
135
+ }).then((res) => {
136
+ this.types = res.data
137
+ }).catch((error) => {
138
+
139
+ })
140
+ },
141
+ chaxun(){
142
+ this.getReportInfo()
143
+ this.filtrate = !this.filtrate
144
+ },
145
+ changecolor(index,type){
146
+ this.row=index
147
+ },
148
+ async getReportName(){
149
+ let HttpReset = new HttpResetClass()
150
+ var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
151
+ data: {
152
+ condition: this.conditionStr,
153
+ tablename: this.tablename,
154
+ groupitem: 'f_report_name',
155
+ orderitem: 'f_report_name',
156
+ items: 'f_report_name'
157
+ }
158
+ }, {resolveMsg: null, rejectMsg: '获取报表名称失败!'})
159
+ let nameArr = [{label: '全部', value: ''}]
160
+ for (let row of data.data){
161
+ nameArr.push({label: row.f_report_name, value: row.f_report_name})
162
+ }
163
+ this.reportNames = nameArr
164
+ },
165
+ clear(val){
166
+ if(val){
167
+ for (let key in this.infos) {
168
+ this.infos[key] =''
169
+ }
170
+ }else{
171
+ for (let key in this.modelinfo) {
172
+ this.modelinfo[key] =[]
173
+ }
174
+ }
175
+ },
176
+ async getReportType(){
177
+ let HttpReset = new HttpResetClass()
178
+ var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
179
+ data: {
180
+ condition: this.conditionStr,
181
+ tablename: this.tablename,
182
+ groupitem: 'f_report_type',
183
+ orderitem: 'f_report_type',
184
+ items: 'f_report_type'
185
+ }
186
+ }, {resolveMsg: null, rejectMsg: '获取报表类型失败!'})
187
+ let typeArr = [{label: '全部', value: ''}]
188
+ for (let row of data.data){
189
+ typeArr.push({label: row.f_report_type, value: row.f_report_type})
190
+ }
191
+ this.reportTypes = typeArr
192
+ },
193
+ saveOrUpdate(val){
194
+ // let sv={}
195
+ for(let [key, value] of Object.entries(this.config)){
196
+ let vl=this.infos[value]
197
+ this.saveinfo[key]=vl
198
+ }
199
+ this.saveinfo['type']=val
200
+
201
+ this.$resetpost('rs/logic/saveReport', this.saveinfo, {resolveMsg: '恭喜!提交成功!', rejectMsg: '提交错误!'}).then((res) => {
202
+ this.$showAlert('保存成功', 'success', 3000)
203
+ this.getReportInfo(null,'1=1 and f_rank=1')
204
+ this.filtrate=!this.filtrate
205
+ })
206
+ console.log('this.saveinfo+++++',this.saveinfo)
207
+ }
208
+ },
209
+ watch :{
210
+ 'modelinfo': {
211
+ deep: true,
212
+ handler(val) {
213
+ let c='1=1 '
214
+ for (let [key, value] of Object.entries(val)) {
215
+ if (value && value!='') {
216
+ if(key=='f_rank' && value=='null'){
217
+ c+='and '+ key + " is " + value +' or '+ key +" = ''"
218
+ }else{
219
+ c+='and '+ key + " in ('" + value.toString().replace(new RegExp(',','g'),"','") + "') "
220
+ }
221
+
222
+ }
223
+ }
224
+ this.conditionStr = c
225
+ }
226
+ },
227
+ 'inindex' (val){
228
+ this.infos={}
229
+ this.saveinfo=this.types[val]
230
+ let flag={}
231
+ for(let [key, value] of Object.entries(this.saveinfo)){
232
+ let name=this.config[key]
233
+ if (name!=null){
234
+ flag[name]=value
235
+ }
236
+ }
237
+ this.infos=flag
238
+ }
239
+ }
240
+ }
241
+ </script>
@@ -27,16 +27,27 @@
27
27
  >
28
28
  </datepicker>
29
29
  </div>
30
- <div class="col-sm-2 form-group ">
31
- <label class="font_normal_body">客户编号</label>
32
- <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
33
- condition="f_userinfo_code = '{}' " placeholder="客户编号">
34
- </div>
35
- <div class="col-sm-2 form-group">
36
- <label class="font_normal_body">客户名称</label>
37
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
- condition="f_user_name like '%{}%'" placeholder="客户名称">
30
+ <div class="col-sm-3 form-group" >
31
+ <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
32
+ <right-tree id="org"
33
+ @re-res="$parent.$parent.getRes" style="width: 60%">
34
+ </right-tree>
39
35
  </div>
36
+ <!-- <res-select-group-->
37
+ <!-- :initres="$parent.$parent.initres"-->
38
+ <!-- :show-component="['company']"-->
39
+ <!-- @re-res="$parent.$parent.getRes" v-ref:sel>-->
40
+ <!-- </res-select-group>-->
41
+ <!-- <div class="col-sm-2 form-group ">-->
42
+ <!-- <label class="font_normal_body">客户编号</label>-->
43
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"-->
44
+ <!-- condition="f_userinfo_code = '{}' " placeholder="客户编号">-->
45
+ <!-- </div>-->
46
+ <!-- <div class="col-sm-2 form-group">-->
47
+ <!-- <label class="font_normal_body">客户名称</label>-->
48
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
49
+ <!-- condition="f_user_name like '%{}%'" placeholder="客户名称">-->
50
+ <!-- </div>-->
40
51
 
41
52
  <div class="span" style="float:right;">
42
53
  <button class="button_search button_spacing" @click="search()">查询</button>
@@ -59,20 +70,20 @@
59
70
  <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
60
71
  </div>
61
72
  </div>
62
- <div class="row" v-show="$parent.$parent.criteriaShow">
63
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
64
- <div class="col-sm-2 form-group">
65
- <label class="font_normal_body">客户电话</label>
66
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
67
- condition="f_user_phone like '%{}%'" placeholder="客户电话">
68
- </div>
69
- <div class="col-sm-2 form-group">
70
- <label class="font_normal_body">客户地址</label>
71
- <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
72
- condition="f_address like '%{}%'" placeholder='客户地址'>
73
- </div>
73
+ <!-- <div class="row" v-show="$parent.$parent.criteriaShow">-->
74
+ <!-- -->
75
+ <!-- <div class="col-sm-2 form-group">-->
76
+ <!-- <label class="font_normal_body">客户电话</label>-->
77
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"-->
78
+ <!-- condition="f_user_phone like '%{}%'" placeholder="客户电话">-->
79
+ <!-- </div>-->
80
+ <!-- <div class="col-sm-2 form-group">-->
81
+ <!-- <label class="font_normal_body">客户地址</label>-->
82
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
83
+ <!-- condition="f_address like '%{}%'" placeholder='客户地址'>-->
84
+ <!-- </div>-->
74
85
 
75
- </div>
86
+ <!-- </div>-->
76
87
  </div>
77
88
  </criteria>
78
89
 
@@ -200,7 +211,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
200
211
  defaultPrint: ['f_account', 'f_pre_pay', 'f_month']
201
212
  },
202
213
  footer:[],
203
- model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
214
+ model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp'},{
204
215
  f_last_balance:0,
205
216
  f_account:0,
206
217
  f_wechat_pay:0,
@@ -210,6 +221,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
210
221
  f_sum_pay:0,
211
222
  f_balance:0
212
223
  }),
224
+ f_orgid: '',
225
+ orgname: '',
213
226
  criteriaShow: false,
214
227
  orgCondtionStr: '',
215
228
  modelval: [],
@@ -258,16 +271,28 @@ import {HttpResetClass, PagedList} from 'vue-client'
258
271
 
259
272
 
260
273
  selfSearch(args) {
261
- args.condition = `${args.condition}` + this.orgCondtionStr
262
- new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
263
- {
264
- condition:args.condition,
265
- startDate:args.model.startDate,
266
- endDate:args.model.endDate
267
- }).then(res =>{
268
- this.model.search(args.condition, args.model)
269
- this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
270
- })
274
+ let orgcondition = '1=1'
275
+ if(this.f_orgid[0]){
276
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
277
+ }
278
+ args.condition = orgcondition
279
+ let s = new Date(new Date().getFullYear(), new Date().getMonth(), 1)
280
+ let e = new Date(args.model.endDate)
281
+ if (s <= e) {
282
+ args.model.temp = true
283
+ }else {
284
+ args.model.temp = false
285
+ }
286
+ this.model.search(args.condition, args.model)
287
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
288
+ // new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
289
+ // {
290
+ // condition:args.condition,
291
+ // startDate:args.model.startDate,
292
+ // endDate:args.model.endDate
293
+ // }).then(res =>{
294
+ //
295
+ // })
271
296
  },
272
297
  clear() {
273
298
  //清空部门和人员
@@ -285,9 +310,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
285
310
  hidden() {
286
311
  this.criteriaShow = !this.criteriaShow
287
312
  },
288
- getRes(obj) {
289
- console.log(obj,"========")
290
- this.orgCondtionStr = obj
313
+ // getRes(obj) {
314
+ // console.log(obj,"========")
315
+ // this.orgCondtionStr = obj
316
+ // },
317
+ getRes (obj) {
318
+ this.orgname = obj.res[0]
319
+ this.f_orgid = obj.resids
291
320
  },
292
321
  stamp() {
293
322
  this.all = false
@@ -356,7 +385,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
356
385
  return {
357
386
  startDate: this.$refs.paged.$refs.cri.model.startDate,
358
387
  endDate: this.$refs.paged.$refs.cri.model.endDate,
359
- condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
388
+ condition: this.$refs.paged.model.condition,
389
+ temp: this.$refs.paged.$refs.cri.model.temp
360
390
  }
361
391
  },
362
392
  getfield() {