sale-client 3.6.383 → 3.6.384

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.383",
3
+ "version": "3.6.384",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -28,7 +28,7 @@
28
28
  "yarn": "^1.22.10"
29
29
  },
30
30
  "devDependencies": {
31
- "address-client": "3.2.105-yangchun",
31
+ "address-client": "3.2.111-2",
32
32
  "axios": "0.15.3",
33
33
  "babel-core": "^6.0.0",
34
34
  "babel-loader": "^6.0.0",
@@ -0,0 +1,399 @@
1
+ <template>
2
+ <div class="auto" id="meterInfoTest">
3
+ <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)">
4
+ <form class="form-horizontal">
5
+ <div class="row">
6
+ <div class="col-sm-4 form-group">
7
+ <label class="font_normal_body">用户姓名</label>
8
+ <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
9
+ </div>
10
+ <div class="col-sm-4 form-group">
11
+ <label class="font_normal_body" title="参数:收费状态, 权限:【收费记录状态修改】">收费状态</label>
12
+ <!-- <input type="text" v-model="model.f_charge_state" disabled=disabled style="width: 60%" class="input_search">-->
13
+ <v-select :value.sync="model.f_state" v-model="model.f_state"
14
+ :value-single="true"
15
+ :search="false"
16
+ :disabled="editstate"
17
+ :options='positions' placeholder='收费状态'
18
+ close-on-select>
19
+ </v-select>
20
+ </div>
21
+ <div class="col-sm-4 form-group">
22
+ <label class="font_normal_body">地&emsp;&emsp;址</label>
23
+ <input type="text" v-model="model.f_address" disabled=disabled style="width: 60%" class="input_search">
24
+ </div>
25
+ <!--<div class="col-sm-4 form-group">
26
+ <label class="font_normal_body">用户编号</label>
27
+ <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
28
+ </div>-->
29
+ <div class="col-sm-4 form-group">
30
+ <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
31
+ <!-- <input type="text" v-model="model.f_payment" style="width: 60%" class="input_search">-->
32
+ <v-select :value.sync="model.f_payment" v-model="model.f_payment"
33
+ :options='payments' placeholder='付款方式'
34
+ :value-single="true"
35
+ :search="false"
36
+ close-on-select>
37
+ </v-select>
38
+ </div>
39
+ <div class="col-sm-4 form-group">
40
+ <label class="font_normal_body" title="参数:写卡状态">写卡状态</label>
41
+ <!-- <input type="text" v-model="model.f_write_card" style="width: 60%" class="input_search">-->
42
+ <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
43
+ :options='writeCards' placeholder='写卡状态'
44
+ :value-single="true"
45
+ :search="false"
46
+ close-on-select>
47
+ </v-select>
48
+ </div>
49
+ <div class="col-sm-4 form-group">
50
+ <label class="font_normal_body">收款金额</label>
51
+ <input type="text" v-model="model.f_collection" disabled=disabled style="width: 60%" class="input_search">
52
+ </div>
53
+ <!--<div class="col-sm-4 form-group">-->
54
+ <!--<label class="font_normal_body">收据类型</label>-->
55
+ <!--<input type="text" v-model="model.f_bill_style" style="width: 60%" class="input_search">-->
56
+ <!--</div>-->
57
+ </div>
58
+ <div class="row">
59
+ <div class="col-sm-4 form-group">
60
+ <label class="font_normal_body">转账单位</label>
61
+ <input type="text" v-model="model.f_banktransfer_person" :disabled="!editbank" style="width: 60%" class="input_search">
62
+ </div>
63
+ <div class="col-sm-4 form-group">
64
+ <label class="font_normal_body">转账金额</label>
65
+ <input type="text" v-model="model.f_banktransfer_money" :disabled="!editbank" style="width: 60%" class="input_search">
66
+ </div>
67
+ <div class="col-sm-4 form-group">
68
+ <label class="font_normal_body">转账日期</label>
69
+ <!-- <input type="text" v-model="model.f_banktransfer_date" :disabled="!editbank" style="width: 60%" class="input_search">-->
70
+ <datepicker id="f_banktransfer_date" placeholder="转账日期" style="width:60%"
71
+ v-model="model.f_banktransfer_date"
72
+ :value.sync="model.f_banktransfer_date"
73
+ :format="'yyyy-MM-dd HH:mm:ss'"
74
+ :show-reset-button="true">
75
+ </datepicker>
76
+ </div>
77
+ </div>
78
+ <div class="row">
79
+ <div class="col-sm-4 form-group" title="参数:操作时间, 权限:【收费记录时间修改】">
80
+ <label class="font_normal_body">操作时间</label>
81
+ <!--<input type="text" v-model="model.f_delivery_date" style="width: 60%" class="input_search">-->
82
+ <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
83
+ v-model="model.f_operate_date"
84
+ :value.sync="model.f_operate_date"
85
+ :disabled="editDate"
86
+ :format="'yyyy-MM-dd HH:mm:ss'"
87
+ :show-reset-button="true">
88
+ </datepicker>
89
+ </div>
90
+ <div class="col-sm-4 form-group">
91
+ <label class="font_normal_body">财务核算日期</label>
92
+ <!--<input type="text" v-model="model.f_delivery_date" style="width: 60%" class="input_search">-->
93
+ <datepicker id="f_delivery_date" placeholder="财务核算日期" style="width:60%"
94
+ v-model="model.f_accounting_date"
95
+ :value.sync="model.f_accounting_date"
96
+ :format="'yyyy-MM-dd HH:mm:ss'"
97
+ :show-reset-button="true">
98
+ </datepicker>
99
+ </div>
100
+ <div class="col-sm-4 form-group">
101
+ <label class="font_normal_body">购气气量</label>
102
+ <input type="text" v-model="model.f_pregas" disabled=disabled style="width: 60%" class="input_search">
103
+ </div>
104
+ <div class="col-sm-4 form-group">
105
+ <label class="font_normal_body">购气金额</label>
106
+ <input type="text" v-model="model.f_preamount" disabled=disabled style="width: 60%" class="input_search">
107
+ </div>
108
+ </div>
109
+ <div class="row">
110
+ <div class="col-sm-4 form-group">
111
+ <label class="font_normal_body" title="参数:操作人员">操作人员</label>
112
+ <v-select :value.sync="model.f_operatorid"
113
+ v-model="model.f_operatorid"
114
+ disabled=disabled
115
+ :value-single="true" @change="selectoperator()"
116
+ :options='foperator'
117
+ close-on-select></v-select>
118
+ </div>
119
+ <div class="col-sm-4 form-group">
120
+ <label class="font_normal_body">所属部门</label>
121
+ <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
122
+ </div>
123
+ <div class="col-sm-4 form-group">
124
+ <label class="font_normal_body">所属公司</label>
125
+ <input type="text" v-model="model.f_orgname" disabled=disabled style="width: 60%" class="input_search">
126
+ </div>
127
+ </div>
128
+ <div class="row">
129
+ <div class="col-sm-4 form-group">
130
+ <label class="font_normal_body" title="打印格式">收据类型</label>
131
+ <v-select id="f_bill_style"
132
+ placeholder='收据类型'
133
+ :value-single="true"
134
+ :value.sync="model.f_bill_style"
135
+ :options='equipmentType'
136
+ close-on-select clear-button>
137
+ </v-select>
138
+ </div>
139
+ <div class="col-sm-4 form-group">
140
+ <label class="font_normal_body">开发票人</label>
141
+ <input type="text" v-model="model.f_bill_operator" disabled=disabled style="width: 60%" class="input_search">
142
+ </div>
143
+ <div class="col-sm-4 form-group">
144
+ <label class="font_normal_body">发票时间</label>
145
+ <datepicker id="f_bill_date" placeholder="开发票时间" style="width:60%"
146
+ v-model="model.f_bill_date"
147
+ :value.sync="model.f_bill_date"
148
+ :format="'yyyy-MM-dd'"
149
+ :show-reset-button="true">
150
+ </datepicker>
151
+ <!--<input type="text" v-model="model.f_bill_date" style="width: 60%" class="input_search">-->
152
+ </div>
153
+ </div>
154
+ <div class="row">
155
+ <div class="col-sm-4 form-group">
156
+ <label class="font_normal_body">流&ensp;水&ensp;号</label>
157
+ <input type="text" v-model="model.f_serial_id" style="width: 60%" class="input_search">
158
+ </div>
159
+ <div class="col-sm-4 form-group">
160
+ <label class="font_normal_body">业务单号</label>
161
+ <input type="text" v-model="model.f_serial_number" style="width: 60%" class="input_search">
162
+ </div>
163
+ </div>
164
+ <div class="row">
165
+ <div class="col-sm-12 form-group">
166
+ <label class="font_normal_body">备注信息</label>
167
+ <input type="text" v-model="model.f_comments" style="width: 85%" class="input_search">
168
+ </div>
169
+ </div>
170
+ </form>
171
+ <div style="float: right">
172
+ <button class="button_search" @click="save">保存</button>
173
+ <button class="button_clear" @click="cancel">取消</button>
174
+ </div>
175
+ </validator>
176
+ <modal :show.sync="showfiles" width="80%" style="width:auto;" v-ref:modal backdrop="false">
177
+ <article slot="modal-body">
178
+ <upload :blodid="model.f_userinfo_id" :businessid="model.id" v-ref:upload fusetype="收费" isremark="true" style="width:auto" ></upload>
179
+ </article>
180
+ <footer slot="modal-footer" class="modal-footer">
181
+ </footer>
182
+ </modal>
183
+ <!--文件上传按钮-->
184
+ <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
185
+ </div>
186
+ </template>
187
+ <script>
188
+ import Vue from 'vue'
189
+ import {HttpResetClass} from 'vue-client'
190
+ import * as Util from '../../Util'
191
+ var data
192
+ let readyGen = async function (self) {
193
+ await self.$LoadParams.loadParam(self.f_filialeid)
194
+ await self.$GetSaleParam.initinputtor()
195
+ }
196
+ export default {
197
+ title: '基本信息',
198
+
199
+ data () {
200
+ return {
201
+ equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
202
+ // 构建数组来存储对象
203
+ editbank: true,
204
+ uploadText: '收费',
205
+ showfiles: false,
206
+ recordList: [],
207
+ foperator: [],
208
+ fileNameSet: {
209
+ 'f_payment': '收费形式',
210
+ 'f_state': '是否有效',
211
+ 'f_bill_style': '收据类型',
212
+ 'f_operate_date': '收费日期',
213
+ 'f_accounting_date': '财务核算日期',
214
+ 'f_pregas': '购气气量',
215
+ 'f_address': '地址',
216
+ 'f_user_type': '用气性质',
217
+ 'f_preamount': '充值金额',
218
+ 'f_orgname': '所属公司',
219
+ 'f_depname': '所属部门',
220
+ 'f_user_name': '用户姓名',
221
+ 'f_write_card': '写卡状态',
222
+ 'f_banktransfer_person': '转账单位',
223
+ 'f_banktransfer_money': '转账金额',
224
+ 'f_banktransfer_date': '转账日期',
225
+ 'f_comments': '备注信息',
226
+ 'f_bill_date': '开票时间',
227
+ 'f_bill_operator': '开票人',
228
+ 'f_serial_id': '流水号',
229
+ 'f_serial_number': '业务单号'
230
+ },
231
+ editstate: true,
232
+ editDate: true
233
+ }
234
+ },
235
+ props: {
236
+ oldmodel: Object,
237
+ model: Object
238
+ },
239
+
240
+ ready () {
241
+ if (this.$login.r.includes('维护银行转账信息')) {
242
+ this.editbank = true
243
+ }
244
+ if (this.$login.r.includes('收费记录状态修改')) {
245
+ this.editstate = false
246
+ }
247
+ if (this.$login.r.includes('收费记录时间修改')) {
248
+ this.editDate = false
249
+ }
250
+ this.oldmodel = JSON.parse(JSON.stringify(this.model))
251
+ this.model.f_bill_state = [this.oldmodel]
252
+ console.log('看看收费id', this.oldmodel)
253
+ readyGen(this)
254
+ },
255
+ created () {
256
+ },
257
+ methods: {
258
+ initoperator () {
259
+ this.foperator = []
260
+ console.log('this.$login', this.$login, this.oldmodel, this.model)
261
+ let arr = this.$GetSaleParam.inputtors.filter((res) => {
262
+ if (res.rolestr != null && res.rolestr != '') {
263
+ return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
264
+ }
265
+ })
266
+ arr.forEach((res) => {
267
+ this.foperator.push({label: res.name, value: res.id})
268
+ })
269
+ },
270
+ selectoperator () {
271
+ let id = this.model.f_operatorid
272
+ if (!this.model.f_operatorid) {
273
+ return
274
+ }
275
+ let http = new HttpResetClass()
276
+ http.load('POST', 'rs/sql/saleSingleTable',
277
+ {data: {tablename: 't_user',
278
+ condition: `id = '${id}'`}},
279
+ {resolveMsg: null, rejectMsg: null}).then((res) => {
280
+ console.log('kanak,res', res)
281
+ if (res.data.length > 0) {
282
+ this.model.f_operator = res.data[0].name
283
+ } else {
284
+ this.model.f_operatorid = ''
285
+ this.$showAlert('操作员信息未找到', 'warning', 2000)
286
+ }
287
+ console.log('this.f_operatorid', this.model.f_operator)
288
+ })
289
+ },
290
+ cancel () {
291
+ this.$dispatch('close')
292
+ },
293
+ uploadFiles () {
294
+ this.showfiles = !this.showfiles
295
+ },
296
+ addressValid (val) {
297
+ },
298
+ save () {
299
+ // console.log(this.model.key)
300
+ //
301
+ for (var item in this.model) {
302
+ if (item != 'f_sendsuccess') {
303
+ if (this.model[item] != this.oldmodel[item] && this.model[item] != 's_timestamp') {
304
+ var car = {
305
+ chinesename: this.fileNameSet[item],
306
+ fieldname: item,
307
+ tablename: 't_sellinggas',
308
+ oldvalue: this.oldmodel[item],
309
+ newvalue: this.model[item],
310
+ state: '有效',
311
+ modifitime: Util.toStandardTimeString(),
312
+ operator: this.$login.f.name,
313
+ sellingas_id: this.model.id,
314
+ f_operator: this.$login.f.name,
315
+ f_operatorid: this.$login.f.id,
316
+ f_orgid: this.$login.f.orgid,
317
+ f_orgname: this.$login.f.orgs,
318
+ f_depid: this.$login.f.depids,
319
+ f_depname: this.$login.f.deps
320
+ }
321
+ this.recordList.push(car)
322
+ // 该方法并未对chinesename fieldname operator等进行判断赋值,此暂写为定值
323
+ console.log('看看car的值', car)
324
+ }
325
+ }
326
+ }
327
+ if (this.model.f_bill_date !== '' || this.model.f_bill_date === undefined) {
328
+ this.model.f_bill_operator = this.$login.f.name
329
+ }
330
+ this.$resetpost('rs/logic/saveing', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
331
+ console.log('this.model', this.model)
332
+ })
333
+ this.$dispatch('close')
334
+ }
335
+ },
336
+ computed: {
337
+ positions () {
338
+ return this.$appdata.getParam('收费状态')
339
+ },
340
+ payments () {
341
+ return this.$appdata.getParam('付款方式查询')
342
+ },
343
+ writeCards () {
344
+ return this.$appdata.getParam('写卡状态')
345
+ },
346
+ billStyles () {
347
+ return this.$appdata.getParam('收据类型')
348
+ }
349
+ },
350
+ watch: {
351
+ 'model' () {
352
+ this.initoperator()
353
+ }
354
+ }
355
+ }
356
+ </script>
357
+ <style lang="less" scoped>
358
+ #meterInfoTest{
359
+ #addboxmap {
360
+ height: 300px;
361
+ }
362
+ .glyphicon-map-marker:hover {
363
+ color: red;
364
+ }
365
+ .glyphicon-map-marker {
366
+ color: blue;
367
+ cursor: pointer;
368
+ }
369
+ .col-sm-4 {
370
+ .font_normal_body {
371
+ width: 73px;
372
+ overflow: auto;
373
+ white-space: nowrap;
374
+ // 指滚动条两边的按钮
375
+ &::-webkit-scrollbar-button {
376
+ display: none;
377
+ }
378
+ // 滚动条的宽度
379
+ &::-webkit-scrollbar {
380
+ width: 5px !important;
381
+ height: 5px !important;
382
+ }
383
+ // 滚动条的设置
384
+ &::-webkit-scrollbar-thumb {
385
+ background-color: #ddd;
386
+ background-clip: padding-box;
387
+ }
388
+ &::-webkit-scrollbar-thumb:hover {
389
+ background-color: #bbb;
390
+ }
391
+ &::-webkit-scrollbar-track {
392
+ /*滚动条里面轨道*/
393
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
394
+ background: #ededed;
395
+ }
396
+ }
397
+ }
398
+ }
399
+ </style>
@@ -16,4 +16,6 @@ export default function () {
16
16
  Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
17
17
  // Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
18
18
  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
19
+ // 交费具体信息金额
20
+ Vue.component('meter-operate-maintain', (resolve) => { require(['./MeterOperatemain'], resolve) })
19
21
  }