manage-client 4.1.121 → 4.1.122

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.
@@ -6,131 +6,102 @@ const proxyMiddleware = require('http-proxy-middleware')
6
6
  const app = express()
7
7
  const compiler = webpack(config)
8
8
 
9
- const server = 'http://123.57.3.66:31467'
9
+ const server = 'http://192.168.50.67:31567/'
10
10
  const local = 'http://127.0.0.1:9026/'
11
11
  const proxyTable = {
12
+ '/rs/logic/exportfile': {
13
+ target: server
14
+ },
12
15
  '/dataManage': {
13
- target: server,
14
- changeOrigin: true,
15
- secure: false
16
+ target: server
16
17
  },
17
- '/api/af-revenue/logic': {
18
+ '/api/af-revenue/sql/': {
18
19
  pathRewrite: {
19
- '^/api/af-revenue/logic': '/logic'
20
+ '^/api/af-revenue': '/'
20
21
  },
21
- target: local,
22
- changeOrigin: true,
23
- secure: false
22
+ target: local
24
23
  },
25
- '/api/af-revenue/sql': {
24
+ '/api/af-revenue/report/': {
26
25
  pathRewrite: {
27
- '^/api/af-revenue/sql': '/singlepage/api/af-revenue/sql'
26
+ '^/api/af-revenue': '/'
28
27
  },
29
- target: server,
30
- changeOrigin: true,
31
- secure: false
28
+ target: local
29
+ },
30
+ '/api/af-revenue/logic': {
31
+ pathRewrite: {
32
+ '^/api/af-revenue': '/'
33
+ },
34
+ target: local
32
35
  },
33
- // ... existing code ...
34
36
  '/api': {
35
- target: server,
36
- changeOrigin: true,
37
- secure: false
37
+ target: server
38
+ },
39
+ '/rs/sql/chargeQuery_by_gasproperties': {
40
+ target: server
41
+ },
42
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
43
+ target: server
38
44
  },
39
45
  '/files': {
40
- target: server,
41
- changeOrigin: true,
42
- secure: false
46
+ target: server
43
47
  },
44
48
  // 查找资源服务数据
45
49
  '/rs/search': {
46
- target: server,
47
- changeOrigin: true,
48
- secure: false
50
+ target: server
49
51
  },
50
52
  // 查找资源服务数据
51
53
  '/rs/logic/getLogin': {
52
- target: server,
53
- changeOrigin: true,
54
- secure: false
54
+ target: server
55
55
  },
56
56
  // 查找资源服务数据
57
57
  '/rs/logic/getInitData': {
58
- target: server,
59
- changeOrigin: true,
60
- secure: false
58
+ target: server
61
59
  },
62
60
  '/rs/logic/getSaleInitData': {
63
- target: server,
64
- changeOrigin: true,
65
- secure: false
61
+ target: server
66
62
  },
67
63
  // 用户登录服务地址
68
64
  '/rs/user': {
69
- target: server,
70
- changeOrigin: true,
71
- secure: false
65
+ target: server
72
66
  },
73
67
  '/rs/path/getParams': {
74
- target: server,
75
- changeOrigin: true,
76
- secure: false
68
+ target: server
77
69
  },
78
70
  '/rs/data': {
79
- target: server,
80
- changeOrigin: true,
81
- secure: false
71
+ target: server
82
72
  },
83
73
  '/rs/license': {
84
- target: server,
85
- changeOrigin: true,
86
- secure: false
74
+ target: server
87
75
  },
88
76
  '/rs/db': {
89
- target: server,
90
- changeOrigin: true,
91
- secure: false
77
+ target: server
92
78
  },
93
79
  '/excel': {
94
- target: server,
95
- changeOrigin: true,
96
- secure: false
80
+ target: server
97
81
  },
98
82
  '/rs/config': {
99
- target: server,
100
- changeOrigin: true,
101
- secure: false
83
+ target: server
102
84
  },
103
85
  '/rs/sql/getLicenseById': {
104
- target: server,
105
- changeOrigin: true,
106
- secure: false
86
+ target: server
107
87
  },
108
88
  '/rs/report': {
109
- target: server,
110
- changeOrigin: true,
111
- secure: false
89
+ target: server
112
90
  },
113
91
  '/rs/vue': {
114
- target: server,
115
- changeOrigin: true,
116
- secure: false
92
+ target: server
117
93
  },
118
94
  '/rs/file': {
119
- target: server,
120
- changeOrigin: true,
121
- secure: false
95
+ target: server
122
96
  },
123
97
  '/rs/sql/singleTable': {
124
- target: server,
125
- changeOrigin: true,
126
- secure: false
98
+ target: server
127
99
  },
128
100
  '/rs': {
129
- target: server,
130
- changeOrigin: true,
131
- secure: false
101
+ target: server
132
102
  }
133
103
  }
104
+
134
105
  const devMiddleware = require('webpack-dev-middleware')(compiler, {
135
106
  publicPath: config.output.publicPath,
136
107
  stats: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.121",
3
+ "version": "4.1.122",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,252 @@
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
+ <res-select-group :show-component="$parent.$parent.resshow"
28
+ :selectin="true" :initres="$parent.$parent.initres"
29
+ :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel>
30
+ </res-select-group>
31
+ <div class="col-sm-2 form-group">
32
+ <label class="font_normal_body" title="参数:报表1收费类型">收费类型</label>
33
+ <v-select :value.sync="$parent.$parent.f_charge_type"
34
+ v-ref:f_charge_type
35
+ v-model="$parent.$parent.f_charge_type"
36
+ :options='$parent.$parent.chargeTypes'
37
+ placeholder='请选择'
38
+ :multiple="true">
39
+ </v-select>
40
+ </div>
41
+ <div class="col-sm-2 form-group">
42
+ <label class="font_normal_body" title="参数:报表1用气性质">用气性质</label>
43
+ <v-select :value.sync="$parent.$parent.f_gasproperties"
44
+ v-ref:gasproperties
45
+ v-model="$parent.$parent.f_gasproperties"
46
+ :options='$parent.$parent.gasproperties'
47
+ placeholder='请选择'
48
+ :multiple="true">
49
+ </v-select>
50
+ </div>
51
+ <div class="col-sm-2 form-group">
52
+ <label class="font_normal_body" title="参数:付款方式">收费方式</label>
53
+ <v-select :value.sync="$parent.$parent.f_payment"
54
+ v-ref:payment
55
+ v-model="$parent.$parent.f_payment"
56
+ :options='$parent.$parent.payments'
57
+ placeholder='请选择'
58
+ :multiple="true">
59
+ </v-select>
60
+ </div>
61
+ </div>
62
+ <div class="span" style = "float:right;">
63
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
64
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
65
+ <report-excel id='gasprice'></report-excel>
66
+ </div>
67
+ </div>
68
+ </criteria>
69
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
70
+ <table class='tableprint' style="margin: 0px auto">
71
+ <thead>
72
+ <tr>
73
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
74
+ <h3 style="text-align: center">气价分组报表</h3>
75
+ </th>
76
+ </tr>
77
+ <tr>
78
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
79
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
80
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
81
+ <!--打印时间:{{{$parent.printTime}}}-->
82
+ 打印时间:{{$parent.printTime}}
83
+ <!--收费员:{{// $parent.operatorname}}-->
84
+ </th>
85
+ </tr>
86
+ <tr>
87
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
88
+ <div>
89
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
90
+ <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>
91
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员:{{$parent.operatorname}}</span>
92
+ </div>
93
+ </th>
94
+ </tr>
95
+ </thead>
96
+ <tr>
97
+ <td :colspan='$parent.spans' class="noborder">
98
+ {{{ model.data.substring(26,model.data.length-8) }}}
99
+ </td>
100
+ </tr>
101
+ <tfoot>
102
+ <tr style="text-align: left">
103
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核:</th>
104
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核:</th>
105
+ <th :colspan='Math.floor($parent.spans/3)'>收款员:</th>
106
+ </tr>
107
+ </tfoot>
108
+ </table>
109
+ {{{ $parent.reportStr }}}
110
+ </div>
111
+ </criteria-paged>
112
+ </div>
113
+ </template>
114
+
115
+ <script>
116
+ import { DataModel } from 'vue-client'
117
+ import co from 'co'
118
+
119
+ export default {
120
+ title: '气价分组报表',
121
+ props: ['data'],
122
+ data () {
123
+ return {
124
+ printTime: this.$login.toStandardTimeString(),
125
+ depresid: [],
126
+ userresid: [],
127
+ f_orgid: this.$login.f.orgid,
128
+ f_depid: this.$login.f.depids,
129
+ // f_operatorid: this.$login.f.id,
130
+ operatorid: [],
131
+ depid: [],
132
+ orgname: '',
133
+ depname: '',
134
+ f_charge_type: '',
135
+ f_gasproperties: '',
136
+ f_payment: '',
137
+ criteriaShow: false,
138
+ operatorname: '',
139
+ orgCondtionStr: '1=1',
140
+ model: new DataModel('api/af-revenue/report/jhPriceReport', {
141
+ startDate: 'this.model.startDate',
142
+ endDate: 'this.model.endDate',
143
+ f_orgid: 'this.model.f_orgid',
144
+ f_charge_type: 'this.model.f_charge_type',
145
+ f_gasproperties: 'this.model.f_gasproperties',
146
+ f_payment: 'this.model.f_payment'
147
+ }),
148
+ reportStr: null,
149
+ resshow: ['company', 'department', 'operator'],
150
+ spans: 0,
151
+ initres: {
152
+ org: [this.$login.f.orgid],
153
+ dep: [],
154
+ user: []
155
+ }
156
+ }
157
+ },
158
+ ready () {
159
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
160
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
161
+ console.log(this.$login.f)
162
+ },
163
+ methods: {
164
+ searchData () {
165
+ this.$refs.paged.$refs.criteria.search()
166
+ },
167
+ appendCondition (data) {
168
+ let stringValue = '('
169
+ for (let i = 0; i < data.length; i++) {
170
+ if (data[i]) {
171
+ if (i === data.length - 1) {
172
+ stringValue = stringValue + "'" + data[i] + "'"
173
+ } else {
174
+ stringValue = stringValue + "'" + data[i] + "',"
175
+ }
176
+ }
177
+ }
178
+ stringValue = stringValue + ')'
179
+ return stringValue
180
+ },
181
+ selfSearch (args) {
182
+ if (this.f_charge_type.length > 0) {
183
+ this.$refs.paged.$refs.criteria.model.f_charge_type = this.appendCondition(this.f_charge_type)
184
+ } else {
185
+ this.$refs.paged.$refs.criteria.model.f_charge_type = ''
186
+ }
187
+ if (this.f_gasproperties.length > 0) {
188
+ this.$refs.paged.$refs.criteria.model.f_gasproperties = this.appendCondition(this.f_gasproperties)
189
+ } else {
190
+ this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
191
+ }
192
+ if (this.f_payment.length > 0) {
193
+ this.$refs.paged.$refs.criteria.model.f_payment = this.appendCondition(this.f_payment)
194
+ } else {
195
+ this.$refs.paged.$refs.criteria.model.f_payment = ''
196
+ }
197
+ this.printTime = this.$login.toStandardTimeString()
198
+ let orgcondition = '1=1'
199
+ let orgstr = this.orgCondtionStr
200
+ orgcondition = orgcondition + orgstr
201
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
202
+ this.$refs.paged.search(args)
203
+ },
204
+ hidden () {
205
+ this.criteriaShow = !this.criteriaShow
206
+ },
207
+ getRes (condition, obj) {
208
+ this.orgCondtionStr = condition
209
+ this.orgname = obj.orgnames[0]
210
+ this.depname = obj.depnames[0]
211
+ this.operatorname = obj.operatornames[0]
212
+ },
213
+ getdep (obj, val) {
214
+ this.depname = val[0]
215
+ this.userresid = obj
216
+ this.f_depid = obj
217
+ },
218
+ getuser (obj, val) {
219
+ this.operatorname = val[0]
220
+ this.f_operatorid = obj
221
+ }
222
+ },
223
+ watch: {
224
+ 'model.data' (val) {
225
+ let len = 0
226
+ let a = val.split('</tr>')
227
+ for (let i = 0; i < a.length; i++) {
228
+ if (a[i].split('</td>').length - 1 > len) {
229
+ len = a[i].split('</td>').length - 1
230
+ }
231
+ }
232
+ this.spans = len
233
+ }
234
+ },
235
+ computed: {
236
+ payments () {
237
+ return this.$appdata.getParam('付款方式')
238
+ },
239
+ gasproperties () {
240
+ return this.$appdata.getParam('报表1用气性质')
241
+ },
242
+ chargeTypes () {
243
+ return this.$appdata.getParam('报表1收费类型')
244
+ }
245
+ }
246
+ }
247
+ </script>
248
+ <style scoped>
249
+ .noborder{
250
+ border: none;
251
+ }
252
+ </style>
@@ -42,10 +42,10 @@
42
42
  <button class="button_search button_spacing" @click="search()">查询</button>
43
43
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
44
44
 
45
- <export-excel :data="$parent.$parent.getCondition"
45
+ <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
46
46
  :field="$parent.$parent.getfield" :header="$parent.$parent.other"
47
47
  :defaultselect="$parent.$parent.defaultexport"
48
- sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="chargeSplitQuery" template-name='收费详情查询导出'
48
+ sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
49
49
  :choose-col="true">
50
50
  </export-excel>
51
51
 
@@ -1157,56 +1157,10 @@
1157
1157
  }
1158
1158
  },
1159
1159
  getfield() {
1160
- return {
1161
- 'id': '收费编号',
1162
- 'f_userinfo_code': '客户编号',
1163
- 'f_olduserinfo_code': '档案编号',
1164
- 'f_user_name': '客户名称',
1165
- 'f_idnumber': '身份证号',
1166
- 'f_user_phone': '客户电话',
1167
- 'f_address': '客户地址',
1168
- 'f_zones': '片区',
1169
- 'f_user_type': '客户类型',
1170
- 'f_gasproperties': '用气性质',
1171
- 'f_meternumber': '表号',
1172
- 'f_meter_brand': '气表品牌',
1173
- 'f_times': '购气次数',
1174
- 'f_price_name': '气价名称',
1175
- 'f_last_tablebase': '上期底数',
1176
- 'f_tablebase': '本期底数',
1177
- 'f_pregas': '气量',
1178
- 'fee': '金额',
1179
- 'f_preamount': '燃气费',
1180
- 'f_collection': '收款',
1181
- 'f_privilege_money': '优惠金额',
1182
- 'f_balance': '上期结余',
1183
- 'f_curbalance': '本期结余',
1184
- 'f_type': '收费类型',
1185
- 'f_payment': '付款方式',
1186
- 'f_bank_type': '支付渠道',
1187
- 'f_state': '状态',
1188
- 'f_operate_date': '收费日期',
1189
- 'f_serial_id': '流水号',
1190
- 'f_delaypay': '违约金',
1191
- 'f_comments': '备注',
1192
- 'f_operator': '操作员',
1193
- 'f_depname': '部门',
1194
- 'f_orgname': '公司',
1195
- 'f_yucun': '预存金额',
1196
- 'f_card_id': '卡号',
1197
- 'f_inputtor': '抄表员',
1198
- 'f_residential_area': '小区',
1199
- 'f_serial_number': '业务单号'
1200
- }
1160
+ return exportConfig.chargeConfig
1201
1161
  },
1202
1162
  defaultexport() {
1203
- return {
1204
- 'f_userinfo_code': '客户编号',
1205
- 'f_user_name': '客户名称',
1206
- 'f_pregas': '气量',
1207
- 'f_payment': '付款方式',
1208
- 'f_collection': '收款'
1209
- }
1163
+ return exportConfig.chargeexportConfig
1210
1164
  },
1211
1165
  pricetypes() {
1212
1166
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]