aike/emis-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-11 06:40:54 +08:00
parent dd0dc2d589
commit 4d03253f53
24 changed files with 493 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/emis/emisSettleBill.js
View File

@ -17,6 +17,16 @@ export function getEmisSettleBill(id) {
})
}
// 查询结算总账单详细
export function getInfoBySettleBillNo(settleBillNo) {
return request({
url: '/emis/emisSettleBill/getInfoBySettleBillNo' ,
method: 'get',
params: {settleBillNo:settleBillNo}
})
}
// 新增结算总账单
export function addEmisSettleBill(data) {
return request({

60
src/components/PdfViewer/xdpdf/pdfjsWrapper.js
View File

@ -228,41 +228,43 @@ export default function(PDFJS) {
pendingOperation = pendingOperation.then(function() {
var getAnnotationsOperation =
pdfPage.getAnnotations({ intent: 'display' })
.then(function(annotations) {
if(pdfPage){
var getAnnotationsOperation = pdfPage.getAnnotations({ intent: 'display' })
.then(function(annotations) {
PDFJS.AnnotationLayer.render({
viewport: viewport.clone({ dontFlip: true }),
div: annotationLayerElt,
annotations: annotations,
page: pdfPage,
linkService: linkService,
renderInteractiveForms: false
});
});
PDFJS.AnnotationLayer.render({
viewport: viewport.clone({ dontFlip: true }),
div: annotationLayerElt,
annotations: annotations,
page: pdfPage,
linkService: linkService,
renderInteractiveForms: false
});
});
var pdfRenderOperation =
pdfRender.promise
.then(function() {
var pdfRenderOperation =
pdfRender.promise
.then(function() {
annotationLayerElt.style.visibility = '';
canceling = false;
pdfRender = null;
})
.catch(function(err) {
annotationLayerElt.style.visibility = '';
canceling = false;
pdfRender = null;
})
.catch(function(err) {
pdfRender = null;
if ( err instanceof PDFJS.RenderingCancelledException ) {
pdfRender = null;
if ( err instanceof PDFJS.RenderingCancelledException ) {
canceling = false;
this.renderPage(rotate);
return;
}
emitEvent('error', err);
}.bind(this))
canceling = false;
this.renderPage(rotate);
return;
}
emitEvent('error', err);
}.bind(this))
return Promise.all([getAnnotationsOperation, pdfRenderOperation]);
}
return Promise.all([getAnnotationsOperation, pdfRenderOperation]);
}.bind(this));
}

24
src/utils/TanexPrinterSdk.js
View File

@ -532,7 +532,7 @@ class TanexPrinterSdk {
}
innerGetPrintTplList(msg){
// console.log("innerGetPrintTplList")
// console.log("innerGetPrintTplList",msg)
this.isSendGetTpl=false;
@ -563,13 +563,15 @@ class TanexPrinterSdk {
if(this.recievePdfFileList.length<this.sendPdfFileListCount){
if(msg){
let ydSn=msg.Data.ydSn;
if(ydSn in this.pdfFileReceiveMap){
let tplCode=msg.Data.tplCode;
let key=ydSn+"-"+tplCode;
if(key in this.pdfFileReceiveMap){
// 文件已存在则返回
console.log(ydSn+"-PDF文件已存在");
console.log(key+"-PDF文件已存在");
return;
}
this.recievePdfFileList.push(msg.Data);
this.pdfFileReceiveMap[ydSn]=1;
this.pdfFileReceiveMap[key]=1;
if(this.onBatchGetPDFCallback!=null){
await this.onBatchGetPDFCallback(200,"获取成功",msg.Data);
@ -641,17 +643,17 @@ class TanexPrinterSdk {
if (this.ws) {
this.ws.close();
this.connected = false; // 更新连接状态
clearInterval(this.heartbeatInterval); // 清除心跳检测定时器
// clearInterval(this.heartbeatInterval); // 清除心跳检测定时器
}
}
// 开启心跳检测
start() {
this.heartbeatInterval = setInterval(() => {
if (this.getWSReadyState() === this.WS_OPEN ) {
// this.ws.ping();
this.ws.send(0x9);
}
}, 1000);
// this.heartbeatInterval = setInterval(() => {
// if (this.getWSReadyState() === this.WS_OPEN ) {
// // this.ws.ping();
// this.ws.send(0x9);
// }
// }, 1000);
}
}

6
src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
View File

@ -116,10 +116,12 @@ import { getStaffList } from "@/api/emis/emisStaff";
},
watch: {
value(newVal,oldVal) {
if(this.value!=null && this.isInit){
this.svalue=this.value;
this.queryData(null,this.svalue);
}
if(!this.svalue){
this.slable=null;
}
},
siteCode(newVal){
this.queryParams.ownerSiteCode=newVal;

55
src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
View File

@ -213,7 +213,7 @@
this.selPrinterName=this.tanexPrinter.getDefaultPrinter();
},
onGetPrintTpl(msg){
// console.log("onGetPrintTpl")
console.log("onGetPrintTpl")
this.printTplList=[];
@ -224,9 +224,11 @@
this.printTplList=newList;
}
// console.log(this.printTplList)
// console.log("====onGetPrintTpl==>",this.printTplList);
this.selTplCode=this.printTplList[0].tplCode;
if(this.printTplList&&this.printTplList.length>0){
this.selTplCode=this.printTplList[0].tplCode;
}
},
getDefaultPrinter(){
return this.tanexPrinter.getDefaultPrinter();
@ -338,12 +340,16 @@
let orderSeqMap = new Map();
// console.log("printPreviewAdv===>",printDataList);
let j=0;
printDataList.forEach(item=>{
let billArr = item.orderList.split(",");
billArr.forEach(objBillCodeStr=>{
orderSeqMap[objBillCodeStr]=j+1;
j++;
if(!(objBillCodeStr in orderSeqMap)){
orderSeqMap[objBillCodeStr]=j+1;
console.log("orderSeqMap===>",objBillCodeStr,j+1);
j++;
}
});
});
@ -362,6 +368,7 @@
"billCode":pdfData.ydSn,
"pdfUrl":null,
"pdfBase64":pdfData.file,
"tplCode":pdfData.tplCode,
"seqNo":orderSeqMap[pdfData.ydSn]
}
@ -380,11 +387,15 @@
else if(code == 800){
// 全部获取完成
// console.log("===全部获取完成ADV====>");
let newTmpList = that.pdfList.sort((one, two) => {
return one.seqNo - two.seqNo;
that.pdfList.sort((one, two) => {
let v=one.seqNo-two.seqNo;
if(one.seqNo==two.seqNo){
return one.tplCode.localeCompare(two.tplCode)
}else{
return v;
}
});
// console.log("===newTmpList====>",newTmpList);
that.pdfList=newTmpList;
that.refreshKey();
}
@ -480,6 +491,7 @@
"billCode":pdfData.ydSn,
"pdfUrl":null,
"pdfBase64":pdfData.file,
"tplCode":pdfData.tplCode,
"seqNo":orderSeqMap[pdfData.ydSn]
}
@ -495,12 +507,15 @@
else if(code == 800){
// 全部获取完成
console.log("===全部获取完成2====>");
let newTmpList = that.pdfList.sort((one, two) => {
return one.seqNo - two.seqNo;
that.pdfList.sort((one, two) => {
let v=one.seqNo-two.seqNo;
if(one.seqNo==two.seqNo){
return one.tplCode.localeCompare(two.tplCode)
}else{
return v;
}
});
console.log("===newTmpList====>",newTmpList);
that.pdfList=newTmpList;
console.log("===that.pdfList====>",that.pdfList);
that.refreshKey();
}
});
@ -584,6 +599,7 @@
"billCode":pdfData.ydSn,
"pdfUrl":null,
"pdfBase64":pdfData.file,
"tplCode":pdfData.tplCode,
"seqNo":orderSeqMap[pdfData.ydSn]
}
that.pdfList.push(pdfInfo);
@ -626,9 +642,16 @@
let needGenList=[];
let newTmpList=[...this.pdfList];
newTmpList= newTmpList.sort((one, two) => {
return one.seqNo - two.seqNo;
newTmpList.sort((one, two) => {
let v=one.seqNo-two.seqNo;
if(one.seqNo==two.seqNo){
return one.tplCode.localeCompare(two.tplCode)
}else{
return v;
}
});
for(let j=0;j<newTmpList.length;j++){
needGenList.push(newTmpList[j].pdfBase64)
}

69
src/views/emis/emisSettleBill/SettleMainBillList.vue
View File

@ -355,27 +355,18 @@
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item v-if="actionType==2 || actionType==3 " label="月结客户" prop="custNo">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="params.paymentType" >
<el-select v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
<el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-select v-if="actionType==2 || actionType==3 " clearable v-model="queryParams.params.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="params.payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee" ></PayeePicker>
@ -403,9 +394,9 @@
</SearchForm>
<el-tabs slot="pageTabs" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="账单列表" name="settleBillList" />
<el-tab-pane label="明细数据" name="settleBillDetailList" />
<el-tabs slot="pageTabs" v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick">
<el-tab-pane label="账单列表" name="billList" />
<el-tab-pane label="明细数据" name="dtlList" />
</el-tabs>
<XdTable
@ -437,7 +428,7 @@
v-hasPermi="['emis:emisSettleBill:add']"
>新增</el-button>
</el-col> -->
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -447,8 +438,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisSettleBill:edit']"
>修改</el-button>
</el-col> -->
>修改账单</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="danger"
@ -591,8 +582,8 @@
-->
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleBillForm>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
<MergeBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
</el-dialog>
@ -639,7 +630,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
@ -666,12 +657,14 @@ export default {
EmisSiteSimplePicker2,
ProblemTypePicker,
TraceWaybillDetailView
TraceWaybillDetailView,
MergeBillForm
},
dicts: [
],
data() {
return {
activeTab:'billList',
// 遮罩层
loading: true,
// 选中数组
@ -757,26 +750,20 @@ export default {
this.getList();
},
methods: {
handleTabsClick(tab, event) {
// console.log(tab, event);
if (tab.name == 'billList') {
// this.queryParams.blConfirmCenter=null;
}
else if (tab.name == 'dtlList') {
// this.queryParams.blConfirmCenter='0';
}
this.getList();
},
/** 查询结算总账单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeSettleStartDate && '' != this.daterangeSettleStartDate) {
this.queryParams.params["beginSettleStartDate"] = this.daterangeSettleStartDate[0];
this.queryParams.params["endSettleStartDate"] = this.daterangeSettleStartDate[1];
}
if (null != this.daterangeSettleEndDate && '' != this.daterangeSettleEndDate) {
this.queryParams.params["beginSettleEndDate"] = this.daterangeSettleEndDate[0];
this.queryParams.params["endSettleEndDate"] = this.daterangeSettleEndDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisSettleBillList = response.rows;
this.total = response.total;
@ -817,9 +804,9 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.currentId= row.id || this.ids;
this.openForm = true;
this.titleForm = "修改";
this.titleForm = "账单信息";
},
handleView(row) {
this.id=row.id;

281
src/views/emis/emisSettleSubBill/MergeBillForm.vue
View File

@ -1,281 +0,0 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
<el-form-item label="账单号" prop="settleBillNo">
<el-input v-model="form.settleBillNo" placeholder="请输入总结算账单编号" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账单名称" prop="settleBillName">
<el-input v-model="form.settleBillName" placeholder="请输入结算账单名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结算账单类型" prop="settleType">
<el-input v-model="form.settleType" placeholder="请输入结算账单类型" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账单开始时间" prop="settleStartDate">
<el-date-picker clearable
v-model="form.settleStartDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结算开始时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账单结束时间" prop="settleEndDate">
<el-date-picker clearable
v-model="form.settleEndDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结算结束时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账单月份" prop="billMonth">
<el-input v-model="form.billMonth" placeholder="请输入账单月份" />
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="应收款金额" prop="recMoney">
<el-input v-model="form.recMoney" placeholder="请输入应收款金额" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="已收款金额" prop="recedMoney">
<el-input v-model="form.recedMoney" placeholder="请输入已收款金额" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="月结编号" prop="custNo">
<el-input v-model="form.custNo" placeholder="请输入月结编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户编码" prop="customerCode">
<el-input v-model="form.customerCode" placeholder="请输入客户编码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总票数" prop="sendPieceSum">
<el-input v-model="form.sendPieceSum" placeholder="请输入总票数" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总件数" prop="pieceNumber">
<el-input v-model="form.pieceNumber" placeholder="请输入总件数" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="总重量" prop="feeWeight">
<el-input v-model="form.feeWeight" placeholder="请输入总重量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="未结数量" prop="uncollectedAmount">
<el-input v-model="form.uncollectedAmount" placeholder="请输入未结数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="合计金额" prop="sendMoneySum">
<el-input v-model="form.sendMoneySum" placeholder="请输入合计金额" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="退款数量" prop="refundAmount">
<el-input v-model="form.refundAmount" placeholder="请输入退款数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="退款金额" prop="refundMoney">
<el-input v-model="form.refundMoney" placeholder="请输入退款金额" />
</el-form-item>
</el-col> -->
</el-row>
</el-col>
<el-col :span="24">
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
export default {
name: "emisSettleBillForm",
props:{
id:{
type:Number
},
settleBillNo:{
type:String
}
},
components: { },
dicts: [
],
data() {
return {
emisSettleBillOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
openBillStatus: [
{ required: true, message: "开票状态不能为空", trigger: "blur" }
],
paymentStatus: [
{ required: true, message: "付款状态不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
},
"settleBillNo": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
},
},
created() {
this.initData();
},
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisSettleBill(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
settleBillNo: null,
settleBillName: null,
settleType: null,
settleStartDate: null,
settleEndDate: null,
billMonth: null,
recMoney: null,
recedMoney: null,
custNo: null,
customerCode: null,
customerName: null,
siteCode: null,
siteName: null,
satisfyMoney: null,
allowanceMoney: null,
deductionMoney: null,
otherMoney: null,
satisfyReason: null,
allowanceReason: null,
deductionReason: null,
otherReason: null,
openBillStatus: null,
paymentStatus: null,
sendPieceSum: null,
pieceNumber: null,
feeWeight: null,
uncollectedAmount: null,
sendMoneySum: null,
refundAmount: null,
refundMoney: null,
blConfirm: null,
confirmDate: null,
confirmSite: null,
confirmManCode: null,
blSiteConfirm: null,
confirmNote: null,
siteConfirmDate: null,
siteConfirmManCode: null,
siteConfirmNote: null,
remark: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisSettleBill(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisSettleBill(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$emit("on-changed");
});
}
}
});
},
}
};
</script>

4
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -511,11 +511,9 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
export default {
name: "SubBillConfirmByMoneyList",
// name: "SubBillConfirmByMonthList",

3
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";

3
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";

6
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -511,8 +511,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue';
import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
import { parseTime,genJsSeqNo } from "@/utils/custom";
@ -1064,11 +1063,12 @@ export default {
subBillList:this.selectBillList,
}
// 生成合账单号
addEmisSettleBill(settleBillForm).then(response => {
this.$modal.msgSuccess("合并成功");
this.$emit("on-changed");
this.titleMergeForm="合并账单";
this.titleMergeForm="账单-"+this.currentSettleBillNo;
this.openMergeForm=true;
});

81
src/views/emis/emisTmsPack/packageManagement.vue
View File

@ -111,9 +111,8 @@
<el-tabs v-model="activeName" style="margin-top: 10px;" @tab-click="getQuery">
<el-tab-pane label="待合包" name="first">
<XdTable v-loading="loadingWait"
border
size="small"
size="mini"
:data="emisTmsWaitPackList"
:showSearch.sync="showSearch"
:queryParams="queryWaitParams"
@ -128,13 +127,13 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" /> -->
<!-- <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -275,7 +274,7 @@
<el-table
v-loading="loading"
border
size="small"
size="mini"
ref="table"
:data="emisTmsPackList"
:showSearch.sync="showSearch"
@ -320,26 +319,26 @@
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column> -->
<!-- <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" /> -->
<!-- <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" /> -->
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
<el-table-column :label="$t('当前网点')" align="center" prop="waybillDetail.currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="waybillDetail.nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCountryName }}</span>
<span class="ellipsis">{{ scope.row.waybillDetail.sendCountryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
<el-table-column :label="$t('目的国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
<span class="ellipsis">{{ scope.row.waybillDetail.receiveCountryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="100" />
<el-table-column :label="$t('预计到达时间')" align="center" prop="waybillDetail.estimateDate" min-width="170">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" >
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="100" >
<template>
<span>1</span>
</template>
@ -348,33 +347,33 @@
<!-- <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> -->
<!-- <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" /> -->
<!-- <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" /> -->
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
<el-table-column :label="$t('收件人')" align="center" prop="waybillDetail.receiveName" min-width="150" />
<el-table-column :label="$t('收件公司')" align="center" prop="waybillDetail.receiveCompany" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCompany }}</span>
<span class="ellipsis">{{ scope.row.waybillDetail.receiveCompany }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
<el-table-column :label="$t('取件员')" align="center" prop="waybillDetail.takePieceEmployeeName" min-width="150" />
<el-table-column :label="$t('取件方式')" align="center" prop="waybillDetail.pickupMethod" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.waybillDetail.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
</template>
</el-table-column>
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="100" />
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="150" />
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCompany }}</span>
<span class="ellipsis">{{ scope.row.waybillDetail.sendCompany }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
<el-table-column :label="$t('备注')" align="center" prop="waybillDetail.remark" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.remark }}</span>
<span class="ellipsis">{{ scope.row.waybillDetail.remark }}</span>
</template>
</el-table-column>
</XdTable>
@ -386,7 +385,10 @@
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
<el-table-column :label="$t('创建网点')" align="center" prop="createSiteName" min-width="100" />
<el-table-column :label="$t('发出网点')" align="center" prop="sendStiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
@ -990,13 +992,14 @@ export default {
this.currentExpandedRow = row;
this.emisTmsDonePackList=[];
listEmisTmsPackDtl({packNo: row.packNo}).then(resList => {
if(!resList || resList.code != 200){
this.$message.error(resList && resList.msg || "未知错误");
return;
}
for(let p = 0; p < resList.rows.length;p++){
this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
}
// if(!resList || resList.code != 200){
// this.$message.error(resList && resList.msg || "未知错误");
// return;
// }
// for(let p = 0; p < resList.rows.length;p++){
// this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
// }
this.emisTmsDonePackList=resList.rows;
this.doneTotal = resList.total;
this.loading = false;
});

9
src/views/emis/emisTmsScanRecord/unpackScan.vue
View File

@ -1,13 +1,14 @@
<template>
<div class="app-container">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px" @submit.native.prevent>
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="扫描包号" prop="billCode" label-width="70px">
<span slot="label">
<span style="color: red">{{$t('扫描包号')}}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<!-- @keyup.enter.native="handleScanInput" -->
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
@ -68,8 +69,8 @@
>
<!-- <el-table ref="multipleTable" border v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange"> -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('合包号')" align="center" prop="bagNo" min-width="150" />
<el-table-column :label="$t('扫描包号')" align="center" prop="billCode" min-width="150" />
<!-- <el-table-column :label="$t('合包号')" align="center" prop="bagNo" min-width="150" /> -->
<el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>

2
src/views/emis/emisWaybill/batchWaybillRecord.vue
View File

@ -108,6 +108,8 @@
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemark" 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="realValue" min-width="80" />
<el-table-column :label="$t('附加信息')" align="center" prop="extInfo" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>

4
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -160,7 +160,7 @@
/>
</el-form-item>
<el-form-item label="目的国家" prop="sendCountry">
<el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
</el-form-item>
@ -251,7 +251,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="问题件方式" prop="pickupMethod">
<el-form-item label="问题件方式" prop="params.problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>

4
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -153,7 +153,7 @@
/>
</el-form-item>
<el-form-item label="目的国家" prop="sendCountry">
<el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
</el-form-item>
@ -244,7 +244,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="问题件方式" prop="pickupMethod">
<el-form-item label="问题件方式" prop="params.problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>

57
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -161,7 +161,7 @@
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable="" v-model="queryParams.blSign" placeholder="请选择">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
@ -170,17 +170,6 @@
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<!-- <el-form-item label="运单状态" prop="siteType">
<el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
<el-option
v-for="dict in dict.type.emis_waybill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="报关方式" prop="customsEclaration">
<el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
<el-option
@ -214,7 +203,7 @@
</el-form-item>
<el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="queryParams.pickupMethod" clearable="" placeholder="请选择">
<el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_qujian_fangshi"
:key="dict.value"
@ -229,15 +218,15 @@
</el-form-item>
<el-form-item label="收款状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" clearable="" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-select v-model="queryParams.paymentStatus" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
@ -254,7 +243,6 @@
<ProblemTypePicker v-model="queryParams.problemType" ></ProblemTypePicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
@ -268,31 +256,9 @@
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
<el-option :key="1" label="'1'" value="'1'">是</el-option>
<el-option :key="0" label="'0'" value="'0'">否</el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="问题件原因" prop="problemCause">
<el-input
v-model="queryParams.problemCause"
:placeholder="$t('问题件原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
<EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
</el-form-item> -->
</el-col>
</el-row>
</SearchForm>
<!-- :row-class-name="tableRowClassName" -->
<!-- @row-dblclick="handleShowTraceInfo" -->
<XdTable
slot="pageContent"
@ -825,6 +791,7 @@ export default {
billPicSendRmk: null,
billPicDispatchRmk: null,
timezoneOffset: null,
paymentStatus:null,
delFlag: null,
remark: null,
blSign:null,

480
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -1,190 +1,201 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- :span="6" -->
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="4"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="查询时间范围" prop="">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
</el-radio-group>
</div>
<elDate7DayPicker v-model="dateRange" ></elDate7DayPicker>
</el-form-item>
<el-form-item label="" prop="queryExpireNotSign">
<el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- :span="6" -->
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="4"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-col>
<el-col :span="24">
<el-form-item label="查询时间范围" prop="">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
</el-radio-group>
</div>
<elDate7DayPicker v-model="dateRange" ></elDate7DayPicker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-form-item label="" prop="queryExpireNotSign">
<el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="5">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
</el-col>
</el-row>
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.sendName"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件电话" prop="sendMobile">
<el-col :span="5">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1>
</el-form-item>
<el-form-item label="录单备注" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('录单备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="费用备注" prop="feeRemark">
<el-input
v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')"
v-model="queryParams.sendName"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件电话" prop="sendMobile">
<el-input
v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1>
</el-form-item>
<el-form-item label="录单备注" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('录单备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="费用备注" prop="feeRemark">
<el-input
v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="收件人" prop="receiveName">
<el-input
v-model="queryParams.receiveName"
:placeholder="$t('收件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件电话" prop="receiveMobile">
<el-input
v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件人" prop="receiveName">
<el-input
v-model="queryParams.receiveName"
:placeholder="$t('收件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件电话" prop="receiveMobile">
<el-input
v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="目的国家" prop="sendCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
</el-form-item>
<el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
</el-form-item>
<el-form-item label="目的省份" prop="receiveProvince">
<ProvincePicker2 v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry" style="margin-left:5px" ></ProvincePicker2>
</el-form-item>
<el-form-item label="目的省份" prop="receiveProvince">
<ProvincePicker2 v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry" style="margin-left:5px" ></ProvincePicker2>
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable="" v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<!-- <el-form-item label="运单状态" prop="siteType">
<el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
<el-option
v-for="dict in dict.type.emis_waybill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="报关方式" prop="customsEclaration">
<el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_declare_mode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="报关方式" prop="customsEclaration">
<el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
<el-form-item label="清关方式" prop="customsClear">
<el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_customs_clear"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="派送方式" prop="dispatchMethod" >
<el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_declare_mode"
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -192,106 +203,64 @@
</el-select>
</el-form-item>
<el-form-item label="清关方式" prop="customsClear">
<el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_customs_clear"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="派送方式" prop="dispatchMethod" >
<el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="queryParams.pickupMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_qujian_fangshi"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="收款状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="问题件方式" prop="problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="problemType">
<ProblemTypePicker v-model="queryParams.problemType" ></ProblemTypePicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
</el-form-item>
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
<el-option :key="1" label="'1'" value="'1'">是</el-option>
<el-option :key="0" label="'0'" value="'0'">否</el-option>
<el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_qujian_fangshi"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<!-- <el-form-item label="问题件原因" prop="problemCause">
<el-input
v-model="queryParams.problemCause"
:placeholder="$t('问题件原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
<EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
</el-form-item> -->
<el-form-item label="收款状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="问题件方式" prop="params.problemQueryType">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="problemType">
<ProblemTypePicker v-model="queryParams.problemType" ></ProblemTypePicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
</el-form-item>
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<!-- :row-class-name="tableRowClassName" -->
<!-- @row-dblclick="handleShowTraceInfo" -->
@ -854,6 +823,7 @@ export default {
blIsQuestion: null,
problemType: null,
problemCause: null,
paymentStatus:null,
problemDelayDays: null,
blMessage: null,
blAcceptMessage: null,

17
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1154,8 +1154,6 @@ methods: {
if(this.printerStatus == 1){
if(this.form.billCode){
let billCount=1;
let printDataList=[]
// 打印主单，子单
let orderList=[];
@ -1170,12 +1168,12 @@ methods: {
printDataList.push(customerItem);
// 主单
// let mainBillItem ={
// "tplCode":"TAN-GM-130",
// "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
// "orderList":orderList.toString()
// }
// printDataList.push(mainBillItem);
let mainBillItem ={
"tplCode":"TAN-GM-130",
"printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
"orderList":orderList.toString()
}
printDataList.push(mainBillItem);
// 打印子单
@ -1191,7 +1189,7 @@ methods: {
let item=subBillArr[i];
if(item!=null && item!=''){
childOrderList.push(item);
billCount=billCount+1;
// billCount=billCount+1;
}
}
@ -1204,6 +1202,7 @@ methods: {
printDataList.push(subBillItem);
}
let billCount=2+childOrderList.length;
// 预览主子单
this.$refs.tanexPrinter.printPreviewAdv(printDataList,billCount)

22
src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
<el-form-item label="运单号" prop="billCode" >
@ -16,7 +16,9 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="登记时间" prop="dateTimeRange" label-position="top" >
<elDateSimplePicker v-model="dateTimeRange" ></elDateSimplePicker>
<!-- <elDateSimplePicker v-model="dateTimeRange" ></elDateSimplePicker> -->
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
</el-form-item>
</el-col>
@ -24,6 +26,7 @@
<el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
<el-option label="未确认" :value="1"></el-option>
<el-option label="已确认" :value="2"></el-option>
<el-option label="中心未审核" :value="6"></el-option>
<el-option label="中心已审核" :value="3"></el-option>
<el-option label="网点驳回" :value="4"></el-option>
<el-option label="中心驳回" :value="5"></el-option>
@ -38,7 +41,13 @@
</el-row>
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="mini"
@ -196,7 +205,7 @@
<emisWaybillAjustApplyForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillAjustApplyForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>
@ -204,10 +213,11 @@ import { listEmisWaybillAjustApply, getEmisWaybillAjustApply, delEmisWaybillAjus
import emisWaybillAjustApplyForm from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm';
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisWaybillAjustApply",
components: { elDateSimplePicker,emisWaybillAjustApplyForm,AjustApplyTypePicker},
components: { elDateAdvPicker,emisWaybillAjustApplyForm,AjustApplyTypePicker},
dicts: ['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'],

22
src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="4">
<el-form-item label="运单号" prop="billCode" >
@ -16,7 +16,9 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="登记时间" prop="dateTimeRange" label-position="top" >
<elDateSimplePicker v-model="dateTimeRange" ></elDateSimplePicker>
<!-- <elDateSimplePicker v-model="dateTimeRange" ></elDateSimplePicker> -->
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
</el-form-item>
</el-col>
@ -32,6 +34,7 @@
<el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
<el-option label="未确认" :value="1"></el-option>
<el-option label="已确认" :value="2"></el-option>
<el-option label="中心未审核" :value="6"></el-option>
<el-option label="中心已审核" :value="3"></el-option>
<el-option label="网点驳回" :value="4"></el-option>
<el-option label="中心驳回" :value="5"></el-option>
@ -45,7 +48,13 @@
</el-row>
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="mini"
@ -225,7 +234,7 @@
<emisWaybillAjustApplyForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillAjustApplyForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>
@ -236,12 +245,13 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisWaybillAjustApply",
components: {
elDateSimplePicker,
elDateAdvPicker,
emisWaybillAjustApplyForm,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,

11
src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="4">
<el-form-item label="运单号" prop="billCode" >
@ -24,6 +24,7 @@
<el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
<el-option label="未确认" :value="1"></el-option>
<el-option label="已确认" :value="2"></el-option>
<el-option label="中心未审核" :value="6"></el-option>
<el-option label="中心已审核" :value="3"></el-option>
<el-option label="网点驳回" :value="4"></el-option>
<el-option label="中心驳回" :value="5"></el-option>
@ -41,6 +42,10 @@
border stripe
size="mini"
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
storageName="WaybillAjustDestConfirm_main"
:data="emisWaybillAjustApplyList"
@ -218,7 +223,7 @@
<emisWaybillAjustApplyForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillAjustApplyForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

12
src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="4">
<el-form-item label="运单号" prop="billCode" >
@ -28,6 +28,7 @@
<el-select clearable v-model="queryParams.params.processStatus" placeholder="请选择">
<el-option label="未确认" :value="1"></el-option>
<el-option label="已确认" :value="2"></el-option>
<el-option label="中心未审核" :value="6"></el-option>
<el-option label="中心已审核" :value="3"></el-option>
<el-option label="网点驳回" :value="4"></el-option>
<el-option label="中心驳回" :value="5"></el-option>
@ -47,6 +48,11 @@
border stripe
size="small"
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
storageName="WaybillAjustStatList_main"
:data="emisWaybillAjustApplyList"
@ -210,7 +216,7 @@
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>

16
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -368,6 +368,7 @@ export default {
// this.getWaybill(this.form.billCode)
// this.loading = true;
for(let i = 0; i < this.emisWaybillList.length; i++){
if(this.emisWaybillList[i].billCode == this.form.billCode && this.emisWaybillList[i].problemId == this.form.problemId){
this.$message.error("重复扫描");
@ -491,7 +492,20 @@ export default {
this.tempRecord.problemId = this.form.problemId;
this.tempRecord.remark = this.form.remark;
this.tempRecord.picUrl=this.form.picUrl;
this.emisWaybillList.push(this.tempRecord);
// 清除重复的数据
let newList = [];
this.emisWaybillList.forEach(item=>{
if(item.billCode != this.tempRecord.billCode ){
newList.push(item);
}
});
newList.push(this.tempRecord);
this.emisWaybillList=newList;
// this.emisWaybillList.push(this.tempRecord);
this.dataMap[this.form.billCode]=this.tempRecord;
//清理数据