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-05-23 08:05:58 +08:00
parent bbb54933b2
commit 334f03d105
2 changed files with 87 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/views/emis/emisWaybill/waybillIsPrinted.vue
View File

@ -147,6 +147,7 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
@ -251,67 +252,83 @@
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
-->
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</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="warehouseInNo" width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
<!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :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="orderSn" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
<el-tag v-else type="danger">未打印</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
<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="printSiteName" min-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="pickupMethod" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
<el-tag v-else type="danger">未打印</el-tag>
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
<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="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
<el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" 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 label="打印信息" align="center">
</el-table-column> -->
<!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
<span>{{ scope.row.billCode }}</span>
</router-link>
</template>
</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="waybillStatus" 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 :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" 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="meterType" min-width="100" /> -->
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发货信息" align="center" >
</el-table-column> -->
<el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
</template>
</el-table-column>
<el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.customsEclaration"/>
</template>
</el-table-column>
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :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="sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
@ -323,21 +340,15 @@
<el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
<el-tag v-else type="danger">不发送</el-tag> -->
<div v-if="scope.row.blMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<!-- <el-table-column label="寄件信息" align="center" >
</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="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="receiveCustomerName" min-width="100" /> -->
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@ -348,19 +359,13 @@
<el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
<el-tag v-else type="danger">不发送</el-tag> -->
<div v-if="scope.row.blAcceptMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<!-- <el-table-column label="收件信息" align="center">
</el-table-column> -->
<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" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
@ -374,43 +379,33 @@
<el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
<el-tag v-else type="info">自提</el-tag> -->
<div v-if="scope.row.dispatchMethod==1" >派送</div>
<div v-else>自提</div>
</template>
</el-table-column>
<!--
<el-table-column label="货物信息" align="center">
</el-table-column> -->
<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">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
</template>
</el-table-column>
<el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
<template slot-scope="scope">
<span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
<span v-else>0</span>
</template>
</el-table-column>
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
<el-table-column :label="$t('保价金额')" align="center" prop="insureValue" 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="paymentStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="收费信息" align="center">
</el-table-column> -->
<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">
<el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
@ -422,8 +417,21 @@
<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="blIsQuestion" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
<el-tag v-else type="info">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemType" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" /> -->
<el-table-column :label="$t('录单人')" align="center" prop="registerManName" 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="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
<el-table-column label="创建人" align="center" prop="createBy" width="80" :show-overflow-tooltip="true"/>
@ -435,6 +443,7 @@
</XdTable>
<!--
@ -467,6 +476,7 @@ export default {
],
data() {
return {
tableHeight: 200,
// 遮罩层
loading: true,
// 选中数组
@ -687,6 +697,12 @@ export default {
this.getList();
this.initTanexPrinterSdk();
// 调整表格的高度，不允许滚动
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
},
beforeDestroy(){
this.tanexPrinter.close();

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

@ -242,11 +242,7 @@
</el-table-column>
-->
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
<!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
<!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
@ -279,7 +275,6 @@
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" 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="meterType" min-width="100" /> -->
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
@ -287,7 +282,7 @@
</el-table-column>
<el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear">
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
</template>
</el-table-column>
@ -297,8 +292,6 @@
</template>
</el-table-column>
<!-- </el-table-column> -->
<!-- <el-table-column label="寄件信息" align="center" > -->
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -312,21 +305,15 @@
<el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
<el-tag v-else type="danger">不发送</el-tag> -->
<div v-if="scope.row.blMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</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="收件信息" 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="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('收件客户')" align="center" prop="receiveCustomerName" min-width="100" /> -->
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@ -337,16 +324,11 @@
<el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
<el-tag v-else type="danger">不发送</el-tag> -->
<div v-if="scope.row.blAcceptMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<!-- </el-table-column> -->
<!-- <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="packType" min-width="80" >
@ -362,17 +344,11 @@
<el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
<template slot-scope="scope">
<!-- <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
<el-tag v-else type="info">自提</el-tag> -->
<div v-if="scope.row.dispatchMethod==1" >派送</div>
<div v-else>自提</div>
</template>
</el-table-column>
<!-- </el-table-column> -->
<!-- <el-table-column label="收费信息" align="center"> -->
<el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>