This commit is contained in:
ljx
2025-08-29 16:33:37 +08:00
parent dc59ade2b8
commit 47a8b17061
3 changed files with 380 additions and 382 deletions

View File

@ -11,13 +11,11 @@
<el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button> <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
<el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button> <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
</div> </div>
</template> </template>
<template v-else-if="active == 1"> <template v-else-if="active == 1">
<h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1> <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<template v-if="contract_type == 'income'"> <template v-if="contract_type == 'income'">
<el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
label-width="80px">
<!-- <el-form-item label="项目名称"> <!-- <el-form-item label="项目名称">
<el-input :model-value="project.name" disabled /> <el-input :model-value="project.name" disabled />
</el-form-item> --> </el-form-item> -->
@ -26,8 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contractType"> <el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型"> <el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="业主单位" prop="contractOwner"> <el-form-item label="业主单位" prop="contractOwner">
@ -36,25 +33,26 @@
<el-form-item label="承包内容" v-if="contract_type !== 'income'"> <el-form-item label="承包内容" v-if="contract_type !== 'income'">
<editor v-model="form.contractedContent" :min-height="192" /> <editor v-model="form.contractedContent" :min-height="192" />
</el-form-item> </el-form-item>
<el-form-item label="合同内容" v-else"> <el-form-item label="合同内容" v-else>
<editor v-model="form.contractedContent" :min-height="192" /> <editor v-model="form.contractedContent" :min-height="192" />
</el-form-item> </el-form-item>
<el-form-item label="合同金额" prop="amount"> <el-form-item label="合同金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入合同金额" <el-input
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" /> v-model="form.amount"
placeholder="请输入合同金额"
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
:ref="fileRef" :defaultFileList="tempFileList" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
<template v-else-if="contract_type == 'expenses'"> <template v-else-if="contract_type == 'expenses'">
<el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" <el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules" label-width="80px">
label-width="80px">
<!-- <el-form-item label="项目名称"> <!-- <el-form-item label="项目名称">
<el-input :model-value="projectName" placeholder="请输入项目ID" disabled /> <el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
</el-form-item> --> </el-form-item> -->
@ -63,8 +61,7 @@
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contractType"> <el-form-item label="合同类型" prop="contractType">
<el-select v-model="form.contractType" placeholder="请选择合同类型"> <el-select v-model="form.contractType" placeholder="请选择合同类型">
<el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" :value="item.value" />
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="招标计划" prop="tenderId"> <el-form-item label="招标计划" prop="tenderId">
@ -77,21 +74,22 @@
</el-form-item> </el-form-item>
<el-form-item label="分包内容"> <el-form-item label="分包内容">
<!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> --> <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
<el-input v-model="form.contractedContent" style="width: 300px" <el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
:autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
</el-form-item> </el-form-item>
<el-form-item label="合同金额" prop="amount"> <el-form-item label="合同金额" prop="amount">
<el-input <el-input
oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
v-model="form.amount" placeholder="请输入合同金额" disabled /> v-model="form.amount"
placeholder="请输入合同金额"
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="合同附件"> <el-form-item label="合同附件">
<FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
:ref="fileRef" :defaultFileList="tempFileList" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
@ -101,7 +99,7 @@
</div> </div>
</template> </template>
<template v-else-if="active == 2"> <template v-else-if="active == 2">
<h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1> <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
<el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef"> <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
<el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType"> <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
<el-select v-model="form.payType"> <el-select v-model="form.payType">
@ -145,9 +143,7 @@
</el-table> </el-table>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"> <el-button type="primary" @click="dialogVisible = false"> 关闭 </el-button>
关闭
</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -160,18 +156,16 @@ import { addIncomeContract, getInfoByProjectId } from '@/api/ctr/incomeContrac
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
const active = ref(0); const active = ref(0);
const contract_type = ref("") const contract_type = ref('');
const form = ref({ payType: 1 }) const form = ref({ payType: 1 });
const fileList = ref([]) const fileList = ref([]);
const tempFileList = ref([]) const tempFileList = ref([]);
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const userStore = useUserStore(); const userStore = useUserStore();
const planList = ref([]); const planList = ref([]);
const dialogVisible = ref(false); const dialogVisible = ref(false);
const { expenses_contract_type, income_contract_type } = toRefs( const { expenses_contract_type, income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
proxy?.useDict('income_contract_type', 'expenses_contract_type')
);
const fileRef = ref(null); const fileRef = ref(null);
const incomeContractFormRef = ref(null); const incomeContractFormRef = ref(null);
const expensesContractFormRef = ref(null); const expensesContractFormRef = ref(null);
@ -181,7 +175,7 @@ const incomeContractFormRules = {
contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }], contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }], contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }], amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }], remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
}; };
const expensesContractFormRules = { const expensesContractFormRules = {
contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }], contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
@ -191,20 +185,19 @@ const expensesContractFormRules = {
amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }], amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }], tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
remark: [{ required: false, message: '请输入备注', trigger: 'blur' }], remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
}; };
const payMentRules = { const payMentRules = {
payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }], payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }], advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }], balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }], assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }]
}; };
const project = computed(() => { const project = computed(() => {
console.log(111); console.log(111);
return JSON.parse(localStorage.getItem("selectedProject")) return JSON.parse(localStorage.getItem('selectedProject'));
}); });
const payRatioComputed = computed({ const payRatioComputed = computed({
@ -215,7 +208,7 @@ const payRatioComputed = computed({
return total; return total;
}, },
// 只读 // 只读
set: () => { } set: () => {}
}); });
const checkContractType = (type) => { const checkContractType = (type) => {
contract_type.value = type; contract_type.value = type;
@ -224,8 +217,8 @@ const checkContractType = (type) => {
form.value.step = active.value; form.value.step = active.value;
}; };
const onUploadSuccess = (data) => { const onUploadSuccess = (data) => {
fileList.value = data fileList.value = data;
} };
const back = async (reset) => { const back = async (reset) => {
console.log(active.value); console.log(active.value);
@ -233,11 +226,13 @@ const back = async (reset) => {
await ElMessageBox.confirm('返回上一步将清空目前填写的内容,确定返回?', '提示', { await ElMessageBox.confirm('返回上一步将清空目前填写的内容,确定返回?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { })
.then(() => {
resetForm(); resetForm();
active.value--; active.value--;
}).catch(() => { })
.catch(() => {
return; return;
}); });
} else { } else {
@ -246,7 +241,6 @@ const back = async (reset) => {
console.log(active.value); console.log(active.value);
form.value.step = active.value; form.value.step = active.value;
}; };
const next = async () => { const next = async () => {
if (contract_type.value === 'income') { if (contract_type.value === 'income') {
@ -288,16 +282,14 @@ const resetForm = () => {
tempFileList.value = []; tempFileList.value = [];
contract_type.value = ''; contract_type.value = '';
setTimeout(() => { setTimeout(() => {
localStorage.removeItem("tempContractForm"); localStorage.removeItem('tempContractForm');
}, 0); }, 0);
}; };
const submitForm = async () => { const submitForm = async () => {
await payMentRef.value.validate(async (valid) => { await payMentRef.value.validate(async (valid) => {
if (valid) { if (valid) {
if (payRatioComputed.value < 0) { if (payRatioComputed.value < 0) {
ElMessage.error('四项付款比例之和必须等于100%'); ElMessage.error('四项付款比例之和必须等于100%');
return; return;
} }
@ -311,9 +303,9 @@ const submitForm = async () => {
return { return {
...data, ...data,
fileName: data.name, fileName: data.name,
fileUrl: data.url, fileUrl: data.url
} };
}) });
if (contract_type.value === 'income') { if (contract_type.value === 'income') {
await addIncomeContract({ ...form.value }); await addIncomeContract({ ...form.value });
} else if (contract_type.value === 'expenses') { } else if (contract_type.value === 'expenses') {
@ -358,7 +350,7 @@ const submitForm = async () => {
// } // }
// }); // });
// } // }
} };
const handleChoose = async () => { const handleChoose = async () => {
if (!form.value.contractType) { if (!form.value.contractType) {
ElMessage.error('请先选择合同类型'); ElMessage.error('请先选择合同类型');
@ -367,17 +359,16 @@ const handleChoose = async () => {
const formData = { const formData = {
projectId: userStore.selectedProject.id, projectId: userStore.selectedProject.id,
dictName: form.value.contractType, dictName: form.value.contractType,
status: 1, status: 1
} };
const { data } = await getTenderPlan(formData) const { data } = await getTenderPlan(formData);
if (data.length === 0) { if (data.length === 0) {
ElMessage.warning('当前没有招标计划,请先创建招标计划'); ElMessage.warning('当前没有招标计划,请先创建招标计划');
return; return;
} }
planList.value = data planList.value = data;
dialogVisible.value = true; dialogVisible.value = true;
};
}
const handleChooseData = (row) => { const handleChooseData = (row) => {
form.value.tenderId = row.id; form.value.tenderId = row.id;
form.value.name = row.name; form.value.name = row.name;
@ -387,28 +378,37 @@ const handleChooseData = (row) => {
form.value.amount = row.contractPrice; form.value.amount = row.contractPrice;
dialogVisible.value = false; dialogVisible.value = false;
}; };
watch(form, (val) => { watch(
localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value })); form,
}, { deep: true }); (val) => {
watch(fileList, (val) => { localStorage.setItem('tempContractForm', JSON.stringify({ ...val, fileList: fileList.value }));
localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val })); },
}, { deep: true }); { deep: true }
);
watch(
fileList,
(val) => {
localStorage.setItem('tempContractForm', JSON.stringify({ ...form.value, fileList: val }));
},
{ deep: true }
);
// 获取投标列表 // 获取投标列表
const getInfoByProjectIdList = async () => { const getInfoByProjectIdList = async () => {
const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id, }); const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id });
console.log(res); console.log(res);
form.value.contractOwner = res.data.planDuration; form.value.contractOwner = res.data.planDuration;
} };
onMounted(() => { onMounted(() => {
getInfoByProjectIdList(); getInfoByProjectIdList();
const tempForm = localStorage.getItem("tempContractForm"); const tempForm = localStorage.getItem('tempContractForm');
if (tempForm) { if (tempForm) {
ElMessageBox.confirm('检测到有未完成的合同录入,是否继续?', '提示', { ElMessageBox.confirm('检测到有未完成的合同录入,是否继续?', '提示', {
confirmButtonText: '继续', confirmButtonText: '继续',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then(() => { })
.then(() => {
const t = JSON.parse(tempForm); const t = JSON.parse(tempForm);
const { fileList: files, ...rest } = JSON.parse(tempForm); const { fileList: files, ...rest } = JSON.parse(tempForm);
form.value = rest; form.value = rest;
@ -416,11 +416,10 @@ onMounted(() => {
tempFileList.value = files || []; tempFileList.value = files || [];
contract_type.value = form.value.contract_type; contract_type.value = form.value.contract_type;
active.value = form.value.step || 0; active.value = form.value.step || 0;
})
}).catch(() => { .catch(() => {
localStorage.removeItem("tempContractForm"); localStorage.removeItem('tempContractForm');
}); });
} }
}); });
</script> </script>

View File

@ -10,7 +10,7 @@
@click="isDisabled = false" @click="isDisabled = false"
class="px-8 py-2.5 transition-all duration-300 font-medium" class="px-8 py-2.5 transition-all duration-300 font-medium"
v-if="isDisabled" v-if="isDisabled"
v-hasPermi="['ailiaoshebei:purchaseUser:byProject']" v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
> >
点击编辑 点击编辑
</el-button> </el-button>
@ -38,7 +38,7 @@
@click="submitForm" @click="submitForm"
icon="Check" icon="Check"
class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium" class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
v-hasPermi="['cailiaoshebei:purchaseUser:add']" v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
> >
确认提交 确认提交
</el-button> </el-button>
@ -121,6 +121,7 @@ const designUser = async () => {
return; return;
} }
Object.assign(form, res.data); Object.assign(form, res.data);
// form.userId = res.data.userId;
isDisabled.value = true; isDisabled.value = true;
} }
} catch (error) { } catch (error) {

View File

@ -167,10 +167,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button> <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
@ -514,11 +511,12 @@ const changeSheet = () => {
getTreeList(); getTreeList();
}; };
const toggleExpandAll = (isExpand: boolean) => { const toggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
console.log(isExpandAll.value);
treeData.value.forEach((row) => { treeData.value.forEach((row) => {
treeTableRef.value.toggleRowExpansion(row, isExpand); treeTableRef.value.toggleRowExpansion(row, isExpandAll.value);
}); });
isExpandAll.value = isExpand;
}; };
//打开获取表数据 //打开获取表数据
const getTreeList = async () => { const getTreeList = async () => {