建立新分支准备

This commit is contained in:
2025-08-15 15:21:07 +08:00
parent ff2f36e88c
commit a7b148bc96
5 changed files with 591 additions and 651 deletions

View File

@ -1,165 +1,165 @@
<template>
<div class="bg-white rounded-lg shadow-sm p-4 mb-6 transition-all duration-300 hover:shadow-md">
<div class="flex flex-wrap items-center justify-between gap-4">
<!-- 操作按钮 -->
<div class="flex gap-2">
<el-button type="primary" icon="Plus" @click="handleAdd"
class="transition-all duration-200 hover:shadow-md">
新增
</el-button>
<el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md">
刷新
</el-button>
<div class="p-5">
<el-card class="mb-5">
<el-button type="primary" icon="Plus" @click="handleAdd"
class="transition-all duration-200 hover:shadow-md">
新增
</el-button>
<el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md">
刷新
</el-button>
</el-card>
<!-- 数据表格 -->
<div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
<el-table v-loading="loading2" :data="tableData" stripe
:header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
:row-class-name="tableRowClassName">
<!-- 基础信息列 -->
<el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
<el-table-column prop="batch" label="批次" align="center"></el-table-column>
<el-table-column prop="physicalsupplyId" label="使用情况ID" align="center"></el-table-column>
<!-- 时间相关列 -->
<el-table-column prop="issuanceTime" label="联系单下达时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.issuanceTime) }}
</template>
</el-table-column>
<el-table-column prop="requireDelivery" label="要求到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.requireDelivery) }}
</template>
</el-table-column>
<el-table-column prop="scheduledDelivery" label="计划到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.scheduledDelivery) }}
</template>
</el-table-column>
<el-table-column prop="actualDelivery" label="实际到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.actualDelivery) }}
</template>
</el-table-column>
<el-table-column prop="acceptanceCheck" label="验收移交时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.acceptanceCheck) }}
</template>
</el-table-column>
<!-- 数量相关列 -->
<el-table-column prop="requiredQuantity" label="要求到货数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="plannedQuantity" label="计划到货数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="actualAcceptance" label="实际验收数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="differenceQuantity" label="差异量" min-width="100" align="right">
<template #default="scope">
<span
:class="scope.row.differenceQuantity && parseFloat(scope.row.differenceQuantity) !== 0 ? 'text-red-500' : ''">
{{ scope.row.differenceQuantity || '-' }}
</span>
</template>
</el-table-column>
<el-table-column prop="dhDifferenceQuantity" label="到货差异量" min-width="120"
align="right"></el-table-column>
<!-- 金额相关列 -->
<el-table-column prop="cargoAmount" label="货物金额" min-width="120" align="right">
<template #default="scope">
{{ scope.row.cargoAmount }}
</template>
</el-table-column>
<el-table-column prop="advance" label="预付款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.advance }}
</template>
</el-table-column>
<el-table-column prop="feed" label="投料款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.feed }}
</template>
</el-table-column>
<el-table-column prop="acceptancePayment" label="到货验收款" min-width="120" align="right">
<template #default="scope">
{{ scope.row.acceptancePayment }}
</template>
</el-table-column>
<el-table-column prop="debugging" label="调试款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.debugging }}
</template>
</el-table-column>
<el-table-column prop="qualityGuarantee" label="质保金" min-width="100" align="right">
<template #default="scope">
{{ scope.row.qualityGuarantee }}
</template>
</el-table-column>
<el-table-column prop="settlementAmount" label="结算金额" min-width="120" align="right">
<template #default="scope">
{{ scope.row.settlementAmount }}
</template>
</el-table-column>
<!-- 状态和备注列 -->
<el-table-column prop="expectedState" label="逾期状态" min-width="100" align="center">
<template #default="scope">
<!-- :type="getTagType(scope.row.expectedState)" -->
<el-tag :effect="scope.row.expectedState ? 'dark' : 'plain'">
{{ scope.row.expectedState || '-' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="associate" label="交接方式" min-width="120"></el-table-column>
<el-table-column prop="deliveryRequirements" label="到货要求" min-width="150"></el-table-column>
<el-table-column prop="transition" label="转换为合同" min-width="120" align="center">
<!-- <template #default="scope"> -->
<!-- <el-switch v-model="scope.row.transition" active-value="是" inactive-value="否"
@change="handleTransitionChange(scope.row)"></el-switch> -->
<!-- </template> -->
</el-table-column>
<!-- 备注信息列可展开 -->
<el-table-column label="备注信息" min-width="120">
<template #default="scope">
<el-popover placement="top" width="300" trigger="click">
<template #reference>
<el-button size="small" type="text">查看详情</el-button>
</template>
<div class="space-y-2 text-sm">
<p><span class="font-medium">采购备注</span>{{ scope.row.cgRemark || '-' }}
</p>
<p><span class="font-medium">到货备注</span>{{ scope.row.dhRemark || '-' }}
</p>
<p><span class="font-medium">供应商备注</span>{{ scope.row.gysRemark || '-'
}}</p>
<p><span class="font-medium">结算备注</span>{{ scope.row.jsRemark || '-' }}
</p>
</div>
</el-popover>
</template>
</el-table-column>
<!-- 操作列 -->
<el-table-column label="操作" min-width="120" align="center" fixed="right">
<template #default="scope">
<el-button size="small" icon="Edit" @click="handleEdit2(scope.row)"
class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
<el-button size="small" icon="Delete" @click="handleDelete2(scope.row)"
class="text-red-600 hover:text-red-800 transition-colors"></el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
<div class="text-gray-500 text-sm">
{{ total }} 条记录当前显示第 {{ (currentPage - 1) * pageSize + 1 }} {{
Math.min(currentPage * pageSize, total)
}}
</div>
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
:page-sizes="[10, 20, 50, 100]" :total="total" layout="prev, pager, next, jumper, sizes"
@size-change="handleSizeChange" @current-change="handleCurrentChange" small></el-pagination>
</div>
</div>
</div>
<!-- 数据表格 -->
<el-table v-loading="loading2" :data="tableData" stripe
:header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
:row-class-name="tableRowClassName" style="width: 100%">
<!-- 基础信息列 -->
<el-table-column prop="id" label="ID" width="80" align="center"></el-table-column>
<el-table-column prop="batch" label="批次" min-width="100"></el-table-column>
<el-table-column prop="physicalsupplyId" label="使用情况ID" width="120" align="center"></el-table-column>
<!-- 时间相关列 -->
<el-table-column prop="issuanceTime" label="联系单下达时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.issuanceTime) }}
</template>
</el-table-column>
<el-table-column prop="requireDelivery" label="要求到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.requireDelivery) }}
</template>
</el-table-column>
<el-table-column prop="scheduledDelivery" label="计划到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.scheduledDelivery) }}
</template>
</el-table-column>
<el-table-column prop="actualDelivery" label="实际到货时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.actualDelivery) }}
</template>
</el-table-column>
<el-table-column prop="acceptanceCheck" label="验收移交时间" min-width="160" align="center">
<template #default="scope">
{{ formatDate(scope.row.acceptanceCheck) }}
</template>
</el-table-column>
<!-- 数量相关列 -->
<el-table-column prop="requiredQuantity" label="要求到货数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="plannedQuantity" label="计划到货数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="actualAcceptance" label="实际验收数量" min-width="120" align="right"></el-table-column>
<el-table-column prop="differenceQuantity" label="差异量" min-width="100" align="right">
<template #default="scope">
<span
:class="scope.row.differenceQuantity && parseFloat(scope.row.differenceQuantity) !== 0 ? 'text-red-500' : ''">
{{ scope.row.differenceQuantity || '-' }}
</span>
</template>
</el-table-column>
<el-table-column prop="dhDifferenceQuantity" label="到货差异量" min-width="120" align="right"></el-table-column>
<!-- 金额相关列 -->
<el-table-column prop="cargoAmount" label="货物金额" min-width="120" align="right">
<template #default="scope">
{{ scope.row.cargoAmount }}
</template>
</el-table-column>
<el-table-column prop="advance" label="预付款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.advance }}
</template>
</el-table-column>
<el-table-column prop="feed" label="投料款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.feed }}
</template>
</el-table-column>
<el-table-column prop="acceptancePayment" label="到货验收款" min-width="120" align="right">
<template #default="scope">
{{ scope.row.acceptancePayment }}
</template>
</el-table-column>
<el-table-column prop="debugging" label="调试款" min-width="100" align="right">
<template #default="scope">
{{ scope.row.debugging }}
</template>
</el-table-column>
<el-table-column prop="qualityGuarantee" label="质保金" min-width="100" align="right">
<template #default="scope">
{{ scope.row.qualityGuarantee }}
</template>
</el-table-column>
<el-table-column prop="settlementAmount" label="结算金额" min-width="120" align="right">
<template #default="scope">
{{ scope.row.settlementAmount }}
</template>
</el-table-column>
<!-- 状态和备注列 -->
<el-table-column prop="expectedState" label="逾期状态" min-width="100" align="center">
<template #default="scope">
<!-- :type="getTagType(scope.row.expectedState)" -->
<el-tag :effect="scope.row.expectedState ? 'dark' : 'plain'">
{{ scope.row.expectedState || '-' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="associate" label="交接方式" min-width="120"></el-table-column>
<el-table-column prop="deliveryRequirements" label="到货要求" min-width="150"></el-table-column>
<el-table-column prop="transition" label="转换为合同" min-width="120" align="center">
<!-- <template #default="scope"> -->
<!-- <el-switch v-model="scope.row.transition" active-value="是" inactive-value="否"
@change="handleTransitionChange(scope.row)"></el-switch> -->
<!-- </template> -->
</el-table-column>
<!-- 备注信息列可展开 -->
<el-table-column label="备注信息" min-width="120">
<template #default="scope">
<el-popover placement="top" width="300" trigger="click">
<template #reference>
<el-button size="small" type="text">查看详情</el-button>
</template>
<div class="space-y-2 text-sm">
<p><span class="font-medium">采购备注</span>{{ scope.row.cgRemark || '-' }}
</p>
<p><span class="font-medium">到货备注</span>{{ scope.row.dhRemark || '-' }}
</p>
<p><span class="font-medium">供应商备注</span>{{ scope.row.gysRemark || '-'
}}</p>
<p><span class="font-medium">结算备注</span>{{ scope.row.jsRemark || '-' }}
</p>
</div>
</el-popover>
</template>
</el-table-column>
<!-- 操作列 -->
<el-table-column label="操作" min-width="120" align="center" fixed="right">
<template #default="scope">
<el-button size="small" icon="Edit" @click="handleEdit2(scope.row)"
class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
<el-button size="small" icon="Delete" @click="handleDelete2(scope.row)"
class="text-red-600 hover:text-red-800 transition-colors"></el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
<div class="text-gray-500 text-sm">
{{ total }} 条记录当前显示第 {{ (currentPage - 1) * pageSize + 1 }} {{
Math.min(currentPage * pageSize, total)
}}
</div>
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 50, 100]"
:total="total" layout="prev, pager, next, jumper, sizes" @size-change="handleSizeChange"
@current-change="handleCurrentChange" small></el-pagination>
</div>
<!-- 删除确认对话框 -->
<el-dialog v-model="deleteDialogVisible2" title="确认删除" width="300px" :show-close="false">
<div class="text-center py-4">
@ -409,7 +409,7 @@ const tableRowClassName = ({ row, rowIndex }) => {
return rowIndex % 2 === 0 ? 'bg-white' : 'bg-gray-50';
};
const form = reactive({
id: '',
id: '',
acceptanceCheck: '',
acceptancePayment: '',
actualAcceptance: '',
@ -441,7 +441,7 @@ const form = reactive({
updateBy: null,
updateTime: ''
});
const handleAdd = ()=>{
const handleAdd = () => {
dialogVisible2.value = true;
dialogType2.value = 'addSon';
resetForm();
@ -477,7 +477,22 @@ const handleEdit2 = (row) => {
};
const handleDelete2 = (row) => {
currentRow2.value = row;
deleteDialogVisible2.value = true;
ElMessageBox.confirm(
'确定要删除这条记录吗?此操作不可撤销,请谨慎操作',
'提示',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
confirmDelete2();
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消删除',
})
})
};
const confirmDelete2 = async () => {
if (!currentRow2.value) return;