aike/emis-oms-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-29 08:00:59 +08:00
parent 8212551754
commit 2e99e01b37
4 changed files with 280 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/views/oms/EmisBaseTools/GoodsInput.vue
View File

@ -24,7 +24,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货物名称" align="left" prop="goodsName" width="100" /> <el-table-column label="货物名称" align="left" prop="goodsName" width="100" />
<el-table-column label="英文名称" align="center" prop="goodsNameEn" width="100" :show-overflow-tooltip="true" /> <el-table-column label="英文名称" align="center" prop="goodsNameEn" width="150" :show-overflow-tooltip="true" />
</el-table> </el-table>
<el-pagination v-show="pagination" small <el-pagination v-show="pagination" small
@ -38,17 +38,16 @@
<el-input <el-input
slot="reference" slot="reference"
ref="inputValue" ref="inputValue"
:value="slable" :value="svalue"
:placeholder="placeholder" :placeholder="placeholder"
@input="onInput" @input="onInput"
@click.native="onClick"
@blur="onBlur" @blur="onBlur"
@clear="onClear" @clear="onClear"
clearable clearable
> >
<template slot="suffix"> <!-- <template slot="suffix">
<i slot="suffix" class="el-icon-edit"></i> <i slot="suffix" class="el-icon-edit"></i>
</template> </template> -->
</el-input> </el-input>
</el-popover> </el-popover>
@ -59,6 +58,7 @@
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
import { listSimpleEmisGoods} from "@/api/oms/emisGoods"; import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
import { debounce } from 'throttle-debounce'
export default { export default {
name: "GoodsInput", name: "GoodsInput",
@ -68,14 +68,6 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
type: String, type: String,
required: false required: false
}, },
sideCode: {
type: String,
required: false
},
postCode:{
type: String,
required: false
},
placeholder:{ placeholder:{
type: String, type: String,
required: false required: false
@ -96,16 +88,7 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
total:0, total:0,
optionItems: [], optionItems: [],
// 缺省值
defaultTotal:0,
defaultItems:null,
svalue: this.value, svalue: this.value,
slable: null,
isInputing: false,
isInit:true,
queryParams:{ queryParams:{
pageNum:1, pageNum:1,
@ -117,10 +100,7 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
}, },
watch: { watch: {
value(newVal,oldVal) { value(newVal,oldVal) {
if(this.value!=null && this.isInit){
this.svalue=this.value; this.svalue=this.value;
this.queryData(null,this.svalue);
}
}, },
}, },
@ -129,38 +109,17 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
this.createdId = String(new Date().getTime()) this.createdId = String(new Date().getTime())
}, },
created() { created() {
if(this.value!=null && this.isInit){
this.svalue=this.value; this.svalue=this.value;
this.queryData(null,this.svalue);
}
}, },
methods: { methods: {
onClick(){
this.isInit=false;
// 第一次点击时需要初始化
if(!this.defaultItems){
this.queryParams.pageNum=1;
this.queryData(null,null);
}else{
this.total = this.defaultTotal;
this.optionItems = [...this.defaultItems];
}
// this.$refs.popoverRef.doShow();
},
onInput(val) { onInput(val) {
if(val == null ) return; this.svalue = val;
this.isInputing = true;
this.slable = val;
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.queryData(val,null) this.queryParams.goodsName=val;
debounce(250, this.queryData() );
}, },
onRowClick(row, column, event) { onRowClick(row, column, event) {
this.svalue=row.goodsName; this.svalue=row.goodsName;
this.slable=row.goodsName;
this.isInputing = false;
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.$emit("onChange",row); this.$emit("onChange",row);
@ -175,18 +134,12 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
} }
}, },
onClear(el){ onClear(el){
this.slable = null;
this.svalue = null; this.svalue = null;
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]); this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
}, },
onBlur(el) { onBlur(el) {
// 如果编辑没有选择则清关历史记录
if( this.isInputing ){
this.svalue = null;
this.slable = null;
}
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]); this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
}, },
@ -194,9 +147,8 @@ import { listSimpleEmisGoods} from "@/api/oms/emisGoods";
this.queryParams.pageNum = cur this.queryParams.pageNum = cur
this.queryData() this.queryData()
}, },
queryData(val,key) { queryData() {
this.loading = true; this.loading = true;
this.queryParams.goodsName = val;
listSimpleEmisGoods(this.queryParams).then(response => { listSimpleEmisGoods(this.queryParams).then(response => {
this.loading = false; this.loading = false;

26
src/views/oms/dashboard.vue
View File

@ -127,10 +127,25 @@
<CardWithHeader header="快捷入口" height="146px" > <CardWithHeader header="快捷入口" height="146px" >
<template v-slot:body> <template v-slot:body>
<div style="display: flex;justify-content: space-between;flex-flow:row wrap "> <div style="display: flex;justify-content: space-between;flex-flow:row wrap ">
<el-button size="medium" plain ><span>单票下单</span></el-button> <el-button size="medium"
<el-button size="medium" plain ><span>批量下单</span></el-button> plain @click="goRouter('/orderMgnt/OrderRecord?action=add')" >
<el-button size="medium" plain ><span>订单管理</span></el-button> <span>单票下单</span>
<el-button size="medium" plain ><span>单证管理</span></el-button> </el-button>
<el-button size="medium" plain
@click="goRouter('/orderMgnt/BatchOrderRecord?action=add')"
>
<span>批量下单</span>
</el-button>
<el-button size="medium" plain
@click="goRouter('/orderMgnt/SendOrderbillList')"
>
<span>订单管理</span>
</el-button>
<el-button size="medium" plain
><span>单证管理</span>
</el-button>
<el-button size="medium" plain ><span>账单管理</span></el-button> <el-button size="medium" plain ><span>账单管理</span></el-button>
<el-button size="medium" plain ><span>供应商管理</span></el-button> <el-button size="medium" plain ><span>供应商管理</span></el-button>
</div> </div>
@ -327,6 +342,9 @@ export default {
}, },
cardLayOut(){ cardLayOut(){
},
goRouter(path){
this.$router.push({ path: path });
} }
}, },
} }

292
src/views/oms/emisWaybill/OrderRecord.vue
View File

@ -1,6 +1,37 @@
<template> <template>
<div class="app-container" > <div class="app-container" >
<el-form ref="form" size="mini" :model="form" :rules="rules" :disabled="this.form.lockFlag=='T'" label-width="100px"> <el-form ref="form" size="mini" :model="form" :rules="rules" :disabled="this.form.lockFlag=='T'" label-width="90px">
<el-row v-if="this.billCode" :gutter="0" style="display: flex;flex-wrap: wrap; border-bottom: 1px dotted #e7e7e7;" >
<!-- 运单录入 -->
<el-col :span="6" >
<el-form-item :label="$t('运单号:')" prop="billCode" label-width="60px" >
<div style="display:inline-flex">
<div style="font-weight: 600;color: #b12e29;">
{{form.billCode}}
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('发货时间:')" prop="sendDate" label-width="80px">
{{form.sendDate}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('揽收网点:')" prop="sendSiteName" label-width="80px">
{{form.sendSiteName}}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('订单状态:')" prop="orderStatus" label-width="80px">
<dict-tag :options="dict.type.emis_order_status" :value="form.orderStatus"/>
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="" name="2"> <el-collapse-item title="" name="2">
<template slot="title"> <template slot="title">
@ -177,6 +208,11 @@
<TimePicker v-model="form.pickTimeRange" ></TimePicker> <TimePicker v-model="form.pickTimeRange" ></TimePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="选择线路" prop="transLine">
<TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country" isInitiated="true" @onChange="preCalcFee"></TransLinePicker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.pickupMethod==1"> <el-col :span="24" v-if="form.pickupMethod==1">
<el-form-item :label="$t('选择仓库')" prop="intoWarehouseCode"> <el-form-item :label="$t('选择仓库')" prop="intoWarehouseCode">
<WarehouseSimplePicker v-model="form.intoWarehouseCode" @onChange="onSelectWarehouse"></WarehouseSimplePicker> <WarehouseSimplePicker v-model="form.intoWarehouseCode" @onChange="onSelectWarehouse"></WarehouseSimplePicker>
@ -188,23 +224,6 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="24" v-if="form.pickupMethod==1">
<el-form-item :label="$t('进仓单号')" prop="warehouseInNo" >
<el-input v-model="form.warehouseInNo" style="text-align: right;" placeholder="" />
</el-form-item>
</el-col>
<!-- this.form.intoWarehouseCode=item.code;
this.form.intoWarehouseName=item.name;
this.form.intoWarehouseAddress=item.address;
this.form.intoWarehouseContact=item.contact;
this.form.intoWarehousePhone=item.tel; -->
<el-col :span="24">
<el-form-item label="选择线路" prop="transLine">
<TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country" isInitiated="true" @onChange="preCalcFee"></TransLinePicker>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('报关方式')" prop="customsEclaration"> <el-form-item :label="$t('报关方式')" prop="customsEclaration">
@ -244,12 +263,25 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="24"> <el-col :span="12">
<el-form-item label="" prop="remark" label-width="0px"> <el-form-item :label="$t('合同号')" prop="custOrderId" >
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="12">
</el-col>
<el-col :span="24">
<el-form-item label="给快递员捎话" prop="orderRemark" >
<CustomerPrivEmpSimplePicker :placeholder="$t('专属业务员')" v-model="form.operateEmployeeCode" postCode="OP" ></CustomerPrivEmpSimplePicker>
<div style="width:100%;margin-bottom:5px">
<span class="goods-tag" @click="onQuickRemark($event)">请带纸箱</span>
<span class="goods-tag" @click="onQuickRemark($event)">需要爬楼</span>
<span class="goods-tag" @click="onQuickRemark($event)">来前电话</span>
</div>
<el-input v-model="form.orderRemark" type="textarea" :placeholder="$t('输入其他需求')" maxlength="150" show-word-limit />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -328,13 +360,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="24">
</el-col>
</el-row>
</div>
<div> <div>
<!-- <div>产品类型</div> --> <!-- <div>产品类型</div> -->
<el-form-item :label="$t('产品类型')" prop="productType" > <el-form-item :label="$t('产品选择')" prop="productType" >
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col v-if="productFeeList&&productFeeList.length>0" :span="24" > <el-col v-if="productFeeList&&productFeeList.length>0" :span="24" >
<div class="product-fee-select" style="display: flex;flex-wrap: wrap;"> <div class="product-fee-select" style="display: flex;flex-wrap: wrap;">
@ -355,30 +384,20 @@
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item :label="$t('合同号')" prop="custOrderId" >
<el-input v-model="form.custOrderId" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="16">
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="给快递员捎话" prop="orderRemark" > <el-form-item :label="$t('运费预估')" prop="freight" >
<CustomerPrivEmpSimplePicker :placeholder="$t('专属业务员')" v-model="form.operateEmployeeCode" postCode="OP" ></CustomerPrivEmpSimplePicker> <span style="font-size:15px;color:red;font-weight:500">￥{{form.freight}}</span>
<div style="width:100%;margin-bottom:5px">
<span class="goods-tag" @click="onQuickRemark($event)">请带纸箱</span>
<span class="goods-tag" @click="onQuickRemark($event)">需要爬楼</span>
<span class="goods-tag" @click="onQuickRemark($event)">来前电话</span>
</div>
<el-input v-model="form.orderRemark" type="textarea" :placeholder="$t('输入其他需求')" maxlength="150" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</el-col>
</el-row> </el-row>
</div> </div>
</el-collapse-item> </el-collapse-item>
<!-- v-if="needDeclare==1" --> <!-- v-if="needDeclare==1" -->
<el-collapse-item title="" name="3" > <el-collapse-item title="" name="3" >
@ -411,10 +430,10 @@
'padding': '0px!important', 'padding': '0px!important',
'padding-left': '0px!important', 'padding-left': '0px!important',
'padding-right': '0px!important', 'padding-right': '0px!important',
'font-size':'12px' 'font-size':'13px'
}" }"
:header-cell-style="{ :header-cell-style="{
'font-size':'12px' 'font-size':'13x'
}" }"
border border
stripe stripe
@ -524,11 +543,25 @@
</el-table> </el-table>
</div> </div>
</el-col> </el-col>
<el-col :span="18"> <!-- <el-col :span="18">
<div>申报文件</div> <div>申报文件</div>
<div> <div>
<FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload> <FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
</div> </div>
</el-col> -->
</el-row>
</el-collapse-item>
<el-collapse-item title="" name="4" >
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('单证文件') }}</span>
</div>
</template>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="18">
<div>
<FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
</div>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@ -696,9 +729,9 @@ data() {
productFeeList:[], productFeeList:[],
// 表单校验 // 表单校验
rules: { rules: {
billCode: [ // billCode: [
{ required: true, message: "运单号不能为空", trigger: ["blur",'change'] } // { required: true, message: "运单号不能为空", trigger: ["blur",'change'] }
], // ],
destinationCountry: [ destinationCountry: [
{ required: true, message: "目的国不能为空", trigger: ["blur",'change'] } { required: true, message: "目的国不能为空", trigger: ["blur",'change'] }
], ],
@ -803,9 +836,9 @@ data() {
freight: [ freight: [
{ required: true, message: "运费不能为空", trigger: "blur" } { required: true, message: "运费不能为空", trigger: "blur" }
], ],
sendSiteCode: [ // sendSiteCode: [
{ required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] } // { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
], // ],
// sendDate: [ // sendDate: [
// { required: true, message: "发货时间不能为空", trigger: "blur" } // { required: true, message: "发货时间不能为空", trigger: "blur" }
// ], // ],
@ -837,12 +870,69 @@ computed: {
created() { created() {
this.action=this.$route.query.action; this.action=this.$route.query.action;
this.billCode=this.$route.query.billCode;
this.initData(); this.initData();
}, },
mounted() { mounted() {
}, },
methods: { 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){ onSelectWarehouse(item){
this.form.intoWarehouseCode=item.code; this.form.intoWarehouseCode=item.code;
this.form.intoWarehouseName=item.name; this.form.intoWarehouseName=item.name;
@ -862,9 +952,14 @@ methods: {
}, },
onComplete(){ onComplete(){
this.$confirm("是否再来一单", "提示", { let msgInfo="下单成功,运单号是["+this.billCode+"]请等待快递小哥上门取件~";
if(this.form.pickMethod==1){
msgInfo="下单成功,运单号是["+this.billCode+"]请~";
}
this.$confirm(msgInfo, "提示", {
confirmButtonText: "再下一单", confirmButtonText: "再下一单",
type: "warning", type: "success",
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
closeOnClickModal: false, closeOnClickModal: false,
showCancelButton: false, showCancelButton: false,
@ -902,76 +997,7 @@ methods: {
openCollapse(index){ 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() { cancel() {
this.reset(); this.reset();
@ -1086,10 +1112,10 @@ methods: {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.sendDate =this.sendDate;
this.$refs["form"].validate((valid,obj) => { this.$refs["form"].validate((valid,obj) => {
if (valid) { if (valid) {
this.sendDate=parseTime(new Date());
this.realSaveOrderInfo(); this.realSaveOrderInfo();
} }
else { else {
@ -1129,8 +1155,10 @@ methods: {
postForm.packType=this.form.packType.join(","); 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.$modal.msgSuccess("下单成功");
this.onComplete(); this.onComplete();
}); });
@ -1183,9 +1211,13 @@ methods: {
}, },
handleAddGoods(){ handleAddGoods(){
if(!this.form.cargoList){
this.form.cargoList=[];
}
let cargo={ let cargo={
"goodsCode": "", "goodsCode": "",
"goodsName": "商品名称", "goodsName": "填写货物名称",
"cargoQty": 1, "cargoQty": 1,
"length": 0, "length": 0,
"width": 0, "width": 0,
@ -1338,7 +1370,7 @@ methods: {
} }
.el-form-item__label { .el-form-item__label {
font-size: 12px!important; font-size: 14px!important;
} }

80
src/views/oms/emisWaybill/SendOrderbillList.vue
View File

@ -212,36 +212,38 @@
<div slot="toolbar"> <div slot="toolbar">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
icon="el-icon-view"
:disabled="single"
@click="handleView"
>查看</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
icon="el-icon-edit"
size="mini" size="mini"
icon="el-icon-edit"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="primary"
plain plain
icon="el-icon-edit"
size="mini" size="mini"
icon="el-icon-cancel"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>取消订单</el-button> >取消订单</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>确认</el-button>
</el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -252,7 +254,7 @@
@click="handleUpdate" @click="handleUpdate"
>取消货物</el-button> >取消货物</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
@ -261,28 +263,35 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>异常反馈</el-button> >异常反馈</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="primary"
plain plain
icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleCopyOrderRecord"
>再来一单</el-button> >再来一单</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="primary"
plain
size="mini"
:disabled="single"
@click="handleInWarehouseConfirm"
>进仓对货</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain plain
icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>下载进仓PDF</el-button> >下载进仓PDF</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
@ -291,7 +300,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>查看订单</el-button> >查看订单</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -317,7 +326,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('进仓预报单')" align="center" prop="intoWarehouseBillCode" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" width="100" > <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/> <dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
@ -502,8 +511,12 @@
</XdTable> </XdTable>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body> <!-- <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView> <TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog> -->
<el-dialog title="查看" :visible.sync="openView" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<WaybillDetailReadOnly :key="billCode" :billCode="billCode" ></WaybillDetailReadOnly>
</el-dialog> </el-dialog>
</XdPageContainer> </XdPageContainer>
@ -575,7 +588,7 @@ export default {
WaybillDetailReadOnly, 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_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' '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; this.openTraceInfo=true;
}, },
handleView(row){ handleView(row){
this.currentTraceBillCode=row.billCode; // this.billCode=row.billCode;
this.openView=true; 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(){ initQueryParams(){
// this.queryOrderType="1"; // this.queryOrderType="1";
// this.queryOrderDateType="1"; // this.queryOrderDateType="1";
@ -888,9 +907,12 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
// if(selection!=null){ console.log("====>selection==>",selection)
// this.billCode=selection[0].billCode; if(selection!=null){
// } this.billCode=selection[0].billCode;
}
console.log("====>billCode==>",this.billCode)
this.selectionList=selection; this.selectionList=selection;
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length!==1