fix: BUG修改

This commit is contained in:
kun 2023-07-27 14:04:36 +08:00
parent 9668162b74
commit 230ac446e2
4 changed files with 52 additions and 16 deletions

View File

@ -46,7 +46,7 @@
<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
</template>
<template #applyStartTime="{ row }">
<span v-if="row.applyStartTime">{{ row.applyStartTime + "-" + row.applyEndTime }}</span>
<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
</template>
<template #operation="{ row }">
<el-button type="primary" link @click="handleItemDetail(2, row)">
@ -158,7 +158,8 @@ const columns: ColumnProps[] = [
{ prop: "applyTime", label: "申报日期" },
{
label: "申报时段",
prop: "applyStartTime"
prop: "applyStartTime",
width: 260
},
{ prop: "investmentPaymentId", label: "支付状态" },
// {

View File

@ -142,14 +142,14 @@ const columns: ColumnProps[] = [
{
prop: "name",
label: "任务名称",
width: 200,
width: 220,
search: { el: "input" }
},
// prop
{ prop: "commander", label: "负责人" },
{ prop: "planStartTime", label: "开始日期" },
{ prop: "planEndTime", label: "结束日期" },
{ prop: "unit", label: "申请单位" },
{ prop: "commander", label: "负责人", width: 100 },
{ prop: "planStartTime", label: "开始日期", width: 200 },
{ prop: "planEndTime", label: "结束日期", width: 200 },
{ prop: "unit", label: "申请单位", width: 200 },
{ prop: "completeRatio", label: "完成百分比(%)", width: 200 },
{ prop: "slippage", label: "逾期情况(天)", width: 200 },
{
@ -169,6 +169,7 @@ const columns: ColumnProps[] = [
{
prop: "state",
label: "状态",
width: 150,
search: { el: "select" },
enum: [
{ label: "未开始", value: 1 },

View File

@ -19,7 +19,7 @@
<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
</template>
<template #applyStartTime="{ row }">
<span v-if="row.applyStartTime">{{ row.applyStartTime + "-" + row.applyEndTime }}</span>
<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
</template>
<template #operation="{ row }">
<el-button type="primary" link @click="handleItemDetail(2, row)">
@ -70,11 +70,25 @@ const formConfig = {
type: "input"
},
{
label: "申报时段",
label: "申报日期",
prop: "applyTime",
type: "date",
format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD"
},
{
label: "申报时段开始时间",
prop: "applyStartTime",
type: "date",
format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD"
},
{
label: "申报时段结束时间",
prop: "applyEndTime",
type: "date",
format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD"
}
],
rules: {
@ -91,6 +105,20 @@ const formConfig = {
message: "请选择",
trigger: "change"
}
],
applyStartTime: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
applyEndTime: [
{
required: true,
message: "请选择",
trigger: "change"
}
]
}
};
@ -103,7 +131,9 @@ const drawerVisible = ref(false);
const title = ref("");
const formData = ref({
name: "",
applyTime: ""
applyTime: "",
applyStartTime: "",
applyEndTime: ""
});
// ProTable 便
const proTable = ref();
@ -141,7 +171,9 @@ const columns: ColumnProps[] = [
const handleAddItem = () => {
formData.value = reactive({
name: "",
applyTime: ""
applyTime: "",
applyStartTime: "",
applyEndTime: ""
});
openVisible.value = true;
};

View File

@ -77,11 +77,12 @@ const columns: ColumnProps[] = [
label: "任务名称",
search: { el: "input" }
},
{ prop: "commander", label: "负责人" },
{ prop: "planStartTime", label: "开始日期" },
{ prop: "planEndTime", label: "结束日期" },
{ prop: "completeRatio", label: "完成百分比(%)" },
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "commander", label: "负责人", width: 100 },
{ prop: "planStartTime", label: "开始日期", width: 200 },
{ prop: "planEndTime", label: "结束日期", width: 200 },
{ prop: "unit", label: "申请单位", width: 200 },
{ prop: "completeRatio", label: "完成百分比(%)", width: 200 },
{ prop: "slippage", label: "逾期情况(天)", width: 200 },
// {
// prop: "state",
// label: "",
@ -109,6 +110,7 @@ const columns: ColumnProps[] = [
{
prop: "state",
label: "状态",
width: 150,
search: { el: "select" },
enum: [
{ label: "未开始", value: 1 },