manage-client 3.2.78 → 3.2.79-jb

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 (33) hide show
  1. package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
  2. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  3. package/build/dev-server.js +176 -176
  4. package/package.json +107 -101
  5. package/src/components/SellReport/OperatorCheckoutTwo.vue +210 -210
  6. package/src/components/sale/businessquery/ChargeQuery.vue +1276 -1277
  7. package/src/components/sale/config/exportConfig.js +925 -925
  8. package/src/components/sale/filesquery/RecordInfoQuery.vue +5 -4
  9. package/src/components/webmeter/gasStatistics/GasStatistics.vue +3 -8
  10. package/src/components/webmeter/instruction/NewQueryInstruct.vue +446 -446
  11. package/src/filiale/jinbin/exportConfig.js +1110 -0
  12. package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +1372 -0
  13. package/src/filiale/jinbin/sale.js +7 -0
  14. package/src/filiale/macheng/RecordInfoQuery.vue +1023 -1023
  15. package/src/filiale/macheng/config/exportConfig.js +67 -67
  16. package/src/filiale/macheng/sale.js +11 -11
  17. package/src/main.js +66 -66
  18. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  19. package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
  20. package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
  21. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  22. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  23. package/build/tmp/jar/MANIFEST.MF +0 -2
  24. package/src/filiale/macheng/FxGasTable.vue +0 -236
  25. package/src/filiale/macheng/ManageBusSummary.vue +0 -224
  26. package/src/filiale/macheng/ManageDayGas.vue +0 -248
  27. package/src/filiale/macheng/ManageHandSellMoney.vue +0 -249
  28. package/src/filiale/macheng/ManageMonthGas.vue +0 -250
  29. package/src/filiale/macheng/ManageOtherCharge.vue +0 -251
  30. package/src/filiale/macheng/ManageSellType.vue +0 -287
  31. package/src/filiale/macheng/SellingTable.vue +0 -219
  32. package/src/filiale/macheng/UserBalanceReport.vue +0 -178
  33. package/src/filiale/macheng/reportManage.js +0 -19
@@ -1,11 +1,11 @@
1
1
  <template>
2
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>
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
5
  <p class="bg-info text-center" style="padding: 8px;">操作员结账报表</p>
6
- <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
6
+ <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
- <div class="row">
8
+ <div class="row">
9
9
  <div class="col-sm-4" >
10
10
  <label class="font_normal_body" for="startDate">开始日期:</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
@@ -30,234 +30,234 @@
30
30
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
31
31
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
32
  </div>
33
- <div class="col-sm-4">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
35
- <res-select restype='department'
36
- @res-select="$parent.$parent.getdep"
37
- :parentresid="$parent.$parent.depresid"
38
- :initresid='$parent.$parent.depid'>
39
- </res-select>
33
+ <div class="col-sm-4">
34
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
35
+ <res-select restype='department'
36
+ @res-select="$parent.$parent.getdep"
37
+ :parentresid="$parent.$parent.depresid"
38
+ :initresid='$parent.$parent.depid'>
39
+ </res-select>
40
40
 
41
+ </div>
42
+ <div class="col-sm-4">
43
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
44
+ <res-select restype='user'
45
+ @res-select="$parent.$parent.getuser"
46
+ :parentresid="$parent.$parent.userresid"
47
+ :initresid='$parent.$parent.operatorid'>
48
+ </res-select>
49
+ </div>
41
50
  </div>
42
- <div class="col-sm-4">
43
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
44
- <res-select restype='user'
45
- @res-select="$parent.$parent.getuser"
46
- :parentresid="$parent.$parent.userresid"
47
- :initresid='$parent.$parent.operatorid'>
48
- </res-select>
49
- </div>
50
- </div>
51
51
  <div class="span" style = "float:right;">
52
52
  <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
- <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
- <report-excel id='gasprice'></report-excel>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
55
  </div>
56
56
  </div>
57
- </criteria>
58
- <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
- <table class='tableprint' style="margin: 0px auto">
60
- <thead>
61
- <tr>
62
- <th colspan='17' style="font-weight: normal; text-align: left;">
63
- <h3 style="text-align: center">结账报表</h3>
64
- </th>
65
- </tr>
66
- <tr>
67
- <th colspan='17' style="font-weight: normal; text-align: center;">
68
- 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
69
- 结束时间:{{ model.model.endDate }}
70
- </th>
71
- </tr>
72
- <tr>
73
- <th colspan='17' style="font-weight: normal; text-align: center;">
74
- <div>
75
- <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
76
- <span v-show="$parent.operatorname.trim()!=''">人员:{{$parent.operatorname}}</span>
77
- </div>
78
- </th>
79
- </tr>
80
- </thead>
81
- <tr>
82
- <td colspan='17'>
83
- {{{ model.data.substring(26,model.data.length-8) }}}
84
- </td>
85
- </tr>
86
- </table>
87
- {{{ $parent.reportStr}}}
88
- </div>
89
- </criteria-paged>
90
- <modal :show.sync="show" v-ref:modal small backdrop="false">
91
- <header slot="modal-header" class="modal-header">
92
- <h4 class="modal-title">输入文件名称</h4>
93
- </header>
94
- <article slot="modal-body" class="modal-body">
95
- <div class="form-group">
96
- <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto">
60
+ <thead>
61
+ <tr>
62
+ <th colspan='17' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">结账报表</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th colspan='17' style="font-weight: normal; text-align: center;">
68
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
69
+ 结束时间:{{ model.model.endDate }}
70
+ </th>
71
+ </tr>
72
+ <tr>
73
+ <th colspan='17' style="font-weight: normal; text-align: center;">
74
+ <div>
75
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
76
+ <span v-show="$parent.operatorname.trim()!=''">人员:{{$parent.operatorname}}</span>
77
+ </div>
78
+ </th>
79
+ </tr>
80
+ </thead>
81
+ <tr>
82
+ <td colspan='17'>
83
+ {{{ model.data.substring(26,model.data.length-8) }}}
84
+ </td>
85
+ </tr>
86
+ </table>
87
+ {{{ $parent.reportStr}}}
97
88
  </div>
98
- </article>
99
- <footer slot="modal-footer" class="modal-footer">
100
- <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
101
- <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
102
- </footer>
103
- </modal>
89
+ </criteria-paged>
90
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
91
+ <header slot="modal-header" class="modal-header">
92
+ <h4 class="modal-title">输入文件名称</h4>
93
+ </header>
94
+ <article slot="modal-body" class="modal-body">
95
+ <div class="form-group">
96
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
97
+ </div>
98
+ </article>
99
+ <footer slot="modal-footer" class="modal-footer">
100
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
101
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
102
+ </footer>
103
+ </modal>
104
104
  </div>
105
105
  </template>
106
106
 
107
107
  <script>
108
- import { DataModel } from 'vue-client'
109
- import co from 'co'
110
- let saveFile = function * (self) {
111
- // 线验证文件是否重名
112
- let count = yield self.$resetpost('rs/sql/manageSingleTable',
113
- {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
114
- {resolveMsg: null, rejectMsg: null})
115
- if (count.data.length > 0) {
116
- self.$showAlert('无法保存,文件名重名', 'warning', 3000)
117
- return
118
- }
119
- let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
120
- f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
121
- f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
122
- f_outlets: this.$login.f.depname})
123
- if (saveBack.data.status === 'succeed') {
124
- self.show = false
125
- self.filename = ''
126
- // 后台保存完成,通知刷新
127
- self.$dispatch('save-success', self.filename)
128
- }
108
+ import { DataModel } from 'vue-client'
109
+ import co from 'co'
110
+ let saveFile = function * (self) {
111
+ // 线验证文件是否重名
112
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
113
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
114
+ {resolveMsg: null, rejectMsg: null})
115
+ if (count.data.length > 0) {
116
+ self.$showAlert('无法保存,文件名重名', 'warning', 3000)
117
+ return
129
118
  }
130
- export default {
131
- title: '结账报表',
132
- props: ['data'],
133
- data () {
134
- return {
135
- printTime: this.$login.toStandardTimeString(),
136
- depresid: [],
137
- userresid: [],
138
- f_orgid: this.$login.f.orgid,
139
- f_depid: this.$login.f.depids,
140
- f_operatorid: this.$login.f.id,
141
- operatorid: [],
142
- depid: [],
143
- orgname: '',
144
- depname: '',
145
- qishiDate:'',
146
- jieshuDate:'',
147
- startDate:'',
148
- endDate:'',
149
- operatorname: '',
150
- f_inputtor:[],
151
- f_user_type:'',
152
- orgCondtionStr: '1=1',
153
- model: new DataModel('rs/report/checkoutReportTwo',
154
- {startDate: 'this.model.startDate',
155
- endDate: 'this.model.endDate',
156
- f_orgid: 'this.model.f_orgid',
157
- depname:'this.model.depname',
158
- operatorname:'this.model.operatorname',
159
- qishiDate:'this.model.startDate.substring(0,10)',
160
- jieshuDate:'this.model.endDate.substring(0,10)'
161
- },
162
- ),
119
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
120
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
121
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
122
+ f_outlets: this.$login.f.depname})
123
+ if (saveBack.data.status === 'succeed') {
124
+ self.show = false
125
+ self.filename = ''
126
+ // 后台保存完成,通知刷新
127
+ self.$dispatch('save-success', self.filename)
128
+ }
129
+ }
130
+ export default {
131
+ title: '结账报表',
132
+ props: ['data'],
133
+ data () {
134
+ return {
135
+ printTime: this.$login.toStandardTimeString(),
136
+ depresid: [],
137
+ userresid: [],
138
+ f_orgid: this.$login.f.orgid,
139
+ f_depid: this.$login.f.depids,
140
+ f_operatorid: this.$login.f.id,
141
+ operatorid: [],
142
+ depid: [],
143
+ orgname: '',
144
+ depname: '',
145
+ qishiDate:'',
146
+ jieshuDate:'',
147
+ startDate:'',
148
+ endDate:'',
149
+ operatorname: '',
150
+ f_inputtor:[],
151
+ f_user_type:'',
152
+ orgCondtionStr: '1=1',
153
+ model: new DataModel('rs/report/checkoutReportTwo',
154
+ {startDate: 'this.model.startDate',
155
+ endDate: 'this.model.endDate',
156
+ f_orgid: 'this.model.f_orgid',
157
+ depname:'this.model.depname',
158
+ operatorname:'this.model.operatorname',
159
+ qishiDate:'this.model.startDate.substring(0,10)',
160
+ jieshuDate:'this.model.endDate.substring(0,10)'
161
+ },
162
+ ),
163
163
 
164
- reportStr: null,
165
- show: false
166
- }
167
- },
168
- ready () {
169
- this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
170
- this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
171
- this.$refs.paged.$refs.criteria.search()
172
- console.log(this.$login.f)
173
- },
164
+ reportStr: null,
165
+ show: false
166
+ }
167
+ },
168
+ ready () {
169
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
170
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
171
+ this.$refs.paged.$refs.criteria.search()
172
+ console.log(this.$login.f)
173
+ },
174
174
 
175
- methods: {
175
+ methods: {
176
176
 
177
- searchData () {
178
- this.$refs.paged.$refs.criteria.search()
179
- },
180
- selfSearch (args) {
181
- this.printTime = this.$login.toStandardTimeString()
182
- let orgcondition = '1 = 1'
183
- if (this.f_orgid[0]){
184
- orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
185
- }
186
- if (this.f_depid[0]) {
187
- orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
188
- }
189
- if(this.f_operatorid[0]) {
190
- orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
191
- }
192
- if(this.depname){
193
- this.$refs.paged.$refs.criteria.model.depname = this.depname
194
- }else{
195
- this.$refs.paged.$refs.criteria.model.depname = '无'
196
- }
177
+ searchData () {
178
+ this.$refs.paged.$refs.criteria.search()
179
+ },
180
+ selfSearch (args) {
181
+ this.printTime = this.$login.toStandardTimeString()
182
+ let orgcondition = '1 = 1'
183
+ if (this.f_orgid[0]){
184
+ orgcondition += ` and f_orgid in ('${this.f_orgid.toString().replace(/,/g,"','")}')`
185
+ }
186
+ if (this.f_depid[0]) {
187
+ orgcondition += ` and f_depid in ('${this.f_depid.toString().replace(/,/g,"','")}')`
188
+ }
189
+ if(this.f_operatorid[0]) {
190
+ orgcondition += ` and f_operatorid in ('${this.f_operatorid.toString().replace(/,/g,"','")}')`
191
+ }
192
+ if(this.depname){
193
+ this.$refs.paged.$refs.criteria.model.depname = this.depname
194
+ }else{
195
+ this.$refs.paged.$refs.criteria.model.depname = '无'
196
+ }
197
197
 
198
- if(this.operatorname){
199
- this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
200
- }else{
201
- this.$refs.paged.$refs.criteria.model.operatorname = '无'
202
- }
203
- this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
204
- this.$refs.paged.search(args)
205
- },
206
- getRes (obj) {
207
- this.orgname = obj.res[0]
208
- this.depresid = obj.resids
209
- this.f_orgid = obj.resids
210
- },
211
- getdep (obj, val) {
212
- this.depname = val[0]
213
- this.userresid = obj
214
- this.f_depid = obj
215
- },
216
- getuser ( obj, val) {
217
- this.operatorname = val[0]
218
- this.f_operatorid = obj
219
- },
220
- // 根据文件路径获取储存的报表内容
221
- getFileContent (path) {
222
- this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
223
- this.reportStr = res.data.filecontent
224
- this.model.state = '正确'
225
- })
226
- },
227
- confirm () {
228
- if (!this.filename || this.filename === '') {
229
- this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
230
- }
231
- let saveGen = saveFile(this)
232
- co(saveGen)
233
- },
234
- close () {
235
- this.show = false
236
- },
237
- // 将报表保存成文件
238
- confirmReport () {
239
- this.show = true
240
- this.filename = this.data.f_report_name + this.$login.toStandardDateString()
241
- },
198
+ if(this.operatorname){
199
+ this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
200
+ }else{
201
+ this.$refs.paged.$refs.criteria.model.operatorname = '无'
202
+ }
203
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
204
+ this.$refs.paged.search(args)
205
+ },
206
+ getRes (obj) {
207
+ this.orgname = obj.res[0]
208
+ this.depresid = obj.resids
209
+ this.f_orgid = obj.resids
242
210
  },
243
- watch: {
244
- 'data' (val) {
245
- if (val.f_files_path) {
246
- this.getFileContent(val.f_files_path)
247
- } else {
248
- this.reportStr = null
249
- }
211
+ getdep (obj, val) {
212
+ this.depname = val[0]
213
+ this.userresid = obj
214
+ this.f_depid = obj
215
+ },
216
+ getuser ( obj, val) {
217
+ this.operatorname = val[0]
218
+ this.f_operatorid = obj
219
+ },
220
+ // 根据文件路径获取储存的报表内容
221
+ getFileContent (path) {
222
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
223
+ this.reportStr = res.data.filecontent
224
+ this.model.state = '正确'
225
+ })
226
+ },
227
+ confirm () {
228
+ if (!this.filename || this.filename === '') {
229
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
250
230
  }
231
+ let saveGen = saveFile(this)
232
+ co(saveGen)
233
+ },
234
+ close () {
235
+ this.show = false
251
236
  },
252
- computed: {
253
- usertypes() {
254
- return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
237
+ // 将报表保存成文件
238
+ confirmReport () {
239
+ this.show = true
240
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
241
+ },
242
+ },
243
+ watch: {
244
+ 'data' (val) {
245
+ if (val.f_files_path) {
246
+ this.getFileContent(val.f_files_path)
247
+ } else {
248
+ this.reportStr = null
255
249
  }
256
250
  }
251
+ },
252
+ computed: {
253
+ usertypes() {
254
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
255
+ }
257
256
  }
257
+ }
258
258
  </script>
259
259
  <style scoped>
260
- .noborder{
261
- border: none;
262
- }
260
+ .noborder{
261
+ border: none;
262
+ }
263
263
  </style>