md
This commit is contained in:
linfso
parent
81e3eaed95
commit
06e557acae
@ -9,6 +9,14 @@ export function listEmisCommissionDtl(query) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function mapDtlList(query) {
|
||||||
|
return request({
|
||||||
|
url: '/emis/emisCommissionDtl/mapDtlList',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// 查询组批次提成明细列表
|
// 查询组批次提成明细列表
|
||||||
export function listBatchEmisCommissionDtl(query) {
|
export function listBatchEmisCommissionDtl(query) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@ -144,74 +144,62 @@
|
|||||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
|
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
|
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
|
<!-- <el-table-column :label="$t('计费方式')" align="center" prop="calcFeeType" width="80" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
|
<dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.calcFeeType"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
|
<el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.waybillDetail.paymentType==1 || scope.row.waybillDetail.paymentType==3 || scope.row.waybillDetail.paymentType==6">现金</span>
|
<span v-if="scope.row.paymentType==1 || scope.row.paymentType==3 || scope.row.paymentType==6">现金</span>
|
||||||
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">月结</span>
|
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">月结</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<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="sendCountryName" 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="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" :sortable="true" :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="sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :sortable="true" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="150" :sortable="true" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true" :show-overflow-tooltip="true"/>
|
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :sortable="true" :show-overflow-tooltip="true"/>
|
||||||
|
|
||||||
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true" :show-overflow-tooltip="true">
|
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="120" :sortable="true" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
|
<span >{{scope.row.productTypeName}}({{scope.row.timeType}})</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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="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="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="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="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="volumeWeight" min-width="80" />
|
||||||
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="120" :sortable="true" />
|
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="120" :sortable="true" />
|
||||||
<el-table-column :label="$t('运费')" align="center" prop="waybillDetail.billFee" min-width="80" >
|
<el-table-column :label="$t('运费')" align="center" prop="billFee" min-width="80" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
|
<span style="color: red;font-weight: 500" v-if="scope.row.realFee!=scope.row.freight">{{scope.row.freight}}</span>
|
||||||
<span v-else>{{scope.row.waybillDetail.freight}}</span>
|
<span v-else>{{scope.row.freight}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('收款状态')" align="center" prop="waybillDetail.paymentStatus" width="100" >
|
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag v-if="scope.row.waybillDetail.paymentStatus=='0'" type="error">未收款</el-tag>
|
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
|
||||||
<el-tag v-if="scope.row.waybillDetail.paymentStatus=='1'" type="success">已收款</el-tag>
|
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
|
||||||
<el-tag v-if="scope.row.waybillDetail.paymentStatus=='2'" type="warning">部分收款</el-tag>
|
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80" />
|
<el-table-column :label="$t('标准报价')" align="center" prop="realFee" 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="waybillFeeRemark" 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="waybillRemark" min-width="80" :show-overflow-tooltip="true" />
|
||||||
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120" :sortable="true" />
|
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="120" :sortable="true" />
|
||||||
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120" :sortable="true" />
|
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="120" :sortable="true" />
|
||||||
|
|
||||||
|
|
||||||
<el-table-column :label="$t('创建日期')" align="center" prop="createTime" min-width="170" />
|
<el-table-column :label="$t('创建日期')" align="center" prop="createTime" min-width="170" />
|
||||||
|
|
||||||
|
|
||||||
<!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="100" />
|
|
||||||
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmCenterDate" min-width="100" />
|
|
||||||
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmCenterNote" min-width="100" />
|
|
||||||
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManCode" min-width="100" />
|
|
||||||
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmCenterCode" min-width="100" />
|
|
||||||
<el-table-column :label="$t('站点确认状态')" align="center" prop="blConfirmSite" min-width="100" />
|
|
||||||
<el-table-column :label="$t('站点确认日期')" align="center" prop="confirmSiteDate" min-width="100" />
|
|
||||||
<el-table-column :label="$t('站点确认人')" align="center" prop="confirmSiteManCode" min-width="100" />
|
|
||||||
<el-table-column :label="$t('网点确认备注')" align="center" prop="confirmSiteNote" min-width="100" />
|
|
||||||
<el-table-column :label="$t('确认网点代码')" align="center" prop="confirmSiteCode" min-width="100" /> -->
|
|
||||||
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
|
|
||||||
|
|
||||||
</XdTable>
|
</XdTable>
|
||||||
|
|
||||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||||
@ -256,7 +244,7 @@ import { reCalcByBillCode,reCalcByBillMonth } from "@/api/emis/emisCommissionPr
|
|||||||
|
|
||||||
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
|
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
|
||||||
|
|
||||||
import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
|
import { mapDtlList,listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
|
||||||
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||||
import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
|
import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
|
||||||
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
|
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
|
||||||
@ -351,7 +339,7 @@ export default {
|
|||||||
/** 查询员工提成明细表列表 */
|
/** 查询员工提成明细表列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listEmisCommissionDtl(this.queryParams).then(response => {
|
mapDtlList(this.queryParams).then(response => {
|
||||||
this.emisCommissionDtlList = response.rows;
|
this.emisCommissionDtlList = response.rows;
|
||||||
this.total = response.total;
|
this.total = response.total;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
@ -507,7 +495,7 @@ export default {
|
|||||||
qExportParam.pageNum=1;
|
qExportParam.pageNum=1;
|
||||||
qExportParam.pageSize=100000;
|
qExportParam.pageSize=100000;
|
||||||
|
|
||||||
listEmisCommissionDtl(qExportParam).then(response => {
|
mapDtlList(qExportParam).then(response => {
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.exportData(response.rows,loadingInstance);
|
this.exportData(response.rows,loadingInstance);
|
||||||
}
|
}
|
||||||
@ -540,111 +528,111 @@ export default {
|
|||||||
return ++index
|
return ++index
|
||||||
}
|
}
|
||||||
if (j === 'kjlx') {
|
if (j === 'kjlx') {
|
||||||
// return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
|
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
|
||||||
}
|
}
|
||||||
if (j === 'fjr') {
|
// if (j === 'fjr') {
|
||||||
return v['sendName']+'--'+v['receiveName'];
|
// return v['sendName']+'--'+v['receiveName'];
|
||||||
|
// }
|
||||||
|
|
||||||
|
if (j === 'sendSiteName') {
|
||||||
|
return v['sendSiteName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendSiteName') {
|
if (j === 'sendCountryName') {
|
||||||
return v['waybillDetail']['sendSiteName'];
|
return v['sendCountryName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendCountryName') {
|
if (j === 'receiveCountryName') {
|
||||||
return v['waybillDetail']['sendCountryName'];
|
return v['receiveCountryName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.receiveCountryName') {
|
if (j === 'sendDate') {
|
||||||
return v['waybillDetail']['receiveCountryName'];
|
return v['sendDate'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendDate') {
|
if (j === 'sendCompany') {
|
||||||
return v['waybillDetail']['sendDate'];
|
return v['sendCompany'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendCompany') {
|
if (j === 'transLineTypeName') {
|
||||||
return v['waybillDetail']['sendCompany'];
|
return v['transLineTypeName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.transLineTypeName') {
|
if (j === 'productTypeName') {
|
||||||
return v['waybillDetail']['transLineTypeName'];
|
return v['productTypeName'];
|
||||||
}
|
|
||||||
|
|
||||||
if (j === 'waybillDetail.productTypeName') {
|
|
||||||
return v['waybillDetail']['productTypeName'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendName') {
|
if (j === 'sendName') {
|
||||||
return v['waybillDetail']['sendName'];
|
return v['sendName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.parcelQty') {
|
if (j === 'parcelQty') {
|
||||||
return v['waybillDetail']['parcelQty'];
|
return v['parcelQty'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.billWeight') {
|
if (j === 'billWeight') {
|
||||||
return v['waybillDetail']['billWeight'];
|
return v['billWeight'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.volumeWeight') {
|
if (j === 'volumeWeight') {
|
||||||
return v['waybillDetail']['volumeWeight'];
|
return v['volumeWeight'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.totalVolume') {
|
if (j === 'totalVolume') {
|
||||||
return v['waybillDetail']['totalVolume'];
|
return v['totalVolume'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.settlementWeight') {
|
if (j === 'settlementWeight') {
|
||||||
return v['waybillDetail']['settlementWeight'];
|
return v['settlementWeight'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.freight') {
|
if (j === 'freight') {
|
||||||
return v['waybillDetail']['freight'];
|
return v['freight'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.realFee') {
|
if (j === 'realFee') {
|
||||||
return v['waybillDetail']['realFee'];
|
return v['realFee'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.remark') {
|
if (j === 'waybillRemark') {
|
||||||
return v['waybillDetail']['remark'];
|
return v['waybillRemark'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.feeRemark') {
|
if (j === 'waybillFeeRemark') {
|
||||||
return v['waybillDetail']['feeRemark'];
|
return v['waybillFeeRemark'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.salesmen') {
|
if (j === 'salesmen') {
|
||||||
return v['waybillDetail']['salesmen'];
|
return v['salesmen'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.payee') {
|
if (j === 'payee') {
|
||||||
return v['waybillDetail']['payee'];
|
return v['payee'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.payee') {
|
if (j === 'payee') {
|
||||||
return v['waybillDetail']['payee'];
|
return v['payee'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.problemTypeName') {
|
if (j === 'problemTypeName') {
|
||||||
return v['waybillDetail']['problemTypeName'];
|
return v['problemTypeName'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.problemCause') {
|
if (j === 'problemCause') {
|
||||||
return v['waybillDetail']['problemCause'];
|
return v['problemCause'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.sendMobile') {
|
if (j === 'sendMobile') {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.calcFeeType') {
|
if (j === 'calcFeeType') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
|
return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['calcFeeType']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.paymentType') {
|
if (j === 'paymentType') {
|
||||||
let paymentType=v['waybillDetail']['paymentType'];
|
let paymentType=v['paymentType'];
|
||||||
if(paymentType == 1 || paymentType==3 || paymentType==6){
|
if(paymentType == 1 || paymentType==3 || paymentType==6){
|
||||||
return '现金';
|
return '现金';
|
||||||
}
|
}
|
||||||
@ -653,25 +641,25 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.paymentStatus') {
|
if (j === 'paymentStatus') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
|
return this.selectDictLabel(this.dict.type.emis_payment_status,v['paymentStatus']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.pickupMethod') {
|
if (j === 'pickupMethod') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
|
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['pickupMethod']);
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.customsEclaration') {
|
if (j === 'customsEclaration') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
|
return this.selectDictLabel(this.dict.type.emis_declare_mode,v['customsEclaration']);
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.customsClear') {
|
if (j === 'customsClear') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
|
return this.selectDictLabel(this.dict.type.emis_customs_clear,v['customsClear']);
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.packType') {
|
if (j === 'packType') {
|
||||||
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
|
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['packType']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j === 'waybillDetail.dispatchMethod') {
|
if (j === 'dispatchMethod') {
|
||||||
if(v['waybillDetail']['dispatchMethod'] == 1){
|
if(v['dispatchMethod'] == 1){
|
||||||
return '派送';
|
return '派送';
|
||||||
}else{
|
}else{
|
||||||
return '自提';
|
return '自提';
|
||||||
@ -682,29 +670,29 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (j === 'waybillDetail.blMessage') {
|
if (j === 'blMessage') {
|
||||||
if(v['waybillDetail']['blMessage'] == 1){
|
if(v['blMessage'] == 1){
|
||||||
return '发送';
|
return '发送';
|
||||||
}else{
|
}else{
|
||||||
return '不发送';
|
return '不发送';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.blAcceptMessage') {
|
if (j === 'blAcceptMessage') {
|
||||||
if(v['waybillDetail']['blAcceptMessage'] == 1){
|
if(v['blAcceptMessage'] == 1){
|
||||||
return '发送';
|
return '发送';
|
||||||
}else{
|
}else{
|
||||||
return '不发送';
|
return '不发送';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.blSign') {
|
if (j === 'blSign') {
|
||||||
if(v['waybillDetail']['blSign'] == 1){
|
if(v['blSign'] == 1){
|
||||||
return '已签收';
|
return '已签收';
|
||||||
}else{
|
}else{
|
||||||
return '未签收';
|
return '未签收';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (j === 'waybillDetail.paymentType') {
|
if (j === 'paymentType') {
|
||||||
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
|
return this.selectDictLabel(this.dict.type.emis_payment_type,v['paymentType']);
|
||||||
}
|
}
|
||||||
return v[j]
|
return v[j]
|
||||||
}))
|
}))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user