|
@@ -8,7 +8,24 @@
|
|
|
<input-select :options="outLineOptions" @input="parameChangeBase($event,'idType','idValue')" ref="searchCom02" />
|
|
|
<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="statusList" ref="searchCom04" :options="statusOptions" noLimit @checkboxChange="onChange($event,'statusList')">
|
|
|
+ <template v-slot:question>
|
|
|
+ <div class="ques-box">
|
|
|
+ <div class="questtion-top" @click="showQues = !showQues">
|
|
|
+ <div class="quest-title">
|
|
|
+ <span>异常类型</span>
|
|
|
+ <i class="el-icon-setting" @click.stop="showQuestType"></i>
|
|
|
+ </div>
|
|
|
+ <i class="el-icon-arrow-down"></i>
|
|
|
+ </div>
|
|
|
+ <el-collapse-transition>
|
|
|
+ <div class="ques-list" v-show="showQues">
|
|
|
+ <el-checkbox v-for="item of questData" :label="item.id" :key="item.value">{{item.type}}</el-checkbox>
|
|
|
+ </div>
|
|
|
+ </el-collapse-transition>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </order-checkbox>
|
|
|
<order-radio title="提交状态" keyName="isSubmitted" ref="searchComsubmitStatus" :options="submitOption" noLimit @radioChange="onChangeSmt" />
|
|
|
<order-radio title="买家留言" keyName="buyerMessageFilter" ref="searchCom05" :options="buyerMessageOptions" noLimit @radioChange="onChange($event,'buyerMessageFilter')">
|
|
|
<template v-slot:buyerMessage>
|
|
@@ -166,6 +183,8 @@
|
|
|
<split-model ref="splitModel" @handleSuccess="handleSuccess" />
|
|
|
<!-- 取消订单 -->
|
|
|
<cancel-order-model ref="cancelOrderModel" @handleSuccess="handleSuccess" />
|
|
|
+ <!-- 异常 -->
|
|
|
+ <quest-model ref="questModel" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -186,20 +205,24 @@ import PurchaseModel from "./components/purchaseModel.vue"; //生成采购单
|
|
|
import MergeModel from "./components/mergeMedal.vue"; //合并
|
|
|
import SplitModel from "./components/splitModal.vue"; //拆分
|
|
|
import CancelOrderModel from "./components/cancelOrderModel.vue"; //取消订单
|
|
|
+import QuestModel from "./components/questModel.vue";
|
|
|
import { query,getProvince,smt,unSmt,purchaseQty,unCancel } from '@/api/omsOrder'
|
|
|
+import { queryAll } from '@/api/question'
|
|
|
@Component({components:{filterInput,OrderCheckbox,OrderRadio,filterDate,OrderTool,OrderTable,AddOrder,InputSelect,OrderProduct,
|
|
|
- filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel,CancelOrderModel}})
|
|
|
+ filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel,CancelOrderModel,QuestModel}})
|
|
|
export default class Order extends Vue {
|
|
|
activeNames:Array<any>=['1','status']
|
|
|
radio=''
|
|
|
radio2=''
|
|
|
data:Array<any> = []
|
|
|
load = false;
|
|
|
+ showQues=false;
|
|
|
page:any={
|
|
|
pageNo: 1, //当前页
|
|
|
pageSize: 20, //每页条数
|
|
|
total: 0 //总条数
|
|
|
}
|
|
|
+ questData:Array<any>=[]
|
|
|
value:any={
|
|
|
// sourceId:'', //线上订单号
|
|
|
// shopBuyerId:'', //买家昵称
|
|
@@ -418,15 +441,9 @@ export default class Order extends Vue {
|
|
|
statusOptions:Array<any>=[{
|
|
|
label:'待付款',
|
|
|
value:'WaitPay'
|
|
|
- },{
|
|
|
- label:'发货中',
|
|
|
- value:'Delivering'
|
|
|
},{
|
|
|
label:'被合并',
|
|
|
value:'Merged'
|
|
|
- },{
|
|
|
- label:'异常',
|
|
|
- value:'Question'
|
|
|
},{
|
|
|
label:'被拆分',
|
|
|
value:'Split'
|
|
@@ -439,12 +456,20 @@ export default class Order extends Vue {
|
|
|
},{
|
|
|
label:'已客审待财审',
|
|
|
value:'WaitFConfirm'
|
|
|
+ },{
|
|
|
+ label:'发货中',
|
|
|
+ value:'Delivering'
|
|
|
},{
|
|
|
label:'已发货',
|
|
|
value:'Sent'
|
|
|
},{
|
|
|
label:'取消',
|
|
|
value:'Cancelled'
|
|
|
+ },{
|
|
|
+ label:'异常',
|
|
|
+ value:'Question',
|
|
|
+ slot:true,
|
|
|
+ slotName:'question'
|
|
|
}]
|
|
|
shopIdListOptions:Array<any>=[]
|
|
|
|
|
@@ -452,8 +477,20 @@ export default class Order extends Vue {
|
|
|
provinceOptions:Array<any>=[]
|
|
|
|
|
|
mounted(){
|
|
|
- this.getList()
|
|
|
- this.getProvince()
|
|
|
+ this.getList();
|
|
|
+ this.getProvince();
|
|
|
+ this.getQuestionList();
|
|
|
+ }
|
|
|
+ showQuestType(){
|
|
|
+ (this.$refs.questModel as any).setShow(true);
|
|
|
+ }
|
|
|
+ //获取异常数据
|
|
|
+ getQuestionList(){
|
|
|
+ queryAll().then((res:any) => {
|
|
|
+ this.questData = res.data;
|
|
|
+ }).catch((err:any) => {
|
|
|
+
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
//生成采购单
|
|
@@ -929,7 +966,36 @@ export default class Order extends Vue {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
padding-bottom: 4px;
|
|
|
-
|
|
|
+}
|
|
|
+.ques-box{
|
|
|
+ .questtion-top{
|
|
|
+ height: 30px;
|
|
|
+ display: flex;
|
|
|
+ justify-content:space-between;
|
|
|
+ align-items: center;
|
|
|
+ padding: 0 16px;
|
|
|
+ background-color: #EEE;
|
|
|
+ cursor: pointer;
|
|
|
+ .quest-title{
|
|
|
+ height: 30px;
|
|
|
+ font-size: 12px;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ }
|
|
|
+ .el-icon-setting{
|
|
|
+ padding-right: 8px;
|
|
|
+ color: #2d99f7;
|
|
|
+ margin-left: 4px;
|
|
|
+ }
|
|
|
+ i{
|
|
|
+ font-size: 16px;
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .ques-list{
|
|
|
+ overflow: hidden;
|
|
|
+ padding-left: 16px;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
|
|
|