|
|
@@ -54,7 +54,7 @@
|
|
|
<filter-date @change="onChangeTime" ref="searchCom07" />
|
|
|
<div>付款后几小时未发货：</div>
|
|
|
<div class="order-time">
|
|
|
- <el-input v-model="value.deliveryHours" class="deliveryHours-input" size="mini" type="number" :input="value.deliveryHours=value?.deliveryHours?.replace(/^(0+)|[^\d]+/g,'')" style=""></el-input>
|
|
|
+ <vxe-input v-model="value.deliveryHours" class="deliveryHours-input" clearable type="number" size="mini"></vxe-input>
|
|
|
<i class="el-icon-info" title="单位小时，不支持小数位。如果数值大于0，强制为未发货订单。同时勾选店铺可以实现不同平台的未发货时效查询"></i>
|
|
|
</div>
|
|
|
<filterMinMax title="剩余发货时间(小时)" ref="searchCom08" minField="deliveryRemainingMin" maxField="deliveryRemainingMax" @change="parameChange" />
|
|
|
@@ -164,7 +164,7 @@
|
|
|
<div class="order-right">
|
|
|
<div class="tool">
|
|
|
<order-tool @addOrder="addOrder" @smt="smtOrder" @reSmt="reSmt" @loadOrder="loadOrder" @producePurchase="producePurchase" @cancelOrder="cancelOrder"
|
|
|
- @reCancelOrder="reCancelOrder" @updateRmk="updateRmk"/>
|
|
|
+ @reCancelOrder="reCancelOrder" @updateRmk="updateRmk" @changeQues="changeQues" @changeNormal="changeNormal"/>
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
<order-table :data="data" ref="orderTable" class="order-table" @detail="detail" @mergeHandle="mergeHandle" @splitHandle="splitHandle"/>
|
|
|
@@ -187,6 +187,8 @@
|
|
|
<cancel-order-model ref="cancelOrderModel" @handleSuccess="handleSuccess" />
|
|
|
<!-- 异常 -->
|
|
|
<quest-model ref="questModel" @questHide="getQuestionList" />
|
|
|
+ <!-- 转异常 -->
|
|
|
+ <set-ques-modal ref="setQuesModal" @handleSuccess="handleSuccess" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -208,10 +210,11 @@ 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 SetQuesModal from "./components/setQuesModal.vue";
|
|
|
+import { query,getProvince,smt,unSmt,purchaseQty,unCancel,setQuestions,resetQuestion } 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,QuestModel}})
|
|
|
+ filterMinMax,loadOrderModal,PurchaseModel,MergeModel,SplitModel,CancelOrderModel,QuestModel,SetQuesModal}})
|
|
|
export default class Order extends Vue {
|
|
|
activeNames:Array<any>=['1','status']
|
|
|
radio=''
|
|
|
@@ -484,12 +487,77 @@ export default class Order extends Vue {
|
|
|
this.getQuestionList();
|
|
|
}
|
|
|
updateRmk(){
|
|
|
- let data = (this.$refs.table as any).getValue();
|
|
|
+ let data = (this.$refs.table as any).getSelectData();
|
|
|
if(data.length == 0){
|
|
|
this.$message('请选择订单');
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ }
|
|
|
+ //转异常
|
|
|
+ changeQues(){
|
|
|
+ let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
|
|
|
+ if(data.length == 0){
|
|
|
+ this.$message('请选择订单!');
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let msg = '';
|
|
|
+ let billData:Array<any>=[]
|
|
|
+ for(const item of data){
|
|
|
+ billData.push(item.id);
|
|
|
+ if(item.status == 'Question'){
|
|
|
+ if(msg){
|
|
|
+ msg = msg + ',' + item.id
|
|
|
+ }else{
|
|
|
+ msg = item.id
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(msg){
|
|
|
+ this.$message({
|
|
|
+ message:'订单“'+msg + '”状态异常，不能执行此操作！！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ (this.$refs.setQuesModal as any).setBillValue(billData);
|
|
|
+ (this.$refs.setQuesModal as any).setQuestTypeData(this.questData);
|
|
|
+ (this.$refs.setQuesModal as any).setShow(true);
|
|
|
+ }
|
|
|
+ //转正常
|
|
|
+ changeNormal(){
|
|
|
+ let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
|
|
|
+ if(data.length == 0){
|
|
|
+ this.$message('请选择订单!');
|
|
|
+ return
|
|
|
+ }
|
|
|
+ let msg = '';
|
|
|
+ let billData:Array<any>=[]
|
|
|
+ for(const item of data){
|
|
|
+ billData.push(item.id);
|
|
|
+ if(item.status != 'Question'){
|
|
|
+ if(msg){
|
|
|
+ msg = msg + ',' + item.id
|
|
|
+ }else{
|
|
|
+ msg = item.id
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(msg){
|
|
|
+ this.$message({
|
|
|
+ message:'订单“'+msg + '”状态正常常，不能执行此操作！！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.load = true
|
|
|
+ resetQuestion({idList:billData}).then(()=>{
|
|
|
+ this.load = false;
|
|
|
+ (this.$message({
|
|
|
+ message:'操作成功！',
|
|
|
+ type:'success'
|
|
|
+ }));
|
|
|
+ this.getList();
|
|
|
+ }).catch(()=>{
|
|
|
+ this.load = false;
|
|
|
+ })
|
|
|
}
|
|
|
//异常数据弹窗
|
|
|
showQuestType(){
|
|
|
@@ -499,14 +567,11 @@ export default class Order extends Vue {
|
|
|
getQuestionList(){
|
|
|
queryAll().then((res:any) => {
|
|
|
this.questData = res.data;
|
|
|
- }).catch((err:any) => {
|
|
|
-
|
|
|
- })
|
|
|
+ }).catch(() => { })
|
|
|
}
|
|
|
|
|
|
//生成采购单
|
|
|
producePurchase(){
|
|
|
-
|
|
|
let data:Array<any>= (this.$refs.orderTable as any).getSelectData();
|
|
|
if(data.length == 0){
|
|
|
this.$message('请选择订单!');
|
|
|
@@ -517,9 +582,9 @@ export default class Order extends Vue {
|
|
|
for(const item of data){
|
|
|
if(item.isSubmitted != 1){
|
|
|
if(msg){
|
|
|
- msg = msg + ',' + item.sourceId
|
|
|
+ msg = msg + ',' + item.id
|
|
|
}else{
|
|
|
- msg = item.sourceId
|
|
|
+ msg = item.id
|
|
|
}
|
|
|
}
|
|
|
ids.push(item.id)
|
|
|
@@ -608,16 +673,16 @@ export default class Order extends Vue {
|
|
|
for(const item of data){
|
|
|
if(item.isSubmitted == 1){
|
|
|
if(smtMst){
|
|
|
- smtMst = smtMst + ',' + item.sourceId
|
|
|
+ smtMst = smtMst + ',' + item.id
|
|
|
}else{
|
|
|
- smtMst = item.sourceId
|
|
|
+ smtMst = item.id
|
|
|
}
|
|
|
}
|
|
|
if(!item.pays && item.pays.length == 0){
|
|
|
if(msg){
|
|
|
- msg = msg + ',' + item.sourceId
|
|
|
+ msg = msg + ',' + item.id
|
|
|
}else{
|
|
|
- msg = item.sourceId
|
|
|
+ msg = item.id
|
|
|
}
|
|
|
}
|
|
|
ids.push(item.id)
|
|
|
@@ -639,17 +704,10 @@ export default class Order extends Vue {
|
|
|
ids:ids
|
|
|
}).then((res:any) => {
|
|
|
this.load = false;
|
|
|
- // if(res.data == data.length){
|
|
|
(this as any).$message({
|
|
|
message: res.msg,
|
|
|
type: 'success'
|
|
|
});
|
|
|
- // }else{
|
|
|
- // (this as any).$message({
|
|
|
- // message: (data.length - res.data)+'条订单提交失败！',
|
|
|
- // type: 'warning'
|
|
|
- // });
|
|
|
- // }
|
|
|
this.getList();
|
|
|
})
|
|
|
}
|
|
|
@@ -664,9 +722,9 @@ export default class Order extends Vue {
|
|
|
for(const item of data){
|
|
|
if(item.isSubmitted == 0){
|
|
|
if(smtMst){
|
|
|
- smtMst = smtMst + ',' + item.sourceId
|
|
|
+ smtMst = smtMst + ',' + item.id
|
|
|
}else{
|
|
|
- smtMst = item.sourceId
|
|
|
+ smtMst = item.id
|
|
|
}
|
|
|
}
|
|
|
ids.push(item.id)
|
|
|
@@ -682,17 +740,10 @@ export default class Order extends Vue {
|
|
|
ids:ids
|
|
|
}).then((res:any) => {
|
|
|
this.load = false;
|
|
|
- // 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();
|
|
|
})
|
|
|
}
|
|
|
@@ -830,9 +881,9 @@ export default class Order extends Vue {
|
|
|
ids.push(item.id)
|
|
|
}else{
|
|
|
if(msgIds){
|
|
|
- msgIds = msgIds + ',' + item.sourceId
|
|
|
+ msgIds = msgIds + ',' + item.id
|
|
|
}else{
|
|
|
- msgIds = item.sourceId
|
|
|
+ msgIds = item.id
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -859,9 +910,9 @@ export default class Order extends Vue {
|
|
|
ids.push(item.id)
|
|
|
}else{
|
|
|
if(msgIds){
|
|
|
- msgIds = msgIds + ',' + item.sourceId
|
|
|
+ msgIds = msgIds + ',' + item.id
|
|
|
}else{
|
|
|
- msgIds = item.sourceId
|
|
|
+ msgIds = item.id
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1020,7 +1071,7 @@ export default class Order extends Vue {
|
|
|
}
|
|
|
}
|
|
|
.deliveryHours-input{
|
|
|
- width: 70px;
|
|
|
+ width: 80px;
|
|
|
flex-shrink: 0;
|
|
|
padding: 0;
|
|
|
.el-input__inner{
|
ymy