taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Teo
2025-08-29 16:34:02 +08:00
parent bbb105b622 47a8b17061
commit e99e27c8d1
10 changed files with 405 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/bidding/appointment/index.ts
View File

@ -21,7 +21,7 @@ export const AddbiddingUser = (data) => {
data
});
};
// 新增招投标人员
// 查询招投标人员
export const biddingUserList = (projectId) => {
return request({
url: '/bidding/biddingUser/list',

2
src/api/project/project/index.ts
View File

@ -96,8 +96,6 @@ export const addProjectFacilities = (data: any) => {
* @param data
*/
export const addProjectPilePoint = (data: any) => {
console.log('🚀 ~ addProjectPilePoint ~ data:', data);
return request({
url: '/facility/photovoltaicPanelPoint/parts/geoJson',
method: 'post',

2
src/views/biddingManagemen/appointment/index.vue
View File

@ -25,7 +25,7 @@
placeholder="请选择招投标专员"
class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
>
<el-option v-for="item in userList" :key="item.userId" :label="item.userName" :value="item.userId" />
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
</div>

12
src/views/contract/division/index.vue
View File

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

13
src/views/contract/limitPrice/index.vue
View File

@ -14,11 +14,9 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
<el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
</el-form-item>
<el-form-item>
<el-upload
ref="uploadRef"
@ -274,11 +272,12 @@ const handleSave = (row?: any, type?: any) => {
};
const tableRef = ref<any>();
const toggleExpandAll = (isExpand: boolean) => {
const toggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
console.log(isExpandAll.value);
tableData.value.forEach((row) => {
tableRef.value.toggleRowExpansion(row, isExpand);
tableRef.value.toggleRowExpansion(row, isExpandAll.value);
});
isExpandAll.value = isExpand;
};
//导入
const importExcel = (options: any): any => {

141
src/views/ctr/index.vue
View File

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

5
src/views/materials/appointment/index.vue
View File

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

10
src/views/project/project/index.vue
View File

@ -46,7 +46,9 @@
<el-table-column type="expand" width="50">
<template #default="{ row }">
<div class="w212.25 ml-12.5">
<el-button class="mb" type="primary" size="small" @click="handleOpenSetChild(row.id)" icon="plus">添加子项目</el-button>
<el-button class="mb" type="primary" size="small" v-hasPermi="['project:project:add']" @click="handleOpenSetChild(row.id)" icon="plus"
>添加子项目</el-button
>
<el-table :data="row.children" border stripe>
<el-table-column label="序号" type="index" width="55" align="center" />
@ -73,7 +75,7 @@
uploadUrl="/project/projectFile/upload/dxf"
:data="{ projectId: scope.row.id }"
>
<el-button link type="primary" icon="upload">上传DXF </el-button>
<el-button link type="primary" icon="upload" v-hasPermi="['project:projectFile:add']">上传DXF </el-button>
</file-upload>
<el-button
link
@ -145,7 +147,9 @@
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="400">
<template #default="scope">
<el-space>
<el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)">导入安全协议书 </el-button>
<el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)" v-hasPermi="['project:project:edit']"
>导入安全协议书
</el-button>
<el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['project:project:edit']">修改 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button>

12
src/views/tender/bidd/index.vue
View File

@ -17,10 +17,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="toggleExpandAll(true)">一键展开</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
<el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
</el-form-item>
<el-form-item>
@ -163,11 +160,12 @@ const changeSheet = (val: any) => {
getTableData();
};
//展开树
const toggleExpandAll = (isExpand: boolean) => {
const toggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
console.log(isExpandAll.value);
tableData.value.forEach((row) => {
tableRef.value.toggleRowExpansion(row, isExpand);
tableRef.value.toggleRowExpansion(row, isExpandAll.value);
});
isExpandAll.value = isExpand;
};
//获取版本号

12
src/views/tender/plan/index.vue
View File

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