-
-
+
+
+
+
+
+
+
+
+ {{form.billCode}}
+
+
{{ $t('收寄信息') }}
@@ -177,6 +208,11 @@
+
+
+
+
+
@@ -189,23 +225,6 @@
+
+
+
+
+
+
+
+ {{item.productTypeName}}
+
+
+ {{ item.agingDesc }} ￥{{ item.estFee }}
+
+
+
+
-
-
-
-
-
-
-
- {{item.productTypeName}}
-
-
- {{ item.agingDesc }} ￥{{ item.estFee }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请带纸箱
- 需要爬楼
- 来前电话
-
-
-
-
-
-
{{ $t('单证文件') }}
+
+
+
+
+
+
+
@@ -696,9 +729,9 @@ data() {
productFeeList:[],
// 表单校验
rules: {
- billCode: [
- { required: true, message: "运单号不能为空", trigger: ["blur",'change'] }
- ],
+ // billCode: [
+ // { required: true, message: "运单号不能为空", trigger: ["blur",'change'] }
+ // ],
destinationCountry: [
{ required: true, message: "目的国不能为空", trigger: ["blur",'change'] }
],
@@ -803,9 +836,9 @@ data() {
freight: [
{ required: true, message: "运费不能为空", trigger: "blur" }
],
- sendSiteCode: [
- { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
- ],
+ // sendSiteCode: [
+ // { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
+ // ],
// sendDate: [
// { required: true, message: "发货时间不能为空", trigger: "blur" }
// ],
@@ -837,12 +870,69 @@ computed: {
created() {
this.action=this.$route.query.action;
+ this.billCode=this.$route.query.billCode;
this.initData();
},
mounted() {
},
methods: {
+ initData() {
+ this.reset();
+ this.form.productTypeSelArr=null;
+ this.form.sendDate =parseTime(new Date());
+
+ if(this.billCode && this.billCode!=undefined) {
+ this.loading = true;
+ getWaybillDetail(this.billCode).then(response => {
+ this.form = response.data;
+ this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
+ this.loading = false;
+
+ this.isNeedSave=true;
+ this.form.printTypeCheckList=[0,1,5]
+ this.form.destinationCountry=this.form.reciever.country;
+
+ if(this.form.packType){
+ this.form.packType=this.form.packType.split(",");
+ }
+
+ if(this.action=='copyOrder'){
+ this.billCode=null;
+ this.form.billCode=null;
+ }
+
+ // if(this.form.lockFlag=="T"){
+ // this.$confirm(this.form.lockReason, '提示', {
+ // confirmButtonText: '确认',
+ // cancelButtonText: '返回',
+ // type: 'warning'
+ // }).then(() => {
+
+ // }).catch(() => {
+
+ // })
+ // }
+
+ });
+ }else{
+ this.form.customsEclaration='1';
+ this.form.customsClear='1';
+ this.form.pickupMethod='2';
+ this.form.dispatchMethod='1';
+ this.form.parcelQty=1;
+ this.form.packType=['2'];
+ this.form.blGenSubbill='1';
+ this.form.paymentType='1';
+ this.form.calcFeeType='1';
+ this.form.blMessage='1'
+ this.form.blAcceptMessage='1'
+ this.isNeedSave=true;
+ this.productFeeList=[];
+ }
+
+
+ },
onSelectWarehouse(item){
this.form.intoWarehouseCode=item.code;
this.form.intoWarehouseName=item.name;
@@ -862,9 +952,14 @@ methods: {
},
onComplete(){
- this.$confirm("是否再来一单", "提示", {
+ let msgInfo="下单成功,运单号是["+this.billCode+"]请等待快递小哥上门取件~";
+ if(this.form.pickMethod==1){
+ msgInfo="下单成功,运单号是["+this.billCode+"]请~";
+ }
+
+ this.$confirm(msgInfo, "提示", {
confirmButtonText: "再下一单",
- type: "warning",
+ type: "success",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
@@ -902,76 +997,7 @@ methods: {
openCollapse(index){
},
- initData() {
- this.reset();
- this.form.productTypeSelArr=null;
- if(this.billCode && this.billCode!=undefined) {
- this.loading = true;
- getWaybillDetail(this.billCode).then(response => {
- this.form = response.data;
- this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
- this.loading = false;
-
- this.isNeedSave=true;
- this.form.printTypeCheckList=[0,1,5]
- this.form.destinationCountry=this.form.reciever.country;
-
- if(this.form.packType){
- this.form.packType=this.form.packType.split(",");
- }
-
- // if(this.form.lockFlag=="T"){
- // this.$confirm(this.form.lockReason, '提示', {
- // confirmButtonText: '确认',
- // cancelButtonText: '返回',
- // type: 'warning'
- // }).then(() => {
-
- // }).catch(() => {
-
- // })
- // }
-
- });
- }else{
-
- if(this.action=='preOrder'){
- this.form = JSON.parse(this.$route.query.routeParams)
- // this.form.customsEclaration='1';
- // this.form.customsClear='1';
- this.form.pickupMethod='2';
- this.form.dispatchMethod='1';
- this.form.parcelQty=1;
- this.form.packType=['2'];
- this.form.blGenSubbill='1';
- this.form.paymentType='1';
- this.form.calcFeeType='1';
- this.form.blMessage='1'
- this.form.blAcceptMessage='1'
- this.isNeedSave=true;
- this.productFeeList=[];
-
- }else{
-
- this.form.customsEclaration='1';
- this.form.customsClear='1';
- this.form.pickupMethod='2';
- this.form.dispatchMethod='1';
- this.form.parcelQty=1;
- this.form.packType=['2'];
- this.form.blGenSubbill='1';
- this.form.paymentType='1';
- this.form.calcFeeType='1';
- this.form.blMessage='1'
- this.form.blAcceptMessage='1'
- this.isNeedSave=true;
- this.productFeeList=[];
- }
- }
-
-
- },
// 取消按钮
cancel() {
this.reset();
@@ -1086,10 +1112,10 @@ methods: {
},
/** 提交按钮 */
submitForm() {
- this.form.sendDate =this.sendDate;
+
this.$refs["form"].validate((valid,obj) => {
if (valid) {
- this.sendDate=parseTime(new Date());
+
this.realSaveOrderInfo();
}
else {
@@ -1129,8 +1155,10 @@ methods: {
postForm.packType=this.form.packType.join(",");
}
+ realSubmitOrder(postForm).then(res => {
+ console.log("===>realSubmitOrder==>",res)
+ this.billCode=res.data.billCode;
- realSubmitOrder(postForm).then(response => {
this.$modal.msgSuccess("下单成功");
this.onComplete();
});
@@ -1183,9 +1211,13 @@ methods: {
},
handleAddGoods(){
+ if(!this.form.cargoList){
+ this.form.cargoList=[];
+ }
+
let cargo={
"goodsCode": "",
- "goodsName": "商品名称",
+ "goodsName": "填写货物名称",
"cargoQty": 1,
"length": 0,
"width": 0,
@@ -1338,7 +1370,7 @@ methods: {
}
.el-form-item__label {
- font-size: 12px!important;
+ font-size: 14px!important;
}
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 94c3862..3dd1500 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -212,36 +212,38 @@
+
+ 查看
+
+
修改
取消订单
-
- 确认
-
+
-
+
再来一单
进仓对货
+
+
+ 下载进仓PDF
-
+
-
+
@@ -502,8 +511,12 @@
-
+
+
+
+
@@ -575,7 +588,7 @@ export default {
WaybillDetailReadOnly,
},
- dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+ dicts: ['emis_order_status','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
],
@@ -825,9 +838,15 @@ export default {
this.openTraceInfo=true;
},
handleView(row){
- this.currentTraceBillCode=row.billCode;
+ // this.billCode=row.billCode;
this.openView=true;
},
+ handleUpdate(row) {
+ this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"modify",billCode: this.billCode }})
+ },
+ handleCopyOrderRecord(row){
+ this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"copyOrder",billCode: this.billCode }})
+ },
initQueryParams(){
// this.queryOrderType="1";
// this.queryOrderDateType="1";
@@ -888,9 +907,12 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
- // if(selection!=null){
- // this.billCode=selection[0].billCode;
- // }
+ console.log("====>selection==>",selection)
+ if(selection!=null){
+ this.billCode=selection[0].billCode;
+ }
+ console.log("====>billCode==>",this.billCode)
+
this.selectionList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1