diff --git a/src/views/oms/EmisBaseTools/TakeEmpPicker.vue b/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
index d5d0b54..e61acdd 100644
--- a/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
+++ b/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
@@ -110,7 +110,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
queryParams:{
pageNum:1,
pageSize:100,
- userId:null,
+ empCode:null,
searchValue:null,
}
};
@@ -164,7 +164,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
},
onRowClick(row, column, event) {
- this.svalue=row.userId;
+ this.svalue=row.empCode;
this.slable=row.empName;
this.isInputing = false;
@@ -212,6 +212,8 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
this.total = response.total;
this.optionItems = response.rows;
+ console.log("===>this.optionItems==>",this.optionItems);
+
// 初始值存储
if(key==null && val==null){
this.defaultTotal = this.total+0;
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 73e1595..2d33ae3 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -104,19 +104,7 @@
-->
-
@@ -257,8 +245,8 @@
-
-
+
+
@@ -669,7 +657,9 @@
运费预估:￥{{form.freight}}
温馨提示：具体运价时效以快递小哥核实为准！
- {{$t('立即下单')}}
+ {{$t('立即下单')}}
+ {{$t('立即保存')}}
+
@@ -1024,6 +1014,7 @@ watch: {
// },
created() {
+
if(this.$route.query.action=="copyOrder"){
// this.$router.meta.title="再来一单";
this.action=this.$route.query.action;
@@ -1047,6 +1038,8 @@ created() {
this.initData();
}
else if(this.$route.query.action=="preOrderByProd"){
+ this.action=this.$route.query.action;
+
this.reset();
this.initData();
@@ -1085,6 +1078,7 @@ created() {
}
else if(this.$route.query.action=="add"){
+ this.action=this.$route.query.action;
this.initData();
}
},
@@ -1207,9 +1201,20 @@ methods: {
},
onComplete(){
+
+ if(this.action!='add'){
+ this.jumpToSendOrderList();
+ return
+ }
+
+ // if(this.action!='add'){
+ // this.jumpToNewOrder();
+ // return
+ // }
+
let msgInfo="下单成功,运单号是["+this.billCode+"]请等待快递小哥上门取件~";
if(this.form.pickMethod==1){
- msgInfo="下单成功,运单号是["+this.billCode+"]请~";
+ msgInfo="下单成功,运单号是["+this.billCode+"]请联系仓库";
}
this.$confirm(msgInfo, "提示", {
@@ -1223,8 +1228,17 @@ methods: {
this.billCode=null;
this.form.billCode=null;
this.initData();
+
});
},
+ jumpToNewOrder(){
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.replace({ path: '/OrderMgnt/OrderRecord?action=add'});
+ },
+ jumpToSendOrderList(){
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.replace({ path: '/OrderMgnt/SendOrderbillList'});
+ },
onPaymentTypeChange(){
// 非月结清空月结客户选择
if(this.form.paymentType == '1' ||
@@ -1382,7 +1396,7 @@ methods: {
listBindSalesmen(qParam).then(response => {
if(response.rows&&response.rows.length>0){
let item0=response.rows[0];
- this.form.privSalesmen = item0.empCode;
+ this.form.takePieceEmployeeCode = item0.empCode;
}
});
},
@@ -1455,6 +1469,7 @@ methods: {
postForm.packType=this.form.packType.join(",");
}
+
realSubmitOrder(postForm).then(res => {
console.log("===>realSubmitOrder==>",res)
this.billCode=res.data.billCode;
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 93ee053..4b04bb7 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -96,12 +96,19 @@
+
+
+
+
+
+
+
@@ -427,12 +434,14 @@
-