|
|
@@ -9,6 +9,7 @@
|
|
|
<input-select :options="buyerOptions" @input="parameChangeInfo($event,'receiverInfo','receiverValue')" ref="searchCom03" />
|
|
|
</el-collapse-item>
|
|
|
<order-checkbox title="订单状态" keyName="statusList" ref="searchCom04" :options="statusOptions" noLimit @checkboxChange="onChange($event,'statusList')" />
|
|
|
+ <order-checkbox title="提交状态" keyName="isSubmitted" ref="isSubmitted" :options="submitOption" noLimit @checkboxChange="onChange($event,'isSubmitted')" />
|
|
|
<order-radio title="买家留言" keyName="buyerMessageFilter" ref="searchCom05" :options="buyerMessageOptions" noLimit @radioChange="onChange($event,'buyerMessageFilter')">
|
|
|
<template v-slot:buyerMessage>
|
|
|
<el-input style="width: 140px;" v-model="value.buyerMessageContent" size="mini" placeholder="留言内容"></el-input>
|
|
|
@@ -143,7 +144,7 @@
|
|
|
</div>
|
|
|
<div class="order-right">
|
|
|
<div class="tool">
|
|
|
- <order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder"/>
|
|
|
+ <order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder" @producePurchase="producePurchase"/>
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
<order-table :data="data" ref="orderTable" class="order-table" @detail="detail"/>
|
|
|
@@ -170,7 +171,7 @@ import InputSelect from "./components/inputSelect.vue";
|
|
|
import OrderProduct from "./components/orderProduct.vue";
|
|
|
import filterMinMax from './components/filterMinMax.vue'
|
|
|
import loadOrderModal from './components/loadOrderModal.vue'
|
|
|
-import { query,getProvince,smt,unSmt } from '@/api/omsOrder'
|
|
|
+import { query,getProvince,smt,unSmt,purchaseQty } from '@/api/omsOrder'
|
|
|
@Component({components:{filterInput,OrderCheckbox,OrderRadio,filterDate,OrderTool,OrderTable,AddOrder,InputSelect,OrderProduct,filterMinMax,loadOrderModal}})
|
|
|
export default class Order extends Vue {
|
|
|
test={}
|
|
|
@@ -335,27 +336,6 @@ export default class Order extends Vue {
|
|
|
value:2,
|
|
|
}]
|
|
|
|
|
|
- //旗帜
|
|
|
- flagsOptions=[{
|
|
|
- label:'无旗帜',
|
|
|
- value:'0'
|
|
|
- },{
|
|
|
- label:'红旗',
|
|
|
- value:'1'
|
|
|
- },{
|
|
|
- label:'黄旗',
|
|
|
- value:'2'
|
|
|
- },{
|
|
|
- label:'绿旗',
|
|
|
- value:'3'
|
|
|
- },{
|
|
|
- label:'蓝旗',
|
|
|
- value:'4'
|
|
|
- },{
|
|
|
- label:'紫旗',
|
|
|
- value:'5'
|
|
|
- }]
|
|
|
-
|
|
|
//订单来源
|
|
|
sourceFromOptions:Array<any>=[{
|
|
|
label:'手工下单',
|
|
|
@@ -392,6 +372,15 @@ export default class Order extends Vue {
|
|
|
value:'JUSHUITAN'
|
|
|
}]
|
|
|
|
|
|
+ //审批状态
|
|
|
+ submitOption:Array<any>=[{
|
|
|
+ label:'未提交',
|
|
|
+ value:0
|
|
|
+ },{
|
|
|
+ label:'已提交',
|
|
|
+ value:1
|
|
|
+ }]
|
|
|
+
|
|
|
//订单类型
|
|
|
typeOption:Array<any>=[{
|
|
|
label:'普通订单',
|
|
|
@@ -442,10 +431,7 @@ export default class Order extends Vue {
|
|
|
label:'取消',
|
|
|
value:'Cancelled'
|
|
|
}]
|
|
|
- shopIdListOptions:Array<any>=[{
|
|
|
- label:'店铺1',
|
|
|
- value:'1'
|
|
|
- }]
|
|
|
+ shopIdListOptions:Array<any>=[]
|
|
|
|
|
|
//省份
|
|
|
provinceOptions:Array<any>=[]
|
|
|
@@ -454,6 +440,24 @@ export default class Order extends Vue {
|
|
|
this.getList()
|
|
|
this.getProvince()
|
|
|
}
|
|
|
+
|
|
|
+ //生成采购单
|
|
|
+ producePurchase(){
|
|
|
+ let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
|
|
|
+ if(data.length == 0){
|
|
|
+ this.$message('请选择订单!');
|
|
|
+ }
|
|
|
+ let ids:Array<any>=[];
|
|
|
+ for(const item of data){
|
|
|
+ ids.push(item.id)
|
|
|
+ }
|
|
|
+ purchaseQty({
|
|
|
+ ids:ids
|
|
|
+ }).then(() => {
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
clearSearchValue(){
|
|
|
this.value={};
|
|
|
for(const key in this.$refs){
|
|
|
@@ -488,11 +492,19 @@ export default class Order extends Vue {
|
|
|
}
|
|
|
smt({
|
|
|
ids:ids
|
|
|
- }).then(() => {
|
|
|
- (this as any).$message({
|
|
|
- message: '订单审批成功！',
|
|
|
- type: 'success'
|
|
|
- });
|
|
|
+ }).then((res:any) => {
|
|
|
+ if(res.data == data.length){
|
|
|
+ (this as any).$message({
|
|
|
+ message: '订单审批成功！',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ (this as any).$message({
|
|
|
+ message: (data.length - res.data)+'条订单审批失败！',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
this.getList();
|
|
|
})
|
|
|
}
|
|
|
@@ -507,11 +519,18 @@ export default class Order extends Vue {
|
|
|
}
|
|
|
unSmt({
|
|
|
ids:ids
|
|
|
- }).then(() => {
|
|
|
- (this as any).$message({
|
|
|
- message: '订单反审批成功！',
|
|
|
- type: 'success'
|
|
|
- });
|
|
|
+ }).then((res:any) => {
|
|
|
+ if(res.data == data.length){
|
|
|
+ (this as any).$message({
|
|
|
+ message: '订单反审批成功！',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ (this as any).$message({
|
|
|
+ message: (data.length - res.data)+'条订单反审批失败！',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
this.getList();
|
|
|
})
|
|
|
}
|
|
|
@@ -601,6 +620,7 @@ export default class Order extends Vue {
|
|
|
// this.page.pageSize = res.data.size;
|
|
|
this.page.total = res.data.total;
|
|
|
this.load = false;
|
|
|
+ this.$forceUpdate();
|
|
|
}).catch((err:any) => {
|
|
|
this.load = false;
|
|
|
})
|
AlanWong