sale-client 3.6.185 → 3.6.186
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
|
@@ -251,7 +251,10 @@
|
|
|
251
251
|
asideTitle: '用户操作',
|
|
252
252
|
row: Object,
|
|
253
253
|
comp: null,
|
|
254
|
-
operationtypes:
|
|
254
|
+
operationtypes: this.$appdata.getParam('操作类型') ? [{
|
|
255
|
+
label: '全部',
|
|
256
|
+
value: ''
|
|
257
|
+
}, ...this.$appdata.getParam('操作类型')] : [],
|
|
255
258
|
cancel_show: false,
|
|
256
259
|
cancel_data: null,
|
|
257
260
|
paytype: this.$appdata.getParam('付款方式'),
|
|
@@ -8,80 +8,90 @@
|
|
|
8
8
|
<validator name='v'>
|
|
9
9
|
<form class="form-horizontal select-overspread">
|
|
10
10
|
<div class="row">
|
|
11
|
-
<div class="col-sm-6 form-
|
|
12
|
-
<label class="font_normal_body col-sm-3">第三方缴费</label>
|
|
13
|
-
<v-
|
|
11
|
+
<div class="col-sm-6 form-group" :class="[$v.f_third_pay.required ? 'has-error' : '']">
|
|
12
|
+
<label class="font_normal_body col-sm-3" >第三方缴费</label>
|
|
13
|
+
<input type="text" v-show="false" v-model="$refs.f_third_pay.selectedItems"
|
|
14
|
+
v-validate:f_third_pay='{required: true }'>
|
|
15
|
+
<v-select width="60%"
|
|
14
16
|
:value.sync="model.f_third_pay"
|
|
15
17
|
v-model="model.f_third_pay"
|
|
16
18
|
:options='thirdPays'
|
|
17
|
-
:value-single="true"
|
|
19
|
+
:value-single="true" v-ref:f_third_pay
|
|
18
20
|
close-on-select></v-select>
|
|
19
21
|
</div>
|
|
20
|
-
<div class="col-sm-6 form-
|
|
21
|
-
<label class="font_normal_body col-sm-3">限制类型</label>
|
|
22
|
-
<v-
|
|
22
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_style.required ? 'has-error' : '']">
|
|
23
|
+
<label class="font_normal_body col-sm-3" >限制类型</label>
|
|
24
|
+
<input type="text" v-show="false" v-model="$refs.f_limit_style.selectedItems"
|
|
25
|
+
v-validate:f_limit_style='{required: true }'>
|
|
26
|
+
<v-select width="60%"
|
|
23
27
|
:value.sync="model.f_limit_style"
|
|
24
28
|
v-model="model.f_limit_style"
|
|
25
29
|
:options='limitstyle'
|
|
26
|
-
:value-single="true"
|
|
30
|
+
:value-single="true" v-ref:f_limit_style
|
|
27
31
|
close-on-select></v-select>
|
|
28
32
|
</div>
|
|
29
33
|
</div>
|
|
30
34
|
<div class="row" style="margin-top:10px;" >
|
|
31
|
-
<div class="col-sm-6 form-
|
|
32
|
-
<label class="font_normal_body col-sm-3">周期类型</label>
|
|
33
|
-
<v-
|
|
35
|
+
<div class="col-sm-6 form-group" :class="[$v.f_time_type.required ? 'has-error' : '']">
|
|
36
|
+
<label class="font_normal_body col-sm-3" >周期类型</label>
|
|
37
|
+
<input type="text" v-show="false" v-model="$refs.f_time_type.selectedItems"
|
|
38
|
+
v-validate:f_time_type='{required: true }'>
|
|
39
|
+
<v-select width="60%"
|
|
34
40
|
:value.sync="model.f_time_type"
|
|
35
41
|
v-model="model.f_time_type"
|
|
36
42
|
:options='timeTypes'
|
|
37
|
-
:value-single="true"
|
|
43
|
+
:value-single="true" v-ref:f_time_type
|
|
38
44
|
close-on-select></v-select>
|
|
39
45
|
</div>
|
|
40
|
-
<div class="col-sm-6 form-
|
|
41
|
-
<label class="font_normal_body col-sm-3">周期时长</label>
|
|
42
|
-
<input type="text" v-model="model.f_time_value" placeholder="周期时长" style="vertical-align:middle">
|
|
46
|
+
<div class="col-sm-6 form-group" :class="[$v.f_time_value.required ? 'has-error' : '']">
|
|
47
|
+
<label class="font_normal_body col-sm-3" >周期时长</label>
|
|
48
|
+
<input type="text" class="input_search" v-model="model.f_time_value" placeholder="周期时长" v-validate:f_time_value='{required: true }' style="vertical-align:middle;width: 60%">
|
|
43
49
|
</div>
|
|
44
50
|
</div>
|
|
45
51
|
|
|
46
52
|
<div class="row" style="margin-top:10px;" v-if="model.f_limit_style !=='按总量'">
|
|
47
|
-
<div class="col-sm-6 form-
|
|
48
|
-
<label class="font_normal_body col-sm-3">限制次数</label>
|
|
49
|
-
<input type="text" v-model="model.f_limit_times" placeholder="限制次数">
|
|
53
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_times.required ? 'has-error' : '']">
|
|
54
|
+
<label class="font_normal_body col-sm-3" >限制次数</label>
|
|
55
|
+
<input type="text" class="input_search" v-model="model.f_limit_times" style="vertical-align:middle;width: 60%" v-validate:f_limit_times='{required: true }' placeholder="限制次数">
|
|
50
56
|
</div>
|
|
51
|
-
<div class="col-sm-6 form-
|
|
52
|
-
<label class="font_normal_body col-sm-3">单次限购</label>
|
|
53
|
-
<input type="text" v-model="model.f_limit_value" placeholder="单次限购">
|
|
57
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_type ==='气量'">
|
|
58
|
+
<label class="font_normal_body col-sm-3" >单次限购</label>
|
|
59
|
+
<input type="text" class="input_search" v-model="model.f_limit_value" style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
|
|
54
60
|
</div>
|
|
55
|
-
<div class="col-sm-6 form-
|
|
56
|
-
<label class="font_normal_body col-sm-3">单次限购</label>
|
|
57
|
-
<input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
|
|
61
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_type ==='金额'">
|
|
62
|
+
<label class="font_normal_body col-sm-3" >单次限购</label>
|
|
63
|
+
<input type="text" class="input_search" v-model="model.f_limit_amount" style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
|
|
58
64
|
</div>
|
|
59
65
|
</div>
|
|
60
66
|
<div class="row" style="margin-top:10px;" v-if="model.f_limit_style ==='按总量'">
|
|
61
|
-
<div class="col-sm-6 form-
|
|
62
|
-
<label class="font_normal_body col-sm-3">总限购量</label>
|
|
63
|
-
<input type="text" v-model="model.f_limit_value" placeholder="单次限购">
|
|
67
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_type ==='气量'">
|
|
68
|
+
<label class="font_normal_body col-sm-3" >总限购量</label>
|
|
69
|
+
<input type="text" class="input_search" v-model="model.f_limit_value" style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
|
|
64
70
|
</div>
|
|
65
|
-
<div class="col-sm-6 form-
|
|
66
|
-
<label class="font_normal_body col-sm-3">总限购量</label>
|
|
67
|
-
<input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
|
|
71
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_type ==='金额'">
|
|
72
|
+
<label class="font_normal_body col-sm-3" >总限购量</label>
|
|
73
|
+
<input type="text" class="input_search" v-model="model.f_limit_amount" style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
|
|
68
74
|
</div>
|
|
69
75
|
</div>
|
|
70
76
|
<div class="row" style="margin-top:10px;">
|
|
71
|
-
<div class="col-sm-6 form-
|
|
72
|
-
<label class="font_normal_body col-sm-3">支付限制</label>
|
|
73
|
-
<v-
|
|
77
|
+
<div class="col-sm-6 form-group" :class="[$v.f_limit_type.required ? 'has-error' : '']">
|
|
78
|
+
<label class="font_normal_body col-sm-3" >支付限制</label>
|
|
79
|
+
<input type="text" v-show="false" v-model="$refs.f_limit_type.selectedItems"
|
|
80
|
+
v-validate:f_limit_type='{required: true }'>
|
|
81
|
+
<v-select width="60%"
|
|
74
82
|
:value.sync="model.f_limit_type"
|
|
75
83
|
v-model="model.f_limit_type"
|
|
76
84
|
:options='limitTypes'
|
|
77
|
-
:value-single="true"
|
|
85
|
+
:value-single="true" v-ref:f_limit_type
|
|
78
86
|
close-on-select></v-select>
|
|
79
87
|
</div>
|
|
80
|
-
<div class="col-sm-6 form-
|
|
81
|
-
<label class="font_normal_body col-sm-3">执行时间</label>
|
|
82
|
-
<
|
|
88
|
+
<div class="col-sm-6 form-group" :class="[$v.f_start_date.required ? 'has-error' : '']">
|
|
89
|
+
<label class="font_normal_body col-sm-3" >执行时间</label>
|
|
90
|
+
<input type="text" v-show="false" v-model="model.f_start_date"
|
|
91
|
+
v-validate:f_start_date='{required: true }'>
|
|
92
|
+
<datepicker placeholder="执行时间" style="width:60%"
|
|
83
93
|
v-model="model.f_start_date"
|
|
84
|
-
:value.sync="model.f_start_date"
|
|
94
|
+
:value.sync="model.f_start_date" v-ref:f_start_date
|
|
85
95
|
:format="'yyyy-MM-dd'">
|
|
86
96
|
</datepicker>
|
|
87
97
|
</div>
|
|
@@ -91,7 +101,7 @@
|
|
|
91
101
|
</article>
|
|
92
102
|
<footer slot="modal-footer" class="modal-footer">
|
|
93
103
|
<button class="btn btn-success" v-if="limitshow" @click="cancellimit">取消限购</button>
|
|
94
|
-
<button class="button_search btn-gn" @click="confirm">确认</button>
|
|
104
|
+
<button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm">确认</button>
|
|
95
105
|
<button class="button_clear btn-gn" @click="cancel">取消</button>
|
|
96
106
|
</footer>
|
|
97
107
|
</modal>
|
|
@@ -165,7 +175,17 @@
|
|
|
165
175
|
getLimitDataGen(this)
|
|
166
176
|
}
|
|
167
177
|
},
|
|
168
|
-
|
|
178
|
+
computed: {
|
|
179
|
+
limitValid () {
|
|
180
|
+
let result = true
|
|
181
|
+
for (let key in this.model) {
|
|
182
|
+
if (this.model[key] === '') {
|
|
183
|
+
result = false
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return result
|
|
187
|
+
},
|
|
188
|
+
},
|
|
169
189
|
confirm () {
|
|
170
190
|
this.$dispatch('limit', this.model)
|
|
171
191
|
this.model = {
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
messShow: false
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
|
-
props: ['show','data','billData', 'billConfig'],
|
|
66
|
+
props: ['show', 'data', 'billData', 'billConfig'],
|
|
67
67
|
ready () {
|
|
68
68
|
console.log('打票', this.billConfig, this.billData)
|
|
69
69
|
},
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
if (this.billConfig.hasBillManage) {
|
|
93
93
|
if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
|
|
94
94
|
} else {
|
|
95
|
-
await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
|
|
95
|
+
await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！', newly: true})
|
|
96
96
|
}
|
|
97
97
|
if (select) {
|
|
98
98
|
this.$refs.reportprint.print(true)
|
|
@@ -109,14 +109,13 @@
|
|
|
109
109
|
if (val) {
|
|
110
110
|
getBillData(this, val).then(() => {
|
|
111
111
|
console.log(444)
|
|
112
|
-
if(this.billConfig.autoPrint){
|
|
112
|
+
if (this.billConfig.autoPrint) {
|
|
113
113
|
this.print()
|
|
114
114
|
}
|
|
115
|
-
this
|
|
115
|
+
this.confirmbuttonfocus()
|
|
116
116
|
}).catch((error) => {
|
|
117
117
|
this.$emit('error', error)
|
|
118
118
|
})
|
|
119
|
-
this.confirmbuttonfocus()
|
|
120
119
|
}
|
|
121
120
|
}
|
|
122
121
|
},
|