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

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-05-20 19:42:15 +08:00
commit 586aef584e
3 changed files with 134 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
src/views/emis/emisWaybill/emisWaybillRecord.vue
View File

@ -625,19 +625,19 @@
<el-col :span="12"> <el-col :span="12">
</el-col> </el-col>
<el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"> <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-form-item label="月结账号" prop="thirdCustomerCode" label-width="70px"> <el-form-item label="月结账号" prop="custNo" label-width="70px">
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker> <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="回款联系人" prop="payee" label-width="80px"> <el-form-item label="回款联系人" prop="payee" label-width="85px">
<PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker> <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
<PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker> <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee" ></PayeePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售联系人" prop="salesmen" label-width="80px"> <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
<SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker> <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
<SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" ></SalemanPicker> <SalemanPicker v-else :placeholder="$t('销售联系人')" v-model="form.salesmen" ></SalemanPicker>
@ -914,12 +914,15 @@ data() {
dispatchUnderlingSiteCode: [ dispatchUnderlingSiteCode: [
{ required: true, message: "目的地网点代码不能为空", trigger: "blur" } { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
], ],
// payee: [ custNo: [
// { required: true, message: "销售回款人不能为空", trigger: "blur" } { required: true, message: "月结卡号不能为空", trigger: "blur" }
// ], ],
// salesmen: [ payee: [
// { required: true, message: "销售联系人不能为空", trigger: "blur" } { required: true, message: "销售回款人不能为空", trigger: "blur" }
// ], ],
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: "blur" }
],
takePieceEmployeeCode: [ takePieceEmployeeCode: [
{ required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] } { required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] }
], ],
@ -1046,76 +1049,101 @@ methods: {
this.printerStatusMessage="打印组件已断开！"; this.printerStatusMessage="打印组件已断开！";
}, },
handleBatchPrint(){ handleBatchPrint(){
if(this.printerStatus == 1){
if(this.form.billCode){ if(this.form.billCode){
// 重要，设置为true才会把右上角X和取消区分开来 // 重要，设置为true才会把右上角X和取消区分开来
this.$confirm("确定打印?", "提示", { this.$confirm("确定打印?", "提示", {
cancelButtonText: "不打印", cancelButtonText: "不打印",
confirmButtonText: "确定打印", confirmButtonText: "确定打印",
type: "warning", type: "warning",
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
closeOnClickModal: false closeOnClickModal: false
}).then(() => { }).then(() => {
// 打印主单，子单 // 打印主单，子单
let orderList=[]; let orderList=[];
// this.currentSelection.forEach(item=>{ // this.currentSelection.forEach(item=>{
// orderList.push(item.billCode); // orderList.push(item.billCode);
// }); // });
// 打印主单 // 打印主单
orderList.push(this.form.billCode); orderList.push(this.form.billCode);
let selPrinterName=this.tanexPrinter.getDefaultPrinter(); let selPrinterName=this.tanexPrinter.getDefaultPrinter();
let selTplName="探路速运-主单联（通用）"; let selTplName="探路速运-主单联（通用）";
this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList) this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList)
// 打印子单 // 打印子单
selTplName="探路速运-子单联（通用）"; selTplName="探路速运-子单联（通用）";
let childOrderList=[] let childOrderList=[]
orderList=this.form.billCodeSub.split(','); orderList=this.form.billCodeSub.split(',');
orderList.forEach(item=>{ orderList.forEach(item=>{
if(item!=null && item!=''){ if(item!=null && item!=''){
childOrderList.push(item); childOrderList.push(item);
} }
}); });
this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList) this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList)
}).catch(() => {}); }).catch(() => {});
}
}
else{
this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
cancelButtonText: "返回操作",
confirmButtonText: "操作下一单",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.reset();
});
} }
}, },
async handlePrintPreview(){ async handlePrintPreview(){
if(this.form.billCode){ if(this.printerStatus == 1){
let pdfUrlList=[]; if(this.form.billCode){
let selPrinterName=this.tanexPrinter.getDefaultPrinter(); let pdfUrlList=[];
let selTplName="探路速运-主单联（通用）"; let selPrinterName=this.tanexPrinter.getDefaultPrinter();
let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName); let selTplName="探路速运-主单联（通用）";
pdfUrlList.push(url) let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName);
// 子单url pdfUrlList.push(url)
if(this.form.billCodeSub){ // 子单url
selTplName="探路速运-子单联（通用）"; if(this.form.billCodeSub){
let orderList=this.form.billCodeSub.split(','); selTplName="探路速运-子单联（通用）";
orderList.forEach(item=>{ let orderList=this.form.billCodeSub.split(',');
if(item!=null && item!=''){ orderList.forEach(item=>{
let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName); if(item!=null && item!=''){
pdfUrlList.push(url) let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName);
} pdfUrlList.push(url)
}
});
}
let pdfUtils=new PdfUtils({});
const loadingInstance = this.$loading({
text: '正在生成预览...'
})
pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" )
.then(url=>{
loadingInstance.close();
this.pdfUrl=url;
this.openPdfView = true;
})
.catch(error => {
});
}
}
else{
this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
cancelButtonText: "返回操作",
confirmButtonText: "操作下一单",
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false
}).then(() => {
this.reset();
}); });
}
let pdfUtils=new PdfUtils({});
const loadingInstance = this.$loading({
text: '正在生成预览...'
})
pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" )
.then(url=>{
loadingInstance.close();
this.pdfUrl=url;
this.openPdfView = true;
})
.catch(error => {
});
} }
}, },
@ -1462,18 +1490,14 @@ methods: {
}, },
handleCalcFeeItem(val,row){ handleCalcFeeItem(val,row){
let childRealFee=0.0;
if(row!=null){ if(row!=null){
if(row.calcExp){ if(row.calcExp){
let expr=row.calcExp+"s+w*d"; let expr="s+w*d";
expr=expr.replace("s",row.initialWeightFee); expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("d",row.addWeightPrice); expr=expr.replace("d",row.addWeightPrice);
expr=expr.replace("w",this.form.settlementWeight); expr=expr.replace("w",this.form.settlementWeight);
console.log(expr); row.realFee=parseFloat(eval(expr)).toFixed(2);
let childRealFee=parseFloat(eval(expr)).toFixed(2);
row.realFee=childRealFee;
console.log(childRealFee);
} }
} }

29
src/views/emis/emisWaybill/orderList.vue
View File

@ -281,7 +281,7 @@
</template> </template>
</el-table-column> - </el-table-column> -
<el-table-column label="发货信息" align="center" > <!-- <el-table-column label="发货信息" align="center" > -->
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" :show-overflow-tooltip="true"/> <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('进仓单')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('进仓单')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/>
@ -307,10 +307,10 @@
<el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> --> <!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> -->
<!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> --> <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> -->
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="寄件信息" align="center" > <!-- <el-table-column label="寄件信息" align="center" > -->
<el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
@ -327,11 +327,12 @@
<el-tag v-else type="danger">不发送</el-tag> <el-tag v-else type="danger">不发送</el-tag>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column>
<!-- </el-table-column> -->
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="收件信息" align="center"> <!-- <el-table-column label="收件信息" align="center"> -->
<el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -351,9 +352,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="货物信息" align="center"> <!-- <el-table-column label="货物信息" align="center"> -->
<el-table-column :label="$t('货物')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('货物')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" > <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
@ -376,9 +377,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="收费信息" align="center"> <!-- <el-table-column label="收费信息" align="center"> -->
<el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" > <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -391,9 +392,9 @@
<el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="签收信息" align="center"> <!-- <el-table-column label="签收信息" align="center"> -->
<el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" > <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -407,9 +408,9 @@
<el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="打印信息" align="center"> <!-- <el-table-column label="打印信息" align="center"> -->
<el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" > <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag> <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
@ -421,7 +422,7 @@
<el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" /> <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />

37
src/views/emis/emisWaybill/waybillList.vue
View File

@ -260,7 +260,7 @@
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="发货信息" align="center" > <!-- <el-table-column label="发货信息" align="center" > -->
<!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true"> <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type"> <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
@ -268,7 +268,7 @@
</router-link> </router-link>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column :label="$t('收件业务员')" align="center" prop="salesmenName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" > <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/> <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
@ -280,11 +280,16 @@
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> --> <!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> -->
<!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> --> <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
</el-table-column> <template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- </el-table-column> -->
<el-table-column label="寄件信息" align="center" > <!-- <el-table-column label="寄件信息" align="center" > -->
<el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
@ -303,11 +308,11 @@
<div v-else>不发送</div> <div v-else>不发送</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> <!-- </el-table-column> -->
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column label="收件信息" align="center"> <!-- <el-table-column label="收件信息" align="center"> -->
<el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -329,9 +334,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="货物信息" align="center"> <!-- <el-table-column label="货物信息" align="center"> -->
<el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" > <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
@ -354,9 +359,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="收费信息" align="center"> <!-- <el-table-column label="收费信息" align="center"> -->
<el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" > <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -369,9 +374,9 @@
<el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="签收信息" align="center"> <!-- <el-table-column label="签收信息" align="center"> -->
<el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" > <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -385,9 +390,9 @@
<el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="打印信息" align="center"> <!-- <el-table-column label="打印信息" align="center"> -->
<el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" > <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag> <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
@ -399,7 +404,7 @@
<el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
</el-table-column> <!-- </el-table-column> -->
<el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" /> <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />