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-21 12:30:19 +08:00
parent b621b1dfeb
commit 21d2f7a203
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,15 +398,15 @@
<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 v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>

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

@ -398,15 +398,15 @@
<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 v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<el-table-column v-if="actionType!=1" :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span type="normal">{{ scope.row.custNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>

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

@ -12,7 +12,7 @@
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
:rows="1"
/>
</el-form-item>
<el-form-item label="寄件日期" prop="sendDate">
@ -24,14 +24,14 @@
<el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.params.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item label="账单类型" v-if="actionType==3 || actionType==4" prop="settleType">
<!-- <el-form-item label="账单类型" v-if="actionType==3 || actionType==4" prop="settleType">
<el-select clearable v-model="queryParams.settleType" placeholder="账单类型">
<el-option key="1" label="现金" value="1"></el-option>
<el-option key="2" label="月结" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否特殊报价" prop="params.blSpecialQuote">
<el-select clearable v-model="queryParams.params.blSpecialQuote" placeholder="账单类型">
</el-form-item> -->
<el-form-item label="特殊报价" prop="params.blSpecialQuote">
<el-select clearable v-model="queryParams.params.blSpecialQuote" placeholder="是否特殊报价">
<el-option key="1" label="是" value="1"></el-option>
<el-option key="0" label="否" value="0"></el-option>
</el-select>
@ -227,9 +227,9 @@
</template>
</el-table-column>
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
<el-table-column v-if="actionType!=1" :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
<span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
</template>
</el-table-column>