sale-client 4.2.5 → 4.2.6

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,302 @@
1
+ import Vue from 'vue'
2
+ let GetSaleParam = {
3
+
4
+ install (Vue, options) {
5
+ // 给vue增添对话框显示方法
6
+ Vue.GetSaleParam = Vue.prototype.$GetSaleParam = GetSaleParam
7
+ },
8
+
9
+ // 气表
10
+ gasbrands: [],
11
+
12
+ // 气价
13
+ prices: [],
14
+
15
+ // 调压箱
16
+ adjustables: [],
17
+ meterNumber: [],
18
+ // 抄表册
19
+ meterbooks: [],
20
+ bookcodes: [],
21
+ inputtors: [],
22
+ auditor: [],
23
+ saleMan: [],
24
+ async initinputtor () {
25
+ let res = await Vue.resetpost('api/af-revenue/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
26
+ condition: ' 1=1'
27
+ }}, {resolveMsg: null, rejectMsg: '获取用户出错!!!', newly: true})
28
+ console.log('resdata:', res.data)
29
+ if (res.data) {
30
+ GetSaleParam.inputtors = res.data
31
+ }
32
+ },
33
+ getresinputtor (orgid) {
34
+ console.log('11111111111-------,', orgid)
35
+ let inputtors = []
36
+ console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
37
+ if (GetSaleParam.inputtors.length > 0) {
38
+ let arr = GetSaleParam.inputtors.filter((res) => {
39
+ if (res.rolestr != null && res.rolestr != '') {
40
+ return res.rolestr.indexOf('抄表员') > -1 && res.f_orgid == orgid
41
+ }
42
+ })
43
+
44
+ arr.forEach((res) => {
45
+ inputtors.push({label: res.name, value: res.name})
46
+ })
47
+ }
48
+ return inputtors
49
+ },
50
+ getAllMeterNumber () {
51
+ let param = {
52
+ f_orgid: this.$login.f.orgid
53
+ }
54
+ this.$resetpost('api/af-revenue/logic/getAllMeterNumber', param, {
55
+ resolveMsg: null,
56
+ rejectMsg: '获取表号失败!!'
57
+ }).then(res => {
58
+ this.meterNumber = []
59
+ if (res.data.length > 0) {
60
+ res.data.forEach(item => {
61
+ this.meterNumber.push({label: item.label, value: item.value})
62
+ })
63
+ }
64
+ })
65
+ return this.meterNumber
66
+ },
67
+ getAudit (orgid) {
68
+ console.log('11111111111-------,', orgid)
69
+ let auditor = []
70
+ console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
71
+ if (GetSaleParam.inputtors.length > 0) {
72
+ let arr = GetSaleParam.inputtors.filter((res) => {
73
+ if (res.rolestr != null && res.rolestr != '') {
74
+ return res.rolestr.indexOf('审核人员') > -1 && res.f_orgid == orgid
75
+ }
76
+ })
77
+ arr.forEach((res) => {
78
+ auditor.push({label: res.name, value: res.name})
79
+ })
80
+ }
81
+ return auditor
82
+ },
83
+ getSaleMan (orgid) {
84
+ let saleMan = []
85
+ if (GetSaleParam.inputtors.length > 0) {
86
+ let arr = GetSaleParam.inputtors.filter((res) => {
87
+ if (res.rolestr != null && res.rolestr != '') {
88
+ return res.rolestr && res.f_orgid == orgid
89
+ }
90
+ })
91
+ arr.forEach((res) => {
92
+ saleMan.push({label: res.name, value: res.name})
93
+ })
94
+ }
95
+ return saleMan
96
+ },
97
+ getGasstyle (key) {
98
+ return GetSaleParam.gasbrands.key
99
+ },
100
+ getGasbrand () {
101
+ return GetSaleParam.gasbrands
102
+ },
103
+ getAdjustable () {
104
+ return GetSaleParam.adjustables
105
+ },
106
+ getMeterBooks () {
107
+ return GetSaleParam.meterbooks
108
+ },
109
+ getBookCodes () {
110
+ return GetSaleParam.bookcodes
111
+ },
112
+ getAdjustable (val) {
113
+ // 数组去重
114
+ let arr = []
115
+ if (val) {
116
+ GetSaleParam.adjustables.forEach((item, next) => {
117
+ if (item.value.f_orgid == val) {
118
+ item.value.risers=[]
119
+ var params=[]
120
+ if(item.value.f_riser_codes){
121
+ var param=(item.value.f_riser_codes||'').split(' , ')
122
+ param.forEach((item)=>{
123
+ params.push({label:item,value:item})
124
+ })
125
+ item.value.risers=params
126
+ }else{
127
+ item.value.risers=[]
128
+ }
129
+
130
+ arr.push(item)
131
+ }
132
+ })
133
+ } else {
134
+ GetSaleParam.adjustables.forEach((item, next) => {
135
+ arr.push(item)
136
+ })
137
+ }
138
+ let hash = {}
139
+ let result = arr.reduce((item, next) => {
140
+ hash[next.label] ? '' : hash[next.label] = true && item.push(next)
141
+ return item
142
+ }, [])
143
+ return Array.from(new Set(result))
144
+ },
145
+ getPriceByOrg (filialeid) {
146
+ let result = []
147
+ GetSaleParam.prices.forEach((item) => {
148
+ if (item.f_state === '有效' && filialeid == item.f_filialeid) {
149
+ let value = {
150
+ label: item.f_price_name,
151
+ value: item
152
+ }
153
+ result.push(value)
154
+ }
155
+ })
156
+ let hash = {}
157
+ result = result.reduce((item, next) => {
158
+ hash[next.label] ? '' : hash[next.label] = true && item.push(next)
159
+ return item
160
+ }, [])
161
+ return Array.from(new Set(result))
162
+ },
163
+ getOnlyPrice () {
164
+ // 数组去重
165
+ let arr = []
166
+ GetSaleParam.prices.forEach((item, next) => {
167
+ if (item.f_state === '有效') {
168
+ let value = {
169
+ label: item.f_price_name,
170
+ value: item
171
+ }
172
+ arr.push(value)
173
+ }
174
+ })
175
+ let hash = {}
176
+ let result = arr.reduce((item, next) => {
177
+ hash[next.label] ? '' : hash[next.label] = true && item.push(next)
178
+ return item
179
+ }, [])
180
+ return Array.from(new Set(result))
181
+ },
182
+ getPrice (object) {
183
+ console.log('参数。。。', object)
184
+ // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
185
+ if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
186
+ return
187
+ }
188
+ let result = []
189
+
190
+ console.log('获取价格。。。', object.filter, GetSaleParam.prices)
191
+
192
+ // 做筛选
193
+ if (object.filter) {
194
+ GetSaleParam.prices.forEach((item) => {
195
+ if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
196
+ object.f_gasproperties === item.f_gasproperties &&
197
+ object.f_price_type === item.f_price_type &&
198
+ object.filter == item.f_filialeid) {
199
+ let value = {
200
+ label: item.f_price_name,
201
+ value: item
202
+ }
203
+ result.push(value)
204
+ }
205
+ })
206
+ } else {
207
+ GetSaleParam.prices.forEach((item) => {
208
+ if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
209
+ let value = {
210
+ label: item.f_price_name,
211
+ value: item
212
+ }
213
+ console.log('进来了1111')
214
+ result.push(value)
215
+ }
216
+ })
217
+ }
218
+ // 数组去重
219
+ let hash = {}
220
+ result = result.reduce((item, next) => {
221
+ hash[next.label] ? '' : hash[next.label] = true && item.push(next)
222
+ return item
223
+ }, [])
224
+ return Array.from(new Set(result))
225
+ },
226
+ getPriceAll (object) {
227
+ console.log('参数。。。', object)
228
+ // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
229
+ if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
230
+ return
231
+ }
232
+ let result = []
233
+
234
+ console.log('获取价格。。。', object.filter, GetSaleParam.prices)
235
+
236
+ // 做筛选
237
+ if (object.filter) {
238
+ GetSaleParam.prices.forEach((item) => {
239
+ if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
240
+ object.f_gasproperties === item.f_gasproperties &&
241
+ object.f_price_type === item.f_price_type &&
242
+ object.filter == item.f_filialeid) {
243
+ let value = {
244
+ label: item.f_price_name,
245
+ value: item
246
+ }
247
+ result.push(value)
248
+ }
249
+ })
250
+ } else {
251
+ GetSaleParam.prices.forEach((item) => {
252
+ if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
253
+ let value = {
254
+ label: item.f_price_name,
255
+ value: item
256
+ }
257
+ console.log('进来了1111')
258
+ result.push(value)
259
+ }
260
+ })
261
+ }
262
+ return Array.from(new Set(result))
263
+ },
264
+ getPriceAllOther (object) {
265
+ console.log('参数。。。', object)
266
+ // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
267
+ if (!object.f_price_type) {
268
+ return
269
+ }
270
+ let result = []
271
+
272
+ console.log('获取价格。。。', object.filter, GetSaleParam.prices)
273
+
274
+ // 做筛选
275
+ if (object.filter) {
276
+ GetSaleParam.prices.forEach((item) => {
277
+ if (item.f_state === '有效' && object.f_price_type === item.f_price_type &&
278
+ object.filter == item.f_filialeid) {
279
+ let value = {
280
+ label: item.f_price_name,
281
+ value: item
282
+ }
283
+ result.push(value)
284
+ }
285
+ })
286
+ } else {
287
+ GetSaleParam.prices.forEach((item) => {
288
+ if (item.f_state === '有效' && object.f_price_type === item.f_price_type) {
289
+ let value = {
290
+ label: item.f_price_name,
291
+ value: item
292
+ }
293
+ console.log('进来了1111')
294
+ result.push(value)
295
+ }
296
+ })
297
+ }
298
+ return Array.from(new Set(result))
299
+ }
300
+ }
301
+
302
+ export default GetSaleParam
@@ -0,0 +1,124 @@
1
+ import Vue from 'vue'
2
+ import {HttpResetClass} from 'vue-client'
3
+ import GetSaleParam from './GetSaleParams'
4
+
5
+ let loadParamGen = async function (f_filialeid) {
6
+ let http = new HttpResetClass()
7
+ if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0) {
8
+ let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
9
+ if (getParams.data) {
10
+ LoadParams.organizeData(getParams.data)
11
+ }
12
+ } else {
13
+ let validate = LoadParams.isReset(f_filialeid)
14
+ console.log('验证是否需要重新加载', validate)
15
+ if (validate) {
16
+ GetSaleParam.gasbrands = []
17
+ GetSaleParam.prices = []
18
+ GetSaleParam.adjustables = []
19
+ let getParams = await http.load('POST', 'api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
20
+ if (getParams.data) {
21
+ LoadParams.organizeData(getParams.data)
22
+ }
23
+ }
24
+ }
25
+ }
26
+
27
+ let loadMeterBookGen = async function (f_filialeid) {
28
+ let http = new HttpResetClass()
29
+ if (GetSaleParam.meterbooks.length === 0) {
30
+ let getMeterBooks = await http.load('POST', 'api/af-revenue/logic/sale_getMeterBooksData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
31
+ if (getMeterBooks.data) {
32
+ LoadParams.organizeBooksData(getMeterBooks.data)
33
+ }
34
+ }
35
+ }
36
+
37
+ let LoadParams = {
38
+
39
+ install (Vue, options) {
40
+ // 给vue增添对话框显示方法
41
+ Vue.LoadParams = Vue.prototype.$LoadParams = LoadParams
42
+ },
43
+
44
+ async loadParam () {
45
+ await loadParamGen(null)
46
+ },
47
+ async loadParam (f_filialeid) {
48
+ await loadParamGen(f_filialeid)
49
+ },
50
+
51
+ // 加载抄表册
52
+ async loadMeterBook (f_filialeid) {
53
+ await loadMeterBookGen(f_filialeid)
54
+ },
55
+
56
+ // 开启卡监听
57
+ organizeData (fromSystem) {
58
+ console.log('接受System中返回的参数进行组织', fromSystem)
59
+ fromSystem.gasbrands.forEach((item, index) => {
60
+ GetSaleParam.gasbrands[index] = {}
61
+ GetSaleParam.gasbrands[index].label = item.f_meter_brand
62
+ let gasmodel = []
63
+ item.gasmodel.forEach((item, index) => {
64
+ gasmodel[index] = {}
65
+ gasmodel[index].label = item.f_meter_style + item.f_type
66
+ gasmodel[index].value = item
67
+ })
68
+ item.gasmodel = gasmodel
69
+ GetSaleParam.gasbrands[index].value = item
70
+ })
71
+
72
+ fromSystem.adjustable.forEach((item, index) => {
73
+ GetSaleParam.adjustables[index] = {}
74
+ GetSaleParam.adjustables[index].label = item.f_adjustable_name
75
+ GetSaleParam.adjustables[index].value = item
76
+ })
77
+ GetSaleParam.prices = [...[], ...fromSystem.price]
78
+ },
79
+
80
+ organizeBooksData (fromSystem) {
81
+ // 对抄表册按名称进行字母排序
82
+ const sortedMeterbooks = fromSystem.meterbooks.sort((a, b) => {
83
+ return a.f_book_name.localeCompare(b.f_book_name, 'zh-CN')
84
+ })
85
+ sortedMeterbooks.forEach((item, index) => {
86
+ GetSaleParam.meterbooks[index] = {}
87
+ GetSaleParam.meterbooks[index].label = item.f_book_name
88
+ GetSaleParam.meterbooks[index].value = item.id
89
+ })
90
+
91
+ // 对抄表册编号单独进行字母排序
92
+ const bookCodesData = fromSystem.meterbooks.filter(item => item.f_book_code)
93
+ const sortedBookCodes = bookCodesData.sort((a, b) => {
94
+ return a.f_book_code.localeCompare(b.f_book_code, 'zh-CN')
95
+ })
96
+
97
+ sortedBookCodes.forEach((item, index) => {
98
+ GetSaleParam.bookcodes[index] = {}
99
+ GetSaleParam.bookcodes[index].label = item.f_book_code
100
+ GetSaleParam.bookcodes[index].value = item.id
101
+ })
102
+ },
103
+
104
+ isReset (val) {
105
+ if (GetSaleParam.gasbrands.length > 0) {
106
+ if (GetSaleParam.gasbrands[0].value.f_using_orgid !== val) {
107
+ return true
108
+ }
109
+ }
110
+ if (GetSaleParam.prices.length > 0) {
111
+ if (GetSaleParam.prices[0].f_filialeid !== val) {
112
+ return true
113
+ }
114
+ }
115
+ if (GetSaleParam.adjustables.length > 0) {
116
+ if (GetSaleParam.adjustables[0].value.f_filialeid !== val) {
117
+ return true
118
+ }
119
+ }
120
+ }
121
+
122
+ }
123
+
124
+ export default LoadParams
@@ -2,9 +2,13 @@
2
2
  import Vue from 'vue'
3
3
  import CardService from './CardService'
4
4
  import MachineChargeService from './MachineChargeService'
5
+ import LoadParams from './plugins/LoadParams'
6
+ import GetSaleParams from './plugins/GetSaleParams'
5
7
  export default function () {
6
8
  Vue.use(CardService)
7
9
  Vue.use(MachineChargeService)
10
+ Vue.use(LoadParams)
11
+ Vue.use(GetSaleParams)
8
12
  // 垃圾费
9
13
  Vue.component('garbagefees-list', (resolve) => { require(['./GarbagefeesList.vue'], resolve) })
10
14
  Vue.component('garbage-charge', (resolve) => { require(['./GarbageCharge.vue'], resolve) })
@@ -48,4 +52,6 @@ export default function () {
48
52
  Vue.component('autoaccounts-detail', (resolve) => { require(['./AutoAccountsDetail'], resolve) })
49
53
  // 操作记录列表,可以切换查询用户列表的操作区域
50
54
  Vue.component('card-list', (resolve) => { require(['./CardList'], resolve) })
55
+ // 机表抄表
56
+ Vue.component('machine-hand', (resolve) => { require(['./machineHand'], resolve) })
51
57
  }