|
|
@@ -144,20 +144,28 @@
|
|
|
</div>
|
|
|
<div class="order-right">
|
|
|
<div class="tool">
|
|
|
- <order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder" @producePurchase="producePurchase"/>
|
|
|
+ <order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder" @producePurchase="producePurchase" @cancelOrder="cancelOrder"
|
|
|
+ @reCancelOrder="reCancelOrder"/>
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
- <order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle" @cancelOrder="cancelOrder"/>
|
|
|
+ <order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle"/>
|
|
|
<div class="page">
|
|
|
<el-pagination v-if="page.total > 0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNo" :page-size="page.pageSize"
|
|
|
:layout="'total, sizes, prev, pager, next, jumper'" :total="page.total"></el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- 手工下单 -->
|
|
|
<add-order ref="addOrder" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 手工下载 -->
|
|
|
<load-order-modal ref="loadOrder" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 生成采购单 -->
|
|
|
<purchase-model ref="purchaseModel" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 合并 -->
|
|
|
<merge-model ref="mergeModel" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 拆分 -->
|
|
|
<split-model ref="splitModel" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 取消订单 -->
|
|
|
+ <cancel-order-model ref="cancelOrderModel" @handleSuccess="handleSuccess" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -177,9 +185,10 @@ import loadOrderModal from './components/loadOrderModal.vue' //手工下载
|
|
|
import PurchaseModel from "./components/purchaseModel.vue"; //生成采购单
|
|
|
import MergeModel from "./components/mergeMedal.vue"; //合并
|
|
|
import SplitModel from "./components/splitModal.vue"; //拆分
|
|
|
-import { query,getProvince,smt,unSmt,purchaseQty } from '@/api/omsOrder'
|
|
|
+import CancelOrderModel from "./components/cancelOrderModel.vue"; //取消订单
|
|
|
+import { query,getProvince,smt,unSmt,purchaseQty,unCancel } from '@/api/omsOrder'
|
|
|
@Component({components:{filterInput,OrderCheckbox,OrderRadio,filterDate,OrderTool,OrderTable,AddOrder,InputSelect,OrderProduct,
|
|
|
- filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel}})
|
|
|
+ filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel,CancelOrderModel}})
|
|
|
export default class Order extends Vue {
|
|
|
activeNames:Array<any>=['1','status']
|
|
|
radio=''
|
|
|
@@ -556,7 +565,7 @@ export default class Order extends Vue {
|
|
|
smtMst = item.sourceId
|
|
|
}
|
|
|
}
|
|
|
- if(item.status != 'WaitConfirm'){
|
|
|
+ if(!item.pays && item.pays.length == 0){
|
|
|
if(msg){
|
|
|
msg = msg + ',' + item.sourceId
|
|
|
}else{
|
|
|
@@ -573,7 +582,7 @@ export default class Order extends Vue {
|
|
|
}
|
|
|
if(msg){
|
|
|
this.$message({
|
|
|
- message:'订单“'+msg + '”不是“已付款待审核”状态，不能提交！'
|
|
|
+ message:'订单“'+msg + '”未付款，不能提交！'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
@@ -584,7 +593,7 @@ export default class Order extends Vue {
|
|
|
this.load = false;
|
|
|
// if(res.data == data.length){
|
|
|
(this as any).$message({
|
|
|
- message: '订单提交成功！',
|
|
|
+ message: res.msg,
|
|
|
type: 'success'
|
|
|
});
|
|
|
// }else{
|
|
|
@@ -781,11 +790,49 @@ export default class Order extends Vue {
|
|
|
}
|
|
|
if(msgIds){
|
|
|
this.$message({
|
|
|
- message:'订单“'+msgIds + '”不满足取消订单操作！'
|
|
|
+ message:'订单“'+msgIds + '”已经是取消状态，不能重复操作！'
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ (this.$refs.cancelOrderModel as any).setShow(true);
|
|
|
+ (this.$refs.cancelOrderModel as any).setData(ids);
|
|
|
+ }
|
|
|
+ //反取消订单
|
|
|
+ reCancelOrder(){
|
|
|
+ let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
|
|
|
+ if(data.length == 0){
|
|
|
+ this.$message('请选择订单!');
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let ids:Array<any>=[];
|
|
|
+ let msgIds='';
|
|
|
+ for(const item of data){
|
|
|
+ if(item.status == 'Cancelled'){
|
|
|
+ ids.push(item.id)
|
|
|
+ }else{
|
|
|
+ if(msgIds){
|
|
|
+ msgIds = msgIds + ',' + item.sourceId
|
|
|
+ }else{
|
|
|
+ msgIds = item.sourceId
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(msgIds){
|
|
|
+ this.$message({
|
|
|
+ message:'订单“'+msgIds + '”订单未取消，不能执行此操作！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.load = true;
|
|
|
+ unCancel({idList:ids}).then((res:any)=>{
|
|
|
+ this.load = false;
|
|
|
+ this.$message({
|
|
|
+ message:'反取消订单操作成功！'
|
|
|
+ })
|
|
|
+ this.handleSuccess();
|
|
|
+ }).catch(()=>{
|
|
|
+ this.load = false
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
//同步店铺订单
|
ymy