|
|
@@ -29,6 +29,92 @@
|
|
29
|
29
|
</el-col>
|
|
30
|
30
|
</el-row>
|
|
31
|
31
|
<el-row>
|
|
|
32
|
+ <el-col :span='8'>
|
|
|
33
|
+ <el-form-item label="商品分类" prop="className">
|
|
|
34
|
+ <el-cascader
|
|
|
35
|
+ v-model="parentids"
|
|
|
36
|
+ :options="commodityTypeLists"
|
|
|
37
|
+ :props="typeDropProps"
|
|
|
38
|
+ placeholder="请选择商品分类"
|
|
|
39
|
+ clearable
|
|
|
40
|
+ filterable
|
|
|
41
|
+ change-on-select
|
|
|
42
|
+ class="form_select"
|
|
|
43
|
+ @change="commodityTypeChange">
|
|
|
44
|
+ </el-cascader>
|
|
|
45
|
+ </el-form-item>
|
|
|
46
|
+ </el-col>
|
|
|
47
|
+ <el-col :span='8'>
|
|
|
48
|
+ <el-form-item label="商品" prop="productName" >
|
|
|
49
|
+ <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable placeholder="请选择订单类型" @change="commodityListChange">
|
|
|
50
|
+ <el-option
|
|
|
51
|
+ v-for="item in commodityListLists"
|
|
|
52
|
+ :key="item.F_ProductId"
|
|
|
53
|
+ :label="item.F_ProductName"
|
|
|
54
|
+ :value="item">
|
|
|
55
|
+ </el-option>
|
|
|
56
|
+ </el-select>
|
|
|
57
|
+ </el-form-item>
|
|
|
58
|
+ </el-col>
|
|
|
59
|
+ <el-col :span='4'>
|
|
|
60
|
+ <el-form-item label="商品数量" prop="num" >
|
|
|
61
|
+ <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
|
|
|
62
|
+ </el-form-item>
|
|
|
63
|
+ </el-col>
|
|
|
64
|
+ </el-row>
|
|
|
65
|
+ <el-row>
|
|
|
66
|
+ <el-col :span='8'>
|
|
|
67
|
+ <el-form-item label="库存(一)" prop="stockQuantity" >
|
|
|
68
|
+ <el-input v-model="stockQuantity.stockOne" placeholder="库存(一)" disabled/>
|
|
|
69
|
+ </el-form-item>
|
|
|
70
|
+ </el-col>
|
|
|
71
|
+ <el-col :span='8'>
|
|
|
72
|
+ <el-form-item label="库存(二)" prop="stockQuantity" >
|
|
|
73
|
+ <el-input v-model="stockQuantity.stockTwo" placeholder="库存(二)" disabled/>
|
|
|
74
|
+ </el-form-item>
|
|
|
75
|
+ </el-col>
|
|
|
76
|
+ </el-row>
|
|
|
77
|
+ <el-row>
|
|
|
78
|
+ <el-form-item>
|
|
|
79
|
+ <el-button type="primary" @click="addCommodity">添加商品</el-button>
|
|
|
80
|
+ <el-button type="primary" @click="getActivityAccountList">获取优惠</el-button>
|
|
|
81
|
+ </el-form-item>
|
|
|
82
|
+ </el-row>
|
|
|
83
|
+ <el-row>
|
|
|
84
|
+ <el-col :span='24'>
|
|
|
85
|
+ <el-form-item label="商品">
|
|
|
86
|
+ <el-table :data="commodityTableData" stripe style="width: 100%">
|
|
|
87
|
+ <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
|
|
|
88
|
+ <el-table-column prop="F_Count" label="商品数量" align="center" ></el-table-column>
|
|
|
89
|
+ <el-table-column label="操作" align="center">
|
|
|
90
|
+ <template slot-scope="scope">
|
|
|
91
|
+ <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
|
|
|
92
|
+ </template>
|
|
|
93
|
+ </el-table-column>
|
|
|
94
|
+ </el-table>
|
|
|
95
|
+ </el-form-item>
|
|
|
96
|
+ </el-col>
|
|
|
97
|
+ </el-row>
|
|
|
98
|
+ <el-row>
|
|
|
99
|
+ </el-row>
|
|
|
100
|
+ <el-row>
|
|
|
101
|
+ <el-col :span='24'>
|
|
|
102
|
+ <el-form-item label="优惠">
|
|
|
103
|
+ <el-table :data="activityAccountData" stripe style="width: 100%" @selection-change="activityAccountSelectionChange">
|
|
|
104
|
+ <el-table-column type="selection" width="55"></el-table-column>
|
|
|
105
|
+ <el-table-column label="活动类型" align="center">
|
|
|
106
|
+ <template slot-scope="scope">
|
|
|
107
|
+ {{ scope.row.type | activityAccountTypeFilter }}
|
|
|
108
|
+ </template>
|
|
|
109
|
+ </el-table-column>
|
|
|
110
|
+ <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
|
|
|
111
|
+ <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
|
|
|
112
|
+ </el-table>
|
|
|
113
|
+ </el-form-item>
|
|
|
114
|
+ </el-col>
|
|
|
115
|
+ </el-row>
|
|
|
116
|
+
|
|
|
117
|
+ <el-row>
|
|
32
|
118
|
<el-col :span='12'>
|
|
33
|
119
|
<el-form-item label="订单类型" prop="F_Type" >
|
|
34
|
120
|
<el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择订单类型">
|
|
|
@@ -172,78 +258,6 @@
|
|
172
|
258
|
</el-form-item>
|
|
173
|
259
|
</el-col>
|
|
174
|
260
|
</el-row>
|
|
175
|
|
- <el-row>
|
|
176
|
|
- <el-col :span='8'>
|
|
177
|
|
- <el-form-item label="商品分类" prop="className">
|
|
178
|
|
- <el-cascader
|
|
179
|
|
- v-model="parentids"
|
|
180
|
|
- :options="commodityTypeLists"
|
|
181
|
|
- :props="typeDropProps"
|
|
182
|
|
- placeholder="请选择商品分类"
|
|
183
|
|
- clearable
|
|
184
|
|
- filterable
|
|
185
|
|
- change-on-select
|
|
186
|
|
- @change="commodityTypeChange"
|
|
187
|
|
- style="width: 100%;"/>
|
|
188
|
|
- </el-form-item>
|
|
189
|
|
- </el-col>
|
|
190
|
|
- <el-col :span='8'>
|
|
191
|
|
- <el-form-item label="商品" prop="productName" >
|
|
192
|
|
- <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择订单类型" @change="commodityListChange">
|
|
193
|
|
- <el-option
|
|
194
|
|
- v-for="item in commodityListLists"
|
|
195
|
|
- :key="item.F_ProductId"
|
|
196
|
|
- :label="item.F_ProductName"
|
|
197
|
|
- :value="item">
|
|
198
|
|
- </el-option>
|
|
199
|
|
- </el-select>
|
|
200
|
|
- </el-form-item>
|
|
201
|
|
- </el-col>
|
|
202
|
|
- <el-col :span='8'>
|
|
203
|
|
- <el-form-item label="商品数量" prop="num" >
|
|
204
|
|
- <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
|
|
205
|
|
- </el-form-item>
|
|
206
|
|
- </el-col>
|
|
207
|
|
- </el-row>
|
|
208
|
|
- <el-row>
|
|
209
|
|
- <el-form-item>
|
|
210
|
|
- <el-button type="primary" @click="addCommodity">添加商品</el-button>
|
|
211
|
|
- <el-button type="primary" @click="getActivityAccountList">获取优惠</el-button>
|
|
212
|
|
- </el-form-item>
|
|
213
|
|
- </el-row>
|
|
214
|
|
- <el-row>
|
|
215
|
|
- <el-col :span='24'>
|
|
216
|
|
- <el-form-item label="商品">
|
|
217
|
|
- <el-table :data="commodityTableData" stripe style="width: 100%">
|
|
218
|
|
- <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
|
|
219
|
|
- <el-table-column prop="F_Count" label="商品数量" align="center" ></el-table-column>
|
|
220
|
|
- <el-table-column label="操作" align="center">
|
|
221
|
|
- <template slot-scope="scope">
|
|
222
|
|
- <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
|
|
223
|
|
- </template>
|
|
224
|
|
- </el-table-column>
|
|
225
|
|
- </el-table>
|
|
226
|
|
- </el-form-item>
|
|
227
|
|
- </el-col>
|
|
228
|
|
- </el-row>
|
|
229
|
|
- <el-row>
|
|
230
|
|
- </el-row>
|
|
231
|
|
- <el-row>
|
|
232
|
|
- <el-col :span='24'>
|
|
233
|
|
- <el-form-item label="优惠">
|
|
234
|
|
- <el-table :data="activityAccountData" stripe style="width: 100%" @selection-change="activityAccountSelectionChange">
|
|
235
|
|
- <el-table-column type="selection" width="55"></el-table-column>
|
|
236
|
|
- <el-table-column label="活动类型" align="center">
|
|
237
|
|
- <template slot-scope="scope">
|
|
238
|
|
- {{ scope.row.type | activityAccountTypeFilter }}
|
|
239
|
|
- </template>
|
|
240
|
|
- </el-table-column>
|
|
241
|
|
- <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
|
|
242
|
|
- <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
|
|
243
|
|
- </el-table>
|
|
244
|
|
- </el-form-item>
|
|
245
|
|
- </el-col>
|
|
246
|
|
- </el-row>
|
|
247
|
261
|
<el-form-item label="备注" prop="F_Remark">
|
|
248
|
262
|
<el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注"/>
|
|
249
|
263
|
</el-form-item>
|
|
|
@@ -323,6 +337,10 @@ export default {
|
|
323
|
337
|
activityAccountData: [], //活动核算数据
|
|
324
|
338
|
orderType: [],//订单类型
|
|
325
|
339
|
pickerOptions, // 日期数据
|
|
|
340
|
+ stockQuantity: { //库存数量
|
|
|
341
|
+ stockOne: '',
|
|
|
342
|
+ stockTwo: '',
|
|
|
343
|
+ },
|
|
326
|
344
|
ruleForm: {
|
|
327
|
345
|
F_Customer: '', //是 sring 客户姓名
|
|
328
|
346
|
F_CustomerPhone: '', //是 sting 手机号码
|
|
|
@@ -675,6 +693,7 @@ export default {
|
|
675
|
693
|
ProductShortName: '',
|
|
676
|
694
|
tag: '',
|
|
677
|
695
|
issale: 1,
|
|
|
696
|
+ Stock: 0, //0不显示库存
|
|
678
|
697
|
}
|
|
679
|
698
|
getCommodityList(params).then(response => {
|
|
680
|
699
|
this.loading = false
|
|
|
@@ -689,9 +708,29 @@ export default {
|
|
689
|
708
|
this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
|
|
690
|
709
|
this.getCommodityListSelect()
|
|
691
|
710
|
},
|
|
|
711
|
+ getCommodityDetail() {
|
|
|
712
|
+ // this.loading = true
|
|
|
713
|
+ return new Promise(resolve => {
|
|
|
714
|
+ const params = {
|
|
|
715
|
+ ProductId: this.commoditySearchData.productId,
|
|
|
716
|
+ tag: '',
|
|
|
717
|
+ issale: -1,
|
|
|
718
|
+ Stock: 1, //1显示库存
|
|
|
719
|
+ }
|
|
|
720
|
+ getCommodityList(params).then(response => {
|
|
|
721
|
+ // this.loading = false
|
|
|
722
|
+ if (response.state.toLowerCase() === 'success') {
|
|
|
723
|
+ this.stockQuantity.stockOne = response.data.Rows[0].F_Stock
|
|
|
724
|
+ this.stockQuantity.stockTwo = response.data.Rows[0].F_Stock1
|
|
|
725
|
+ }
|
|
|
726
|
+ })
|
|
|
727
|
+ resolve()
|
|
|
728
|
+ })
|
|
|
729
|
+ },
|
|
692
|
730
|
commodityListChange(item) {
|
|
693
|
731
|
this.commoditySearchData.productId = item.F_ProductId
|
|
694
|
732
|
this.commoditySearchData.productName = item.F_ProductName
|
|
|
733
|
+ this.getCommodityDetail()
|
|
695
|
734
|
},
|
|
696
|
735
|
addCommodity() {
|
|
697
|
736
|
if (this.commoditySearchData.productName === ''){
|