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-09 07:26:57 +08:00
parent 103cbf258e
commit e11e5e00ab
6 changed files with 251 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/customerService/traceWaybillDetailView.vue
View File

@ -14,7 +14,7 @@
<el-steps :active="active" align-center finish-status="finish">
<el-step >
<template slot="title">
收件(<span >{{billDetail?(billDetail.sender.countryName):''}}</span>)
揽收(<span >{{billDetail?(billDetail.sender.countryName):''}}</span>)
</template>
<span class="icon iconfont" slot="icon">&#xe7b0;</span>
</el-step>

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

@ -15,19 +15,19 @@
:rows="2"
/>
</el-form-item>
<el-form-item label="发货时间" prop="">
<el-form-item label="寄件日期" prop="sendDate">
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="寄件网点" prop="waybillDetail.sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
<el-form-item label="寄件网点" prop="params.sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-form-item label="付款方式" prop="params.paymentType" >
<el-select v-if="settleType==1" 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))"
@ -46,13 +46,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<el-form-item :label="$t('回款联系人')" prop="params.payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<el-form-item :label="$t('销售联系人')" prop="params.salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-form-item label="寄件公司" prop="params.sendCompany">
<el-input
v-model="queryParams.params.sendCompany"
:placeholder="$t('寄件公司')"
@ -61,7 +61,7 @@
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-form-item label="收件公司" prop="params.receiveCompany">
<el-input
v-model="queryParams.params.receiveCompany"
:placeholder="$t('收件公司')"
@ -79,17 +79,9 @@
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
</el-tabs>
<!-- <div v-show="activeTab==='waitConfirm'">
</div>
<div v-show="activeTab==='hasConfirm'">
</div> -->
<!-- <div v-show="activeTab==='confirmNotBill'">
</div> -->
<XdTable v-loading="loading"
border
size="mini"
@ -97,7 +89,7 @@
ref="refTable"
row-key="id"
storageName="settleSubBillConfirmList_main"
storageName="SubBillConfirmByMoneyList_main"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"
@ -110,6 +102,8 @@
:row-style="tableRowClassName"
highlight-current-row
show-summary :summary-method="getSummaries"
>
<div slot="toolbar">
@ -182,7 +176,7 @@
<div slot="statInfo" style="font-size: 13px;">
总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee.toFixed(2):0}}</span>
</div>
<el-table-column type="selection" width="55" align="center" />
@ -190,7 +184,7 @@
<template slot-scope="scope">
<div style="padding: 8px 50px;background: white;">
<div style="display:inline-flex" >
<div style="display:inline-flex;padding: 15px 0px;" >
<div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
<div>
<el-button
@ -222,247 +216,75 @@
</el-table-column>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<el-table-column :label="$t('子账单号')" align="center" prop="billNo" min-width="130" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('取件员/操作员')" align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column> -->
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<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="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.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="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirm=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirm=='1'" type="success">已确认</el-tag>
<el-tag v-if="scope.row.blConfirm=='2'" type="error">确认不出账</el-tag>
<el-tag v-if="scope.row.blConfirm=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
<el-tag v-if="scope.row.blSiteConfirm=='1'" type="success">已确认</el-tag>
<el-tag v-if="scope.row.blSiteConfirm=='2'" type="error">确认不出账</el-tag>
<el-tag v-if="scope.row.blSiteConfirm=='3'" type="error">账单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
<el-table-column :label="$t('业务确认时间')" align="center" prop="siteConfirmDate" min-width="170" />
<el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.settleType=='1'" type="normal">现金</el-tag>
<el-tag v-if="scope.row.settleType=='2'" type="success">月结</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.settleType=='2'" type="normal">{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" /> -->
<el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
<el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" />
<el-table-column :label="$t('出账时间')" align="center" prop="billDate" min-width="170" />
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
<!-- <el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('父账单号')" align="center" prop="parentBillNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('总结算账单号')" align="center" prop="settleBillNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('是否已拆单')" align="center" prop="blSplit" min-width="100" />
<el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
<el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
<el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" /> -->
<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.waybillDetail.paymentStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
<template slot-scope="scope">
<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="fjr" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('发货日期')" align="center" prop="waybillDetail.sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
<el-table-column :label="$t('合同号')" align="center" prop="waybillDetail.custOrderId" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('操作员')" align="center" prop="waybillDetail.operateEmployeeName" min-width="100" >
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('时效')" align="center" prop="waybillDetail.timeType" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('报关方式')" align="center" prop="waybillDetail.customsEclaration" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.waybillDetail.customsEclaration"/>
</template>
</el-table-column>
<el-table-column :label="$t('清关方式')" align="center" prop="waybillDetail.customsClear" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.waybillDetail.customsClear"/>
</template>
</el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="waybillDetail.registerManName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('客户名称')" align="center" prop="waybillDetail.customerName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.customerName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
<el-table-column :label="$t('是否问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.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="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件财务中心')" align="center" prop="waybillDetail.sendSiteFincailName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件手机')" align="center" prop="waybillDetail.sendMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('寄件省')" align="center" prop="waybillDetail.sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件市')" align="center" prop="waybillDetail.sendCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件区')" align="center" prop="waybillDetail.sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件地址')" align="center" prop="waybillDetail.sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="waybillDetail.blMessage" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.row.waybillDetail.blMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<el-table-column :label="$t('收货人')" align="center" prop="waybillDetail.receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货电话')" align="center" prop="waybillDetail.receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货公司')" align="center" prop="waybillDetail.receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货省')" align="center" prop="waybillDetail.receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货市')" align="center" prop="waybillDetail.receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货区')" align="center" prop="waybillDetail.receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收货地址')" align="center" prop="waybillDetail.receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派货短信')" align="center" prop="waybillDetail.blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div v-if="scope.row.waybillDetail.blAcceptMessage==1" >发送</div>
<div v-else>不发送</div>
</template>
</el-table-column>
<el-table-column :label="$t('目的地')" align="center" prop="waybillDetail.destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="center" prop="waybillDetail.dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物名称')" align="center" prop="waybillDetail.goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('包装类型')" align="center" prop="waybillDetail.packType" min-width="80" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.waybillDetail.packType"/>
</template>
</el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
<el-table-column :label="$t('派件方式')" align="center" prop="waybillDetail.dispatchMethod" min-width="80" >
<template slot-scope="scope">
<div v-if="scope.row.waybillDetail.dispatchMethod==1" >派送</div>
<div v-else>自提</div>
</template>
</el-table-column>
<el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<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="80" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.paymentType==3">{{scope.row.waybillDetail.freight}}</span>
<span v-else>0</span>
</template>
</el-table-column>
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
<el-table-column :label="$t('保价金额')" align="center" prop="waybillDetail.insureValue" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('保费')" align="center" prop="waybillDetail.insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blSign=='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="waybillDetail.signDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('签收人')" align="center" prop="waybillDetail.signMan" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件员')" align="center" prop="waybillDetail.dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点')" align="center" prop="waybillDetail.dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('录单网点')" align="center" prop="waybillDetail.registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('数据来源')" align="center" prop="waybillDetail.dataFrom" min-width="80" /> -->
<!-- <el-table-column label="创建人" align="center" prop="waybillDetail.createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="waybillDetail.createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="waybillDetail.createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="waybillDetail.updateByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="waybillDetail.updateSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="waybillDetail.updateTime" width="170"/> -->
<el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
</XdTable>
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleSubBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
</el-dialog> -->
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
</el-dialog>
-->
</div>
</template>
@ -829,6 +651,98 @@ export default {
});
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;
console.log("===>getSummaries==>",param)
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (
column.property === 'waybillDetail.billWeight'
) {
const values = data.map(item => Number(item.waybillDetail.billWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.volumeWeight'
) {
const values = data.map(item => Number(item.waybillDetail.volumeWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.freight'
) {
const values = data.map(item => Number(item.waybillDetail.freight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'waybillDetail.totalVolume'
) {
const values = data.map(item => Number(item.waybillDetail.totalVolume));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(5); //保留2位小数
}
else if(
column.property === 'waybillDetail.parcelQty'
){
const values = data.map(item => Number(item.waybillDetail.parcelQty));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index];
}
});
console.log(sums);
return sums
},
handleShowTraceInfo(row){
this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
@ -994,7 +908,7 @@ export default {
.feeItem{
border: 1px solid #d4d4d4;
border: 1px solid #dfe6ec;
ul{
list-style: none;
@ -1003,7 +917,7 @@ export default {
width: 590px;
height: 32px;
line-height: 32px;
border: 1px solid #ffffff;
border: 1px solid #dfe6ec;
border-top: 0px;
font-size: 12px;
@ -1012,7 +926,7 @@ export default {
display:block; width:33%; float:left;text-indent:2em
}
.th{
background:#F1FADE; font-weight:bold; border-top:1px
background:#FFF; font-weight:bold; border-top:1px
}
}

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

@ -97,7 +97,7 @@
ref="refTable"
row-key="id"
storageName="settleSubBillConfirmList_main"
storageName="SubBillConfirmByMonthList_main"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"

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

@ -97,7 +97,7 @@
ref="refTable"
row-key="id"
storageName="settleSubBillConfirmList_main"
storageName="SubBillConfirmBySiteList_main"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"

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

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<div class="app-container" >
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
size="mini" :maxShow="12" label-width="100px"
v-show="showSearch"
@ -7,27 +8,33 @@
@reset="resetQuery"
:isShowSearchBtn="true"
>
<el-form-item label="运单号" prop="billCode">
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="发货时间" prop="">
<el-form-item label="运单号" prop="billCode">
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="发货时间" prop="dateTimeRange">
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="寄件网点" prop="waybillDetail.sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-form-item label="寄件网点" prop="params.sendSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item v-if="settleType==2" 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="settleType==1" 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))"
@ -46,49 +53,43 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<el-form-item :label="$t('回款联系人')" prop="params.payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-form-item :label="$t('销售联系人')" prop="params.salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="寄件公司" prop="params.sendCompany">
<el-input
v-model="queryParams.params.sendCompany"
:placeholder="$t('寄件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-form-item label="收件公司" prop="params.receiveCompany">
<el-input
v-model="queryParams.params.receiveCompany"
:placeholder="$t('收件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>
</SearchForm>
</SearchForm>
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="未确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<el-tab-pane label="确认不出账" name="confirmNotBill" />
<el-tab-pane label="财务置账单异常" name="billError" />
<el-tab-pane label="业务置账单异常" name="siteBillError" />
<el-tab-pane label="待合账" name="waitMerge" />
<el-tab-pane label="已合账" name="hasMerge" />
</el-tabs>
<!-- <div v-show="activeTab==='waitConfirm'">
</div>
<div v-show="activeTab==='hasConfirm'">
</div> -->
<!-- <div v-show="activeTab==='confirmNotBill'">
</div> -->
<XdTable v-loading="loading"
border
@ -97,7 +98,7 @@
ref="refTable"
row-key="id"
storageName="settleSubBillConfirmList_main"
storageName="SubBillMergeMgnt_main"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"
@ -114,48 +115,18 @@
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
>批量确认</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmNoBillByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
>确认不出账</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab=='waitConfirm'">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleSetBillErrorByCenter"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
>置账单异常</el-button>
</el-col>
<el-col :span="1.5" v-if="activeTab!='waitConfirm'">
<el-button
type="danger"
plain
size="mini"
:disabled="multiple"
@click="handleCancelConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCenter']"
>取消确认</el-button>
@click="handleMergeBill"
>合账</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5" v-if="activeTab=='waitMerge'">
<el-button
type="primary"
plain
@ -163,8 +134,8 @@
:disabled="single"
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆分子账单</el-button>
</el-col> -->
>拆子账单</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -451,18 +422,15 @@
</XdTable>
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleSubBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
<!--
<el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
<MergeBillForm :selectBillList="selectBillList" @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
</el-dialog> -->
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
</el-dialog>
-->
</div>
</template>
@ -514,8 +482,11 @@ 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';
export default {
name: "SubBillConfirmByMoneyList",
name: "SubBillMergeMgnt",
// name: "SubBillConfirmByMonthList",
components: {
elDateSimplePicker,emisSettleSubBillForm,
@ -534,7 +505,7 @@ export default {
EmisSiteSimplePicker2,
ProblemTypePicker,
TraceWaybillDetailView
TraceWaybillDetailView,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@ -561,6 +532,11 @@ export default {
// 结算子账单表格数据
emisSettleSubBillList: [],
titleMergeForm:null,
openMergeForm:false,
selectBillList:[],
settleType:null,
queryStatInfoMap:null,
@ -753,6 +729,7 @@ export default {
delFlag: null,
remark: null,
blSign:null,
mergeStatus:null,
}
},
};
@ -767,26 +744,18 @@ export default {
handleClick(tab, event) {
// console.log(tab, event);
if (tab.name == 'all') {
this.queryParams.blConfirm=null;
this.queryParams.mergeStatus=null;
}
else if (tab.name == 'waitConfirm') {
this.queryParams.blConfirm='0';
else if (tab.name == 'waitMerge') {
this.queryParams.mergeStatus='1';
}
else if (tab.name == 'hasConfirm') {
this.queryParams.blConfirm='1';
}
else if (tab.name == 'confirmNotBill') {
this.queryParams.blConfirm='2';
}
else if (tab.name == 'billError') {
this.queryParams.blConfirm='3';
}
else if (tab.name == 'siteBillError') {
this.queryParams.blSiteConfirm='3';
else if (tab.name == 'hasMerge') {
this.queryParams.mergeStatus='2';
}
this.getList();
},
@ -830,6 +799,14 @@ export default {
},
handleMergeBill(){
this.titleMergeForm="合并账单";
this.openMergeForm=true;
// titleMergeForm:null,
// openMergeForm:false,
// selectBillList:[],
},
handleShowTraceInfo(row){
this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
this.currentTraceBillCode=row.billCode;

11
src/views/emis/emisWaybill/waybillDetailReadOnly.vue
View File

@ -40,16 +40,13 @@
<el-descriptions-item label="寄件人">{{ form.sender.name }}</el-descriptions-item>
<el-descriptions-item label="寄件电话">{{ form.sender.phone }}</el-descriptions-item>
<el-descriptions-item label="寄件公司" :span="4">{{ form.sender.company }}</el-descriptions-item>
<!-- <el-descriptions-item label="寄件人国家">{{ form.sendCountry }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="寄件省">{{ form.sendProvince }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="寄件市">{{ form.sendCity }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="寄件区">{{ form.sendCounty }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="寄件县">{{ form.sendTown }}</el-descriptions-item> -->
<el-descriptions-item label="寄件地区" >{{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }}</el-descriptions-item>
<el-descriptions-item label="寄件地址" :span="4" >{{ form.sender.address }}</el-descriptions-item>
<el-descriptions-item label="收件人" :span="1">{{ form.reciever.name }}</el-descriptions-item>
<el-descriptions-item label="收件电话" :span="1">{{ form.reciever.phone }}</el-descriptions-item>
<el-descriptions-item label="收件公司" :span="4">{{ form.reciever.company }}</el-descriptions-item>
<el-descriptions-item label="收件地区" >{{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }}</el-descriptions-item>
<!-- <el-descriptions-item label="收件客户">{{ }}</el-descriptions-item> -->
<el-descriptions-item label="收件地址" >{{ form.reciever.address }}</el-descriptions-item>
@ -151,7 +148,7 @@
<dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
</el-descriptions-item>
<!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" >{{ form.customerName }}</el-descriptions-item>
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item>
<el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item>
<el-descriptions-item label="费用明细" :span="4">
@ -201,7 +198,7 @@
<div> {{scope.row.realFee}} </div>
</template>
</el-table-column>
<el-table-column prop="remark" :label="$t('描述')" align="center" min-width="50">
<el-table-column prop="remark" :label="$t('描述')" align="center" min-width="100">
<template slot-scope="scope">
<div> {{scope.row.remark}} </div>
</template>