manage-client-xy 3.2.21 → 3.2.22

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 (4) hide show
  1. package/build/dev-server.js +1 -1
  2. package/package.json +1 -1
  3. package/src/components/SellReport/OrderCenter.vue +197 -197
  4. package/src/components/sale/businessquery/FillCardQuery.vue +14 -2
package/build/dev-server.js CHANGED
@@ -11,7 +11,7 @@ var compiler = webpack(config)
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var bendi = 'http://127.0.0.1:8080/'
14
+ var bendi = 'http://172.16.16.162:8300/'
15
15
  , fuwu = 'http://172.16.16.162:8300/'
16
16
  // ,fuwu = 'http://172.16.16.162:8300/'
17
17
  var proxyTable = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client-xy",
3
- "version": "3.2.21",
3
+ "version": "3.2.22",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/OrderCenter.vue CHANGED
@@ -1,197 +1,197 @@
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
- <p class="bg-info text-center" style="padding: 8px;">咸阳其他收费汇总</p>
6
- <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
- <div class="row">
9
- <div class="col-sm-4">
10
- <label class="font_normal_body" for="startDate">开始日期:</label>
11
- <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
- v-model="model.startDate"
13
- :value.sync="model.startDate"
14
- :disabled-days-of-Week="[]"
15
- :format="'yyyy-MM-dd HH:mm:ss'"
16
- :show-reset-button="reset">
17
- </datepicker>
18
- </div>
19
- <div class="col-sm-4">
20
- <label class="font_normal_body" for="endDate">结束日期:</label>
21
- <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
- v-model="model.endDate"
23
- :value.sync="model.endDate"
24
- :disabled-days-of-Week="[]"
25
- :format="'yyyy-MM-dd HH:mm:ss'"
26
- :show-reset-button="reset">
27
- </datepicker>
28
- </div>
29
- <div class="col-sm-4">
30
- <label class="font_normal_body">&emsp;&emsp;公司:</label>
31
- <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
- </div>
33
- <div class="col-sm-4" style="float:right;">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&emsp;&emsp;&nbsp;&nbsp;&nbsp;</label>
35
- <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
36
- <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
37
- <report-excel id='gasprice'
38
- v-if="$parent.$parent.jurisdiction.includes('excel导出')"
39
- ></report-excel>
40
- </div>
41
- </div>
42
- </div>
43
- </criteria>
44
- <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
45
- <table class='tableprint' style="margin: 0px auto">
46
- <thead>
47
- <tr>
48
- <th colspan='17' style="font-weight: normal; text-align: left;">
49
- <h3 style="text-align: center">线上预约汇总</h3>
50
- </th>
51
- </tr>
52
- <tr>
53
- <th colspan='17' style="font-weight: normal; text-align: center;">
54
- 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
55
- 结束时间：{{ model.model.endDate }}
56
- </th>
57
- </tr>
58
- <tr>
59
- <th colspan='17' style="font-weight: normal; text-align: center;">
60
- 打印时间：{{{$parent.printTime}}}
61
- </th>
62
- </tr>
63
- <tr>
64
- <th colspan='17' style="font-weight: normal; text-align: center;">
65
- <div>
66
- <span v-show="$parent.orgname.trim()!=''">公司：{{ $parent.orgname }}</span>
67
- <span v-show="$parent.depname.trim()!=''"> 部门：{{ $parent.depname }}</span>
68
- <span v-show="$parent.operatorname.trim()!=''">人员：{{ $parent.operatorname }}</span>
69
- </div>
70
- </th>
71
- </tr>
72
- </thead>
73
- <tr>
74
- <td colspan='17'>
75
- {{{ model.data.substring(26,model.data.length-8) }}}
76
- </td>
77
- </tr>
78
- </table>
79
- {{{ $parent.reportStr}}}
80
- </div>
81
- </criteria-paged>
82
- </div>
83
- </template>
84
-
85
- <script>
86
- import {DataModel} from 'vue-client'
87
- import co from 'co'
88
-
89
- export default {
90
- title: '咸阳其他收费汇总',
91
- props: ['data'],
92
- data() {
93
- return {
94
- printTime: this.$login.toStandardTimeString(),
95
- depresid: [],
96
- userresid: [],
97
- f_orgid: this.$login.f.orgid,
98
- f_depid: this.$login.f.depids,
99
- f_operatorid: this.$login.f.id,
100
- jurisdiction: this.$login.r,
101
- operatorid: [],
102
- depid: [],
103
- orgname: '',
104
- depname: '',
105
- operatorname: '',
106
- f_inputtor: [],
107
- f_user_type: '',
108
- orgCondtionStr: '1=1',
109
- model: new DataModel('rs/report/orderCenter', {
110
- startDate: 'this.model.startDate',
111
- endDate: 'this.model.endDate',
112
- f_orgid: 'this.model.f_orgid'
113
- }),
114
- reportStr: null
115
- }
116
- },
117
- ready() {
118
- this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
119
- this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
120
- this.$refs.paged.$refs.criteria.search()
121
- console.log(this.$login.f)
122
- },
123
- methods: {
124
- searchData() {
125
- this.$refs.paged.$refs.criteria.search()
126
- },
127
- selfSearch(args) {
128
- console.log(args.condition + 'yyyqqq')
129
- this.printTime = this.$login.toStandardTimeString()
130
- let orgCondition = '1=1'
131
- if (this.f_orgid[0]) {
132
- let id = this.f_orgid.toString()
133
- let ids = id.split(',')
134
- console.log('几个公司:' + ids.length)
135
- let orgids = ''
136
- let f_orgids = ''
137
- if (ids.length === 1) {
138
- f_orgids += "'" + ids[0] + "'"
139
- } else {
140
- for (let i = 0; i < ids.length; i++) {
141
- console.log('id = ' + ids[i])
142
- orgids += "'" + ids[i] + "',"
143
- }
144
- f_orgids = orgids.substring(0, orgids.length - 1)
145
- }
146
-
147
- orgCondition += " and f_orgstr in ( " + f_orgids + " ) "
148
- console.log('f_orgids:' + f_orgids)
149
- }
150
- this.$refs.paged.$refs.criteria.model.f_orgid = orgCondition
151
- this.$refs.paged.search(args)
152
- },
153
- getRes(obj) {
154
- this.orgname = obj.res[0]
155
- this.depresid = obj.resids
156
- this.f_orgid = obj.resids
157
- this.userresid = obj.resids
158
- },
159
- getdep(obj, val) {
160
- this.depname = val[0]
161
- this.f_depid = obj
162
- },
163
- getuser(obj, val) {
164
- this.operatorname = val[0]
165
- this.f_operatorid = obj
166
- },
167
- // 根据文件路径获取储存的报表内容
168
- getFileContent(path) {
169
- this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {
170
- resolveMsg: null,
171
- rejectMsg: null
172
- }).then((res) => {
173
- this.reportStr = res.data.filecontent
174
- this.model.state = '正确'
175
- })
176
- },
177
- close() {
178
- this.show = false
179
- }
180
- },
181
- watch: {
182
- 'data'(val) {
183
- if (val.f_files_path) {
184
- this.getFileContent(val.f_files_path)
185
- } else {
186
- this.reportStr = null
187
- }
188
- }
189
- },
190
- computed: {}
191
- }
192
- </script>
193
- <style scoped>
194
- .noborder {
195
- border: none;
196
- }
197
- </style>
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
+ <p class="bg-info text-center" style="padding: 8px;">咸阳其他收费汇总</p>
6
+ <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <div class="col-sm-4">
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-4">
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-4">
30
+ <label class="font_normal_body">&emsp;&emsp;公司:</label>
31
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
+ </div>
33
+ <div class="col-sm-4" style="float:right;">
34
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&emsp;&emsp;&nbsp;&nbsp;&nbsp;</label>
35
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
36
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
37
+ <report-excel id='gasprice'
38
+ v-if="$parent.$parent.jurisdiction.includes('excel导出')"
39
+ ></report-excel>
40
+ </div>
41
+ </div>
42
+ </div>
43
+ </criteria>
44
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
45
+ <table class='tableprint' style="margin: 0px auto">
46
+ <thead>
47
+ <tr>
48
+ <th colspan='17' style="font-weight: normal; text-align: left;">
49
+ <h3 style="text-align: center">线上预约汇总</h3>
50
+ </th>
51
+ </tr>
52
+ <tr>
53
+ <th colspan='17' style="font-weight: normal; text-align: center;">
54
+ 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
55
+ 结束时间：{{ model.model.endDate }}
56
+ </th>
57
+ </tr>
58
+ <tr>
59
+ <th colspan='17' style="font-weight: normal; text-align: center;">
60
+ 打印时间：{{{$parent.printTime}}}
61
+ </th>
62
+ </tr>
63
+ <tr>
64
+ <th colspan='17' style="font-weight: normal; text-align: center;">
65
+ <div>
66
+ <span v-show="$parent.orgname.trim()!=''">公司：{{ $parent.orgname }}</span>
67
+ <span v-show="$parent.depname.trim()!=''"> 部门：{{ $parent.depname }}</span>
68
+ <span v-show="$parent.operatorname.trim()!=''">人员：{{ $parent.operatorname }}</span>
69
+ </div>
70
+ </th>
71
+ </tr>
72
+ </thead>
73
+ <tr>
74
+ <td colspan='17'>
75
+ {{{ model.data.substring(26,model.data.length-8) }}}
76
+ </td>
77
+ </tr>
78
+ </table>
79
+ {{{ $parent.reportStr}}}
80
+ </div>
81
+ </criteria-paged>
82
+ </div>
83
+ </template>
84
+
85
+ <script>
86
+ import {DataModel} from 'vue-client'
87
+ import co from 'co'
88
+
89
+ export default {
90
+ title: '咸阳其他收费汇总',
91
+ props: ['data'],
92
+ data() {
93
+ return {
94
+ printTime: this.$login.toStandardTimeString(),
95
+ depresid: [],
96
+ userresid: [],
97
+ f_orgid: this.$login.f.orgid,
98
+ f_depid: this.$login.f.depids,
99
+ f_operatorid: this.$login.f.id,
100
+ jurisdiction: this.$login.r,
101
+ operatorid: [],
102
+ depid: [],
103
+ orgname: '',
104
+ depname: '',
105
+ operatorname: '',
106
+ f_inputtor: [],
107
+ f_user_type: '',
108
+ orgCondtionStr: '1=1',
109
+ model: new DataModel('rs/report/orderCenter', {
110
+ startDate: 'this.model.startDate',
111
+ endDate: 'this.model.endDate',
112
+ f_orgid: 'this.model.f_orgid'
113
+ }),
114
+ reportStr: null
115
+ }
116
+ },
117
+ ready() {
118
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
119
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
120
+ this.$refs.paged.$refs.criteria.search()
121
+ console.log(this.$login.f)
122
+ },
123
+ methods: {
124
+ searchData() {
125
+ this.$refs.paged.$refs.criteria.search()
126
+ },
127
+ selfSearch(args) {
128
+ console.log(args.condition + 'yyyqqq')
129
+ this.printTime = this.$login.toStandardTimeString()
130
+ let orgCondition = '1=1'
131
+ if (this.f_orgid[0]) {
132
+ let id = this.f_orgid.toString()
133
+ let ids = id.split(',')
134
+ console.log('几个公司:' + ids.length)
135
+ let orgids = ''
136
+ let f_orgids = ''
137
+ if (ids.length === 1) {
138
+ f_orgids += "'" + ids[0] + "'"
139
+ } else {
140
+ for (let i = 0; i < ids.length; i++) {
141
+ console.log('id = ' + ids[i])
142
+ orgids += "'" + ids[i] + "',"
143
+ }
144
+ f_orgids = orgids.substring(0, orgids.length - 1)
145
+ }
146
+
147
+ orgCondition += " and f_orgstr in ( " + f_orgids + " ) "
148
+ console.log('f_orgids:' + f_orgids)
149
+ }
150
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgCondition
151
+ this.$refs.paged.search(args)
152
+ },
153
+ getRes(obj) {
154
+ this.orgname = obj.res[0]
155
+ this.depresid = obj.resids
156
+ this.f_orgid = obj.resids
157
+ this.userresid = obj.resids
158
+ },
159
+ getdep(obj, val) {
160
+ this.depname = val[0]
161
+ this.f_depid = obj
162
+ },
163
+ getuser(obj, val) {
164
+ this.operatorname = val[0]
165
+ this.f_operatorid = obj
166
+ },
167
+ // 根据文件路径获取储存的报表内容
168
+ getFileContent(path) {
169
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {
170
+ resolveMsg: null,
171
+ rejectMsg: null
172
+ }).then((res) => {
173
+ this.reportStr = res.data.filecontent
174
+ this.model.state = '正确'
175
+ })
176
+ },
177
+ close() {
178
+ this.show = false
179
+ }
180
+ },
181
+ watch: {
182
+ 'data'(val) {
183
+ if (val.f_files_path) {
184
+ this.getFileContent(val.f_files_path)
185
+ } else {
186
+ this.reportStr = null
187
+ }
188
+ }
189
+ },
190
+ computed: {}
191
+ }
192
+ </script>
193
+ <style scoped>
194
+ .noborder {
195
+ border: none;
196
+ }
197
+ </style>
package/src/components/sale/businessquery/FillCardQuery.vue CHANGED
@@ -151,6 +151,12 @@
151
151
  <th>
152
152
  <nobr>卡费</nobr>
153
153
  </th>
154
+ <th>
155
+ <nobr>收款方式</nobr>
156
+ </th>
157
+ <th>
158
+ <nobr>补卡状态</nobr>
159
+ </th>
154
160
  <th>
155
161
  <nobr>补卡日期</nobr>
156
162
  </th>
@@ -197,6 +203,12 @@
197
203
  <td style="text-align: center;">
198
204
  <nobr>{{row.f_cardfees}}</nobr>
199
205
  </td>
206
+ <td style="text-align: center;">
207
+ <nobr>{{row.f_payment}}</nobr>
208
+ </td>
209
+ <td style="text-align: center;">
210
+ <nobr>{{row.f_state}}</nobr>
211
+ </td>
200
212
  <td style="text-align: center;">
201
213
  <nobr>{{row.f_operate_date}}</nobr>
202
214
  </td>
@@ -264,8 +276,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
264
276
  data: {},
265
277
  model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0}),
266
278
  criteriaShow: false,
267
- headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
268
- bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
279
+ headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费","收款方式","补卡状态", "补卡日期", "人员", "部门", "公司"],
280
+ bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees","f_payment","f_state", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
269
281
 
270
282
  orgCondtionStr: '',
271
283
  jurisdiction:this.$login.r,