|
@@ -8,12 +8,18 @@
|
|
:config="config"
|
|
:config="config"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
highlight-current-row
|
|
highlight-current-row
|
|
- @get-list="getList">
|
|
|
|
|
|
+ @get-list="getList"
|
|
|
|
+ >
|
|
</byTable>
|
|
</byTable>
|
|
<div style="padding: 0 20px 20px 20px; background-color: white">
|
|
<div style="padding: 0 20px 20px 20px; background-color: white">
|
|
<el-table v-loading="loading" :data="sourceList.data">
|
|
<el-table v-loading="loading" :data="sourceList.data">
|
|
<el-table-column label="合同编号" prop="code" width="160" fixed />
|
|
<el-table-column label="合同编号" prop="code" width="160" fixed />
|
|
- <el-table-column label="客户名称" prop="customerName" min-width="200" fixed />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="客户名称"
|
|
|
|
+ prop="customerName"
|
|
|
|
+ min-width="200"
|
|
|
|
+ fixed
|
|
|
|
+ />
|
|
<el-table-column label="业务员" prop="userName" width="140" fixed />
|
|
<el-table-column label="业务员" prop="userName" width="140" fixed />
|
|
<el-table-column label="合同金额" width="140">
|
|
<el-table-column label="合同金额" width="140">
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
@@ -22,28 +28,52 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="收入">
|
|
<el-table-column label="收入">
|
|
<el-table-column label="到账金额" prop="sumClaimMoney" width="140" />
|
|
<el-table-column label="到账金额" prop="sumClaimMoney" width="140" />
|
|
- <el-table-column label="退税金额" prop="refundableAmount" width="140" />
|
|
|
|
- <el-table-column label="其他收入" prop="otherIncomeAmount" width="140" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="退税金额"
|
|
|
|
+ prop="refundableAmount"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="其他收入"
|
|
|
|
+ prop="otherIncomeAmount"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="采购合同金额" prop="sumPurchaseContractMoney" width="140" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="采购合同金额"
|
|
|
|
+ prop="sumPurchaseContractMoney"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
<el-table-column label="支出">
|
|
<el-table-column label="支出">
|
|
<el-table-column label="已付货款" prop="accountPaid" width="140" />
|
|
<el-table-column label="已付货款" prop="accountPaid" width="140" />
|
|
<el-table-column label="代理费" prop="agencyFee" width="140" />
|
|
<el-table-column label="代理费" prop="agencyFee" width="140" />
|
|
<el-table-column label="拖车费" prop="trailerFee" width="140" />
|
|
<el-table-column label="拖车费" prop="trailerFee" width="140" />
|
|
<el-table-column label="报关费" prop="customsFee" width="140" />
|
|
<el-table-column label="报关费" prop="customsFee" width="140" />
|
|
<el-table-column label="港杂费" prop="portMixedFee" width="140" />
|
|
<el-table-column label="港杂费" prop="portMixedFee" width="140" />
|
|
- <el-table-column label="验货红包" prop="inspectionRedPack" width="140" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="验货红包"
|
|
|
|
+ prop="inspectionRedPack"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
<el-table-column label="佣金" prop="commission" width="140" />
|
|
<el-table-column label="佣金" prop="commission" width="140" />
|
|
<el-table-column label="检测费" prop="checkout" width="140" />
|
|
<el-table-column label="检测费" prop="checkout" width="140" />
|
|
<el-table-column label="验货费" prop="inspectionCharge" width="140" />
|
|
<el-table-column label="验货费" prop="inspectionCharge" width="140" />
|
|
<el-table-column label="运费" prop="freight" width="140" />
|
|
<el-table-column label="运费" prop="freight" width="140" />
|
|
- <el-table-column label="产地证费" prop="certificateOfOrigin" width="140" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="产地证费"
|
|
|
|
+ prop="certificateOfOrigin"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
<el-table-column label="其他" prop="other" width="140" />
|
|
<el-table-column label="其他" prop="other" width="140" />
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="备注" prop="remark" width="200" />
|
|
<el-table-column label="备注" prop="remark" width="200" />
|
|
<el-table-column label="统计">
|
|
<el-table-column label="统计">
|
|
<el-table-column label="收入合计" prop="incomeAmount" width="140" />
|
|
<el-table-column label="收入合计" prop="incomeAmount" width="140" />
|
|
- <el-table-column label="支出合计" prop="expenditureAmount" width="140" />
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ label="支出合计"
|
|
|
|
+ prop="expenditureAmount"
|
|
|
|
+ width="140"
|
|
|
|
+ />
|
|
<el-table-column label="毛利" prop="gross" width="140" />
|
|
<el-table-column label="毛利" prop="gross" width="140" />
|
|
<el-table-column label="毛利率" width="140">
|
|
<el-table-column label="毛利率" width="140">
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
@@ -54,8 +84,12 @@
|
|
<el-table-column label="操作" align="center" width="120" fixed="right">
|
|
<el-table-column label="操作" align="center" width="120" fixed="right">
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
<div>
|
|
<div>
|
|
- <el-button type="primary" @click="changeAgencyFee(row)" link>代理费</el-button>
|
|
|
|
- <el-button type="primary" @click="changeRemark(row)" link>备注</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="changeAgencyFee(row)" link
|
|
|
|
+ >代理费</el-button
|
|
|
|
+ >
|
|
|
|
+ <el-button type="primary" @click="changeRemark(row)" link
|
|
|
|
+ >备注</el-button
|
|
|
|
+ >
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -68,39 +102,69 @@
|
|
:page-size="sourceList.pagination.pageSize"
|
|
:page-size="sourceList.pagination.pageSize"
|
|
:total="sourceList.pagination.total"
|
|
:total="sourceList.pagination.total"
|
|
@size-change="handleSizeChange"
|
|
@size-change="handleSizeChange"
|
|
- @current-change="handlePageChange" />
|
|
|
|
|
|
+ @current-change="handlePageChange"
|
|
|
|
+ />
|
|
</el-row>
|
|
</el-row>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <el-dialog title="代理费" v-if="openAgencyFee" v-model="openAgencyFee" width="400">
|
|
|
|
- <byForm :formConfig="formAgencyFeeConfig" :formOption="formOption" v-model="formAgencyFeeData.data" ref="agencyFee">
|
|
|
|
|
|
+ <el-dialog
|
|
|
|
+ title="代理费"
|
|
|
|
+ v-if="openAgencyFee"
|
|
|
|
+ v-model="openAgencyFee"
|
|
|
|
+ width="400"
|
|
|
|
+ >
|
|
|
|
+ <byForm
|
|
|
|
+ :formConfig="formAgencyFeeConfig"
|
|
|
|
+ :formOption="formOption"
|
|
|
|
+ v-model="formAgencyFeeData.data"
|
|
|
|
+ ref="agencyFee"
|
|
|
|
+ >
|
|
<template #agencyFee>
|
|
<template #agencyFee>
|
|
<div style="width: 100%">
|
|
<div style="width: 100%">
|
|
<el-form-item label="代理费" prop="agencyFee">
|
|
<el-form-item label="代理费" prop="agencyFee">
|
|
- <el-input-number onmousewheel="return false;" v-model="formAgencyFeeData.data.agencyFee" :precision="2" :controls="false" :min="0" />
|
|
|
|
|
|
+ <el-input-number
|
|
|
|
+ onmousewheel="return false;"
|
|
|
|
+ v-model="formAgencyFeeData.data.agencyFee"
|
|
|
|
+ :precision="2"
|
|
|
|
+ :controls="false"
|
|
|
|
+ :min="0"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</byForm>
|
|
</byForm>
|
|
<template #footer>
|
|
<template #footer>
|
|
<el-button @click="openAgencyFee = false" size="large">取 消</el-button>
|
|
<el-button @click="openAgencyFee = false" size="large">取 消</el-button>
|
|
- <el-button type="primary" @click="submitAgencyFeeForm()" size="large">确 定</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="submitAgencyFeeForm()" size="large"
|
|
|
|
+ >确 定</el-button
|
|
|
|
+ >
|
|
</template>
|
|
</template>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="备注" v-if="openRemark" v-model="openRemark" width="400">
|
|
<el-dialog title="备注" v-if="openRemark" v-model="openRemark" width="400">
|
|
- <byForm :formConfig="formRemarkConfig" :formOption="formOption" v-model="formRemarkData.data" ref="remark">
|
|
|
|
|
|
+ <byForm
|
|
|
|
+ :formConfig="formRemarkConfig"
|
|
|
|
+ :formOption="formOption"
|
|
|
|
+ v-model="formRemarkData.data"
|
|
|
|
+ ref="remark"
|
|
|
|
+ >
|
|
<template #remark>
|
|
<template #remark>
|
|
<div style="width: 100%">
|
|
<div style="width: 100%">
|
|
<el-form-item label="备注" prop="remark">
|
|
<el-form-item label="备注" prop="remark">
|
|
- <el-input v-model="formRemarkData.data.remark" :rows="4" type="textarea" />
|
|
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="formRemarkData.data.remark"
|
|
|
|
+ :rows="4"
|
|
|
|
+ type="textarea"
|
|
|
|
+ />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</byForm>
|
|
</byForm>
|
|
<template #footer>
|
|
<template #footer>
|
|
<el-button @click="openRemark = false" size="large">取 消</el-button>
|
|
<el-button @click="openRemark = false" size="large">取 消</el-button>
|
|
- <el-button type="primary" @click="submitRemarkForm()" size="large">确 定</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="submitRemarkForm()" size="large"
|
|
|
|
+ >确 定</el-button
|
|
|
|
+ >
|
|
</template>
|
|
</template>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
@@ -151,13 +215,15 @@ const getDict = () => {
|
|
const getList = async (req) => {
|
|
const getList = async (req) => {
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
loading.value = true;
|
|
loading.value = true;
|
|
- proxy.post("/contract/getProfitClearingPage", sourceList.value.pagination).then((res) => {
|
|
|
|
- sourceList.value.data = res.rows;
|
|
|
|
- sourceList.value.pagination.total = res.total;
|
|
|
|
- setTimeout(() => {
|
|
|
|
- loading.value = false;
|
|
|
|
- }, 200);
|
|
|
|
- });
|
|
|
|
|
|
+ proxy
|
|
|
|
+ .post("/contract/getProfitClearingPage", sourceList.value.pagination)
|
|
|
|
+ .then((res) => {
|
|
|
|
+ sourceList.value.data = res.rows;
|
|
|
|
+ sourceList.value.pagination.total = res.total;
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ loading.value = false;
|
|
|
|
+ }, 200);
|
|
|
|
+ });
|
|
};
|
|
};
|
|
getDict();
|
|
getDict();
|
|
getList();
|
|
getList();
|