-
+
-
@@ -47,7 +33,9 @@ const props = defineProps({
/* 上传文件大小限制(MB) */
fileSize: propTypes.number.def(5),
/* 类型（base64格式、url格式） */
- type: propTypes.string.def('url')
+ type: propTypes.string.def('url'),
+ /* 占位符 */
+ placeholder: propTypes.string.def('请输入内容'),
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -90,7 +78,7 @@ const options = ref
-
+
-
+
+
@@ -180,40 +208,39 @@ watch(
},
{ deep: true, immediate: true }
);
-watch(() => props.defaultFileList, () => {
- if (props.defaultFileList.length === 0) return;
- props.defaultFileList.forEach((item: any) => {
- fileList.value.push(item);
- });
-
-}, { deep: true, immediate: true });
+watch(
+ () => props.defaultFileList,
+ () => {
+ if (props.defaultFileList.length === 0) return;
+ props.defaultFileList.forEach((item: any) => {
+ fileList.value.push(item);
+ });
+ },
+ { deep: true, immediate: true }
+);
// 上传前校检格式和大小
const handleBeforeUpload = (file: any) => {
- // 校检文件类型
- if (props.fileType.length) {
- const fileName = file.name.split('.');
- const fileExt = fileName[fileName.length - 1];
- const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
- if (!isTypeOk) {
- proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
- return false;
- }
+ if (!validateFile(file)) return false;
+ proxy?.$modal.loading('正在上传文件，请稍候...');
+ number.value++;
+ return true;
+};
+
+//校检格式和大小
+const validateFile = (file: File) => {
+ const ext = file.name.split('.').pop()?.toLowerCase();
+ if (props.fileType.length && !props.fileType.includes(ext!)) {
+ proxy?.$modal.msgError(`文件格式不正确，请上传 ${props.fileType.join('/')} 格式文件!`);
+ return false;
}
- // 校检文件名是否包含特殊字符
if (file.name.includes(',')) {
proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
return false;
}
- // 校检文件大小
- if (props.fileSize) {
- const isLt = file.size / 1024 / 1024 < props.fileSize;
- if (!isLt) {
- proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
- return false;
- }
+ if (props.fileSize && file.size / 1024 / 1024 > props.fileSize) {
+ proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+ return false;
}
- proxy?.$modal.loading('正在上传文件，请稍候...');
- number.value++;
return true;
};
@@ -254,13 +281,25 @@ const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
uploadedSuccessfully(res);
};
-const handleChange = (file: any, fileList: any) => {
+const handleChange = (file: any, filelist: any) => {
+ if (!props.autoUpload) {
+ // 手动上传模式：在选中文件时拦截非法文件
+ const isValid = validateFile(file.raw || file);
+ if (!isValid) {
+ fileUploadRef.value?.handleRemove(file); // 直接移除非法文件
+ console.log(file, filelist, fileList.value);
+ fileList.value = [...fileList.value]; // 触发列表更新
+ return;
+ }
+ }
// 记录 status = 'ready' 的文件
if (file.status === 'ready') {
pendingFiles.value.push(file);
+ fileList.value = pendingFiles.value;
}
+ console.log(fileList.value);
- emit('handleChange', file, fileList);
+ emit('handleChange', file, filelist);
};
// 删除文件
@@ -270,6 +309,12 @@ const handleRemove = (file: any, fileList: any) => {
emit('handleRemove', file, fileList);
};
+const handlePreview = (file: any) => {
+ if (file.url) {
+ window.open(file.url);
+ }
+};
+
// 删除文件
const handleDelete = async (index: string | number, type?: string) => {
await proxy?.$modal.confirm('是否确认删除此文件？').finally();
@@ -308,11 +353,6 @@ const uploadedSuccessfully = (res: any) => {
emit('update:modelValue', listToString(fileList.value));
proxy?.$modal.closeLoading();
}
- // if (props.autoUpload && props.limit === fileList.value.length) {
- // fileUploadRef.value?.clearFiles();
- // fileList.value = [];
- // emit('update:modelValue', ''); // 同步到外部 v-model
- // }
props.onUploadSuccess?.(fileList.value, res);
};
@@ -376,6 +416,11 @@ const submitUpload = async () => {
if (!pendingFiles.value.length) {
return 'noFile';
}
+ const validFiles = pendingFiles.value.filter((f: any) => validateFile(f.raw || f));
+ if (!validFiles.length) {
+ proxy?.$modal.msgError('没有符合条件的文件可上传');
+ return;
+ }
try {
proxy?.$modal.loading('正在上传文件，请稍候...');
const formData = new FormData();
@@ -424,7 +469,7 @@ defineExpose({ submitUpload });
}
}
- >span {
+ > span {
width: 100%;
}
}
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 03000a9..3fefa25 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -185,6 +185,10 @@ const props = defineProps({
taskVariables: {
type: Object as () => Record,
default: () => {}
+ },
+ businessId1: {
+ type: String,
+ default: ''
}
});
//遮罩层
@@ -336,6 +340,9 @@ const handleCompleteTask = async () => {
}
if (isDrawing.value) {
isShowSubmit.value = true;
+ nextTick(() => {
+ detailFormTeRef.value.getInfo(props.businessId1);
+ });
return;
}
await proxy?.$modal.confirm('是否确认提交？');
@@ -538,6 +545,9 @@ const handleTermination = async () => {
const handleTerminationTask = async () => {
if (isDrawing.value) {
isShowTermination.value = true;
+ nextTick(() => {
+ detailFormTeRef.value.getInfo(props.businessId1);
+ });
return;
}
const params = {
diff --git a/src/components/ProjectSelector/index.vue b/src/components/ProjectSelector/index.vue
index 5ba301d..1259482 100644
--- a/src/components/ProjectSelector/index.vue
+++ b/src/components/ProjectSelector/index.vue
@@ -1,5 +1,5 @@
-
@@ -24,10 +42,20 @@
的文件
-
+
[
// { id: '', name: '全部工程项目' }, // 添加空选项
...userStore.projects
]);
+const proxy = getCurrentInstance()?.proxy as any;
const selectedProjectId = ref(userStore.selectedProject?.id || '');
@@ -37,13 +43,66 @@ watch(
{ deep: true }
);
-const handleSelect = (projectId: string) => {
+/** 切换项目逻辑 */
+const handleSelect = async (projectId: string) => {
+ proxy.$cache.local.setJSON('isCheckRole', 'true');
+
+ const userStore = useUserStore();
+ const permissionStore = usePermissionStore();
const selectedProject = projects.value.find((p) => p.id === projectId);
- if (selectedProject) {
- userStore.setSelectedProject(selectedProject);
- console.log(userStore.selectedProject); // 打印选中的项目
- }
+ if (!selectedProject) return;
+ const loadingInstance = ElLoading.service({
+ lock: true,
+ text: '项目切换中...',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+ setTimeout(() => {
+ if (loadingInstance && loadingInstance.visible) {
+ loadingInstance.close();
+ }
+ }, 3000);
+ await changeProject(projectId);
+ console.log('切换项目', selectedProject);
+
+ // 更新项目 & 权限
+ userStore.setSelectedProject(selectedProject);
+ await userStore.setInfo();
+ await userStore.setRoles(); // 这里会刷新 permissions/roles
+ // 重新生成路由
+ permissionStore.generateRoutes().then((routeList) => {
+ const currentPath = router.currentRoute.value.fullPath;
+ const exist = currentPath == '/' || currentPath == '/index' ? true : routeExists(currentPath, routeList);
+ if (exist) return loadingInstance.close();
+
+ proxy?.$tab.closeAllPage();
+ router.push('/index');
+ loadingInstance.close();
+
+ // 刷新当前路由
+ });
};
+function routeExists(fullPath: string, routes: any[], parentPath = ''): boolean {
+ for (const route of routes) {
+ // 拼接完整 path
+ let currentPath = route.path.startsWith('/') ? route.path : `${parentPath}/${route.path}`;
+
+ // 处理多余的 "//"
+ currentPath = currentPath.replace(/\/+/g, '/');
+
+ // 判断
+ if (currentPath === fullPath) {
+ return true;
+ }
+
+ // 递归子路由
+ if (route.children && route.children.length > 0) {
+ if (routeExists(fullPath, route.children, currentPath)) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ff518f4..c2ed27e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -23,14 +23,14 @@
+
-
+
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 5e82ea3..d1e745a 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -6,6 +6,7 @@
,
@@ -49,7 +55,22 @@ const props = defineProps({
default: ''
}
});
+const total = ref(0);
+onMounted(() => {
+ if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
+ console.log(44444444);
+ getWaitingList();
+ }
+});
+// 获取我的待办
+//分页
+const getWaitingList = () => {
+ pageByTaskWait({ pageNum: 1, pageSize: 10 }).then((resp) => {
+ console.log(resp);
+ total.value = resp.total;
+ });
+};
const onlyOneChild = ref({});
const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[]) => {
@@ -64,12 +85,12 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[])
return true;
});
- // When there is only one child router, the child router is displayed by default
+ // 只有一个子路由时默认显示子路由
if (showingChildren.length === 1) {
return true;
}
- // Show parent if there are no child router to display
+ // 没有子路由可显示时显示父路由
if (showingChildren.length === 0) {
onlyOneChild.value = { ...parent, path: '', noShowingChildren: true };
return true;
@@ -98,4 +119,49 @@ const hasTitle = (title: string | undefined): string => {
}
return title;
};
+//用深度监听 消息
+watch(
+ () => noticeStore.state.value.notices,
+ (newVal) => {
+ if (onlyOneChild.value.meta?.title == '我的待办') {
+ console.log(121212121);
+
+ let time = setTimeout(() => {
+ getWaitingList();
+ clearTimeout(time);
+ }, 500);
+ }
+ },
+ { deep: true }
+);
+
+
diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue
index 78ca0c8..3d6afc9 100644
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -51,11 +51,12 @@ const getTableData = async () => {
//点击消息，写入已读
const onNewsClick = (item: any) => {
newsList.value[item].read = true;
+ console.log('🚀 ~ onNewsClick ~ newsList.value[item]:', newsList.value[item]);
//并且写入pinia
noticeStore.state.value.notices = newsList.value;
//如果有formPath，就前往
if (newsList.value[item].route) {
- proxy?.$tab.openPage('/' + newsList.value[item].route, '', { id: newsList.value[item].detailId, type: 'view' });
+ proxy?.$tab.openPage(newsList.value[item].route, '', { id: newsList.value[item].detailId, type: 'view' });
}
};
diff --git a/src/permission.ts b/src/permission.ts
index 9e4507a..6162675 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -1,3 +1,4 @@
+import $cache from '@/plugins/cache';
import { to as tos } from 'await-to-js';
import router from './router';
import NProgress from 'nprogress';
@@ -9,6 +10,8 @@ import useUserStore from '@/store/modules/user';
import useSettingsStore from '@/store/modules/settings';
import usePermissionStore from '@/store/modules/permission';
+let isFirst = false;
+
NProgress.configure({ showSpinner: false });
const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*', '/materials/purchaseDoc/uploadCode'];
@@ -16,54 +19,64 @@ const isWhiteList = (path: string) => {
return whiteList.some((pattern) => isPathMatch(pattern, path));
};
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from) => {
NProgress.start();
- if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode' || to.path == '/codeDetail') {
- next();
- } else if (getToken()) {
- to.meta.title && useSettingsStore().setTitle(to.meta.title);
- /* has token*/
- if (to.path === '/login') {
- next({ path: '/' });
- NProgress.done();
- } else if (isWhiteList(to.path)) {
- next();
- } else {
- if (useUserStore().roles.length === 0) {
- isRelogin.show = true;
- // 判断当前用户是否已拉取完user_info信息
- const [err] = await tos(useUserStore().getInfo());
- if (err) {
- await useUserStore().logout();
- ElMessage.error(err);
- next({ path: '/' });
- } else {
- isRelogin.show = false;
- const accessRoutes = await usePermissionStore().generateRoutes();
- // 根据roles权限生成可访问的路由表
- accessRoutes.forEach((route) => {
- if (!isHttp(route.path)) {
- router.addRoute(route); // 动态添加可访问路由表
- }
- });
- // @ts-expect-error hack方法 确保addRoutes已完成
- next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
- }
- } else {
- next();
- }
- }
- } else {
- // 没有token
- if (isWhiteList(to.path)) {
- // 在免登录白名单，直接进入
- next();
- } else {
- const redirect = encodeURIComponent(to.fullPath || '/');
- next(`/login?redirect=${redirect}`); // 否则全部重定向到登录页
- NProgress.done();
- }
+
+ // 特殊页面放行
+ if (['/indexEquipment', '/materials/purchaseDoc/uploadCode', '/codeDetail'].includes(to.path)) {
+ return true;
}
+
+ // 已登录
+ if (getToken()) {
+ if (to.meta.title) useSettingsStore().setTitle(to.meta.title);
+
+ if (to.path === '/login') {
+ NProgress.done();
+ return { path: '/' };
+ }
+
+ if (isWhiteList(to.path)) {
+ return true;
+ }
+ if ((!isFirst && useUserStore().roles.length === 0) || $cache.local.getJSON('isCheckRole') === 'true') {
+ isFirst = true;
+ isRelogin.show = true;
+
+ const [err] = await tos(useUserStore().getInfo());
+
+ if (err) {
+ await useUserStore().logout();
+ ElMessage.error(err);
+ NProgress.done();
+ return { path: '/' };
+ }
+
+ isRelogin.show = false;
+ const accessRoutes = await usePermissionStore().generateRoutes();
+ accessRoutes.forEach((route) => {
+ if (!isHttp(route.path)) router.addRoute(route);
+ });
+
+ $cache.local.remove('isCheckRole');
+
+ // 确保路由已添加后再跳转
+ return { ...to, replace: true };
+ }
+
+ return true;
+ } else {
+ isFirst = false;
+ }
+
+ // 未登录
+ if (isWhiteList(to.path)) {
+ return true;
+ }
+
+ const redirect = encodeURIComponent(to.fullPath || '/');
+ NProgress.done();
+ return { path: `/login?redirect=${redirect}` };
});
router.afterEach(() => {
diff --git a/src/router/index.ts b/src/router/index.ts
index a14689d..083d2d1 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,6 +1,7 @@
import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
/* Layout */
import Layout from '@/layout/index.vue';
+import usePermissionStore from '@/store/modules/permission';
/**
* Note: 路由配置项
@@ -65,11 +66,7 @@ export const constantRoutes: RouteRecordRaw[] = [
component: () => import('@/views/register.vue'),
hidden: true
},
- {
- path: '/:pathMatch(.*)*',
- component: () => import('@/views/error/404.vue'),
- hidden: true
- },
+
{
path: '/401',
component: () => import('@/views/error/401.vue'),
@@ -134,10 +131,16 @@ export const constantRoutes: RouteRecordRaw[] = [
component: () => import('@/views/gis2D/index.vue'),
hidden: true
},
+
{
path: '/materials/purchaseDoc/uploadCode',
component: () => import('@/views/materials/purchaseDoc/uploadCode.vue'),
hidden: true
+ },
+ {
+ path: '/:pathMatch(.*)*',
+ component: () => import('@/views/error/404.vue'),
+ hidden: true
}
];
@@ -231,3 +234,11 @@ const router = createRouter({
});
export default router;
+
+export function resetRouter() {
+ router.getRoutes().forEach((route) => {
+ if (route.name && !constantRoutes.find((r) => r.name === route.name)) {
+ router.hasRoute(route.name) && router.removeRoute(route.name);
+ }
+ });
+}
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 43fcef8..7efcf2d 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -10,6 +10,7 @@ import ParentView from '@/components/ParentView/index.vue';
import InnerLink from '@/layout/components/InnerLink/index.vue';
import { createCustomNameComponent } from '@/utils/createCustomNameComponent';
+import { useUserStoreHook } from './user';
// 匹配views里面所有的.vue文件
const modules = import.meta.glob('./../../views/**/*.vue');
@@ -44,7 +45,7 @@ export const usePermissionStore = defineStore('permission', () => {
sidebarRouters.value = routes;
};
const generateRoutes = async (): Promise => {
- const res = await getRouters();
+ const res = await getRouters(useUserStoreHook().selectedProject?.id || '0');
const { data } = res;
const sdata = JSON.parse(JSON.stringify(data));
const rdata = JSON.parse(JSON.stringify(data));
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index e62d8ae..e04a9f5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -28,7 +28,6 @@ const getSelectedProjectFromStorage = () => {
const getProjectTeamListFromStorage = () => {
const stored = $cache.local.getJSON('ProjectTeamList');
console.log('获取缓存的项目班组列表:', stored);
-
return stored ? stored : null;
};
@@ -41,7 +40,9 @@ export const useUserStore = defineStore('user', () => {
const deptId = ref('');
const avatar = ref('');
const roles = ref>([]); // 用户角色编码集合 → 判断路由权限
- const permissions = ref>([]); // 用户权限编码集合 → 判断按钮权限
+ const permissions = ref>([]); // 用户权限编码集合 → 判断按钮权限
+ const permissionList = ref>([]); // 用户所有权限列表
+ const roleList = ref>([]); // 用户所有角色列表
const projects = ref>([]);
// 从localStorage获取缓存的项目，如果没有则默认为null
@@ -66,15 +67,32 @@ export const useUserStore = defineStore('user', () => {
// 获取用户信息
const getInfo = async (): Promise => {
+ // **新增项目数据获取**
+ const [projectErr, projectRes] = await to(getUserProject());
+ if (projectRes?.data) {
+ const projectList = projectRes.data.map((p) => ({
+ id: p.projectId,
+ name: p.projectName || '未知项目'
+ }));
+ setProjects(projectList);
+ // 如果有缓存的选中项目，且该项目在当前项目列表中存在，则使用缓存的项目
+ const storedProject = getSelectedProjectFromStorage();
+ if (storedProject && projectList.some((p) => p.id === storedProject.id)) {
+ setSelectedProject(storedProject);
+ } else if (projectList.length > 0) {
+ // 否则默认选择第一个项目
+ setSelectedProject(projectList[0]);
+ }
+ }
const [err, res] = await to(getUserInfo());
if (res) {
const data = res.data;
const user = data.user;
const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
-
if (data.roles && data.roles.length > 0) {
- roles.value = data.roles;
- permissions.value = data.permissions;
+ permissionList.value = data.permissions;
+ roleList.value = data.roles;
+ setRoles();
} else {
roles.value = ['ROLE_DEFAULT'];
}
@@ -85,30 +103,39 @@ export const useUserStore = defineStore('user', () => {
tenantId.value = user.tenantId;
deptId.value = user.deptId;
- // **新增项目数据获取**
- const [projectErr, projectRes] = await to(getUserProject());
- if (projectRes?.data) {
- const projectList = projectRes.data.map((p) => ({
- id: p.projectId,
- name: p.projectName || '未知项目'
- }));
-
- setProjects(projectList);
-
- // 如果有缓存的选中项目，且该项目在当前项目列表中存在，则使用缓存的项目
- const storedProject = getSelectedProjectFromStorage();
- if (storedProject && projectList.some((p) => p.id === storedProject.id)) {
- setSelectedProject(storedProject);
- } else if (projectList.length > 0) {
- // 否则默认选择第一个项目
- setSelectedProject(projectList[0]);
- }
- }
-
return Promise.resolve();
}
return Promise.reject(err);
};
+ const setInfo = async () => {
+ const [err, res] = await to(getUserInfo());
+ if (res) {
+ const data = res.data;
+ const user = data.user;
+ const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
+ if (data.roles && data.roles.length > 0) {
+ permissionList.value = data.permissions;
+ roleList.value = data.roles;
+ setRoles();
+ } else {
+ roles.value = ['ROLE_DEFAULT'];
+ }
+ name.value = user.userName;
+ nickname.value = user.nickName;
+ avatar.value = profile;
+ userId.value = user.userId;
+ tenantId.value = user.tenantId;
+ deptId.value = user.deptId;
+ }
+ };
+
+ const setRoles = () => {
+ const projectRole = roleList.value.find((item) => item.projectId == selectedProject.value?.id)?.projectRoles || [];
+ roles.value = projectRole;
+ const projectPermissions = permissionList.value.find((item) => item.projectId == selectedProject.value?.id)?.projectPermissions || [];
+ permissions.value = projectPermissions;
+ getProjectTeam();
+ };
// 注销
const logout = async (): Promise => {
@@ -158,7 +185,9 @@ export const useUserStore = defineStore('user', () => {
setProjectTeamList,
projects,
selectedProject,
- ProjectTeamList
+ ProjectTeamList,
+ setInfo,
+ setRoles
};
});
diff --git a/src/utils/projectTeam.ts b/src/utils/projectTeam.ts
index 1134b68..c0c8d23 100644
--- a/src/utils/projectTeam.ts
+++ b/src/utils/projectTeam.ts
@@ -2,7 +2,11 @@ import $cache from '@/plugins/cache';
//获取班组列表
import { listProjectTeam } from '@/api/project/projectTeam';
import { ProjectTeamVO } from '@/api/project/projectTeam/types';
+import useUserStore from '@/store/modules/user';
export const getProjectTeam = async () => {
+ const isPermission = useUserStore().permissions.some((item) => item == 'project:team:list');
+ if (!isPermission && useUserStore().permissions[0] != '*:*:*') return;
+
const { id } = $cache.local.getJSON('selectedProject');
const res = await listProjectTeam({
pageNum: 1,
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 288b711..0ff507c 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -176,22 +176,26 @@ service.interceptors.response.use(
}
);
// 通用下载方法
-export function download(url: string, params: any, fileName: string) {
+export function download(url: string, params: any, fileName: string, isHeader?: boolean) {
downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
// prettier-ignore
- return service.post(url, params, {
+ let data={
transformRequest: [
(params: any) => {
return tansParams(params);
}
],
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ headers: isHeader?{'Content-Type': 'application/json'}:{ 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
- }).then(async (resp: any) => {
+ }
+ if (isHeader) delete data.transformRequest;
+ return service
+ .post(url, params, data as any)
+ .then(async (resp: any) => {
const isLogin = blobValidate(resp);
if (isLogin) {
- console.log("🚀 ~ download ~ resp:", resp)
+ console.log('🚀 ~ download ~ resp:', resp);
const blob = new Blob([resp]);
FileSaver.saveAs(blob, fileName);
} else {
@@ -201,7 +205,8 @@ export function download(url: string, params: any, fileName: string) {
ElMessage.error(errMsg);
}
downloadLoadingInstance.close();
- }).catch((r: any) => {
+ })
+ .catch((r: any) => {
console.error(r);
ElMessage.error('下载文件出现错误，请联系管理员！');
downloadLoadingInstance.close();
diff --git a/src/utils/sse.ts b/src/utils/sse.ts
index 464727c..897d3ac 100644
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@@ -20,7 +20,6 @@ export const initSSE = (url: any) => {
});
watch(error, () => {
- console.log('SSE connection error:', error.value);
error.value = null;
});
@@ -31,9 +30,12 @@ export const initSSE = (url: any) => {
try {
if (JSON.parse(data.value)) {
const obj = JSON.parse(data.value);
- route1 = obj.route;
- label = obj.message;
- detailId = obj.detailId;
+ route1 = obj.type;
+ if (obj.type == 'count') {
+ return;
+ }
+ label = obj.content;
+ // detailId = obj.detailId;
data.value = null;
}
} catch (error) {
diff --git a/src/views/ProjectScreen/components/centerPage.vue b/src/views/ProjectScreen/components/centerPage.vue
index 21224b8..ebf11df 100644
--- a/src/views/ProjectScreen/components/centerPage.vue
+++ b/src/views/ProjectScreen/components/centerPage.vue
@@ -1,7 +1,7 @@
@@ -30,7 +30,7 @@
</div>
</template>
-<script setup lang="ts">
+<script setup>
import { ref, onMounted, toRefs, getCurrentInstance } from "vue"
import Title from './title.vue'
import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
@@ -56,12 +56,12 @@ const inspectionList = ref([{
picture: "",
createTime: ""
}])
-const swiperContent = ref<HTMLDivElement>()
+const swiperContent = ref()
const swiperItemWidth = ref(100)
const canLeft = ref(false)
const canRight = ref(true)
-const swiperClick = (direction: 'left' | 'right') => {
+const swiperClick = (direction) => {
if (!swiperContent.value) return
if (direction === 'right') {
@@ -90,18 +90,67 @@ const getInspectionList = async () => {
const { code, data } = res
if (code === 200) {
data.map(item => {
- item.label = violation_level_type.value.find((i: any) => i.value === item.violationType)?.label
+ item.label = violation_level_type.value.find((i) => i.value === item.violationType)?.label
})
inspectionList.value = data
}
}
+// 创建地球
+const createEarth = () => {
+ window.YJ.on({
+ ws: true,
+ // host: getIP(), //资源所在服务器地址
+ // username: this.loginForm.username, //用户名 可以不登录（不填写用户名），不登录时无法加载服务端的数据
+ // password: md5pass, //密码 生成方式：md5(用户名_密码)
+ }).then((res) => {
+ let earth = new YJ.YJEarth("earth");
+ window.Earth1 = earth;
+ YJ.Global.openRightClick(window.Earth1);
+ YJ.Global.openLeftClick(window.Earth1);
+ let view = {
+ "position": {
+ "lng": 102.03643298211526,
+ "lat": 34.393586474501,
+ "alt": 11298179.51993155
+ },
+ "orientation": {
+ "heading": 360,
+ "pitch": -89.94481747201486,
+ "roll": 0
+ }
+ }
+ loadBaseMap(earth.viewer)
+ // YJ.Global.flyTo(earth, view);
+ // YJ.Global.setDefaultView(earth.viewer, view)
+ })
+}
+// 加载底图
+const loadBaseMap = (viewer) => {
+ // 创建瓦片提供器
+ const imageryProvider = new Cesium.UrlTemplateImageryProvider({
+ url: 'https://webst01.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+ // 可选：设置瓦片的格式
+ fileExtension: 'png',
+ // 可选：设置瓦片的范围和级别
+ minimumLevel: 0,
+ maximumLevel: 18,
+ // 可选：设置瓦片的投影（默认为Web Mercator）
+ projection: Cesium.WebMercatorProjection,
+ // 可选：如果瓦片服务需要跨域请求，设置请求头部
+ credit: new Cesium.Credit('卫星图数据来源')
+ });
+ // 添加图层到视图
+ const layer = viewer.imageryLayers.addImageryProvider(imageryProvider);
+}
onMounted(() => {
getInspectionList()
+ createEarth()
if (swiperContent.value && swiperContent.value.children.length > 0) {
swiperItemWidth.value = swiperContent.value.children[0].clientWidth + 20
}
})
+
</script>
<style scoped lang="scss">
diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue
index 7c45599..a76ea00 100644
--- a/src/views/biddingManagemen/appointment/index.vue
+++ b/src/views/biddingManagemen/appointment/index.vue
@@ -10,27 +10,25 @@
@click="isDisabled = false"
class="px-8 py-2.5 transition-all duration-300 font-medium"
v-if="isDisabled"
- v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
+ v-hasPermi="['bidding:biddingUser:add']"
>
点击编辑
</el-button>
</div>
-
<!-- 表单内容区域 -->
<el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="120px" class="p-6 pt30 space-y-6 h75" :disabled="isDisabled">
<!-- 设计负责人 -->
<div class="fonts w60% ma">
<el-form-item label="招投标专员" prop="userId" class="mb-4">
<el-select
- v-model="form.userId"
+ v-model="form.userId" filterable
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>
-
<!-- 提交按钮区域 -->
<div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100" v-if="!isDisabled">
<el-button
@@ -38,7 +36,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:addOrUpdate']"
+ v-hasPermi="['bidding:biddingUser:add']"
>
确认提交
</el-button>
@@ -53,22 +51,14 @@
<script setup name="PersonnelForm" lang="ts">
import { ref, reactive, computed, onMounted, toRefs } from 'vue';
-import { getCurrentInstance } from 'vue';
-import type { ComponentInternalInstance } from 'vue';
import { useUserStoreHook } from '@/store/modules/user';
import { ElMessage, ElLoading } from 'element-plus';
import { biddingGetUser, AddbiddingUser, biddingUserList } from '@/api/bidding/appointment';
-
-// 获取当前实例
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
-// 专业字典数据
-const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
const isDisabled = ref(false);
-
// 表单数据
const form = reactive({
id: null,
diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index d08d055..98c5781 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -5,7 +5,7 @@
<el-form :model="queryForm" :inline="true">
<el-form-item label="版本号" prop="versions">
<el-select v-model="queryForm.versions" placeholder="选择版本号" @change="changeVersions">
- <el-option v-for="item in options" :key="item.id" :label="item.versions" :value="item.id" />
+ <el-option v-for="item in options" :key="item.id" :label="item.versions" :value="item.versions" />
</el-select>
</el-form-item>
<el-form-item label="表名" prop="sheet">
@@ -16,7 +16,7 @@
<el-form-item>
<el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
</el-form-item>
- <el-form-item>
+ <!-- <el-form-item>
<el-upload
ref="uploadRef"
class="upload-demo"
@@ -28,11 +28,11 @@
<el-button type="primary">导入excel</el-button>
</template>
</el-upload>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
</el-form-item>
- <el-form-item>
+ <!-- <el-form-item>
<el-button
type="primary"
v-if="versionObj.status == 'draft' || versionObj.status == 'back'"
@@ -51,26 +51,20 @@
v-if="versionObj.status != 'draft'"
>查看流程</el-button
>
- </el-form-item>
+ </el-form-item> -->
</el-form>
</el-card>
</transition>
<el-card shadow="never" class="mb8">
<el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
<el-table-column prop="num" label="编号" />
- <el-table-column prop="name" label="工程或费用名称" />
- <el-table-column prop="unit" label="单位" />
- <el-table-column prop="quantity" label="数量" />
+ <el-table-column prop="name" label="工程或费用名称" />
+ <el-table-column prop="unit" label="单位" align="center" />
+ <el-table-column prop="quantity" label="数量" align="center" />
+ <el-table-column prop="specification" label="规格" align="center" />
<el-table-column prop="remark" label="单价" align="center">
<template #default="scope">
- <el-input-number
- :model-value="scope.row.unitPrice"
- @change="(val) => (scope.row.unitPrice = val)"
- :precision="2"
- :step="0.1"
- :controls="false"
- v-if="scope.row.quantity && scope.row.quantity != 0"
- />
+ <span>{{ scope.row.unitPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="price" label="总价" align="center">
@@ -78,7 +72,7 @@
{{ scope.row.price }}
</template>
</el-table-column>
- <el-table-column prop="price" label="操作" align="center">
+ <!-- <el-table-column prop="price" label="操作" align="center">
<template #default="scope">
<el-button
type="primary"
@@ -89,7 +83,7 @@
>修改</el-button
>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</el-card>
</div>
@@ -172,7 +166,9 @@ const getTableData = async () => {
loading.value = true;
const params = {
projectId: currentProject.value?.id,
- sheet: queryForm.value.sheet
+ sheet: queryForm.value.sheet,
+ versions: queryForm.value.versions,
+ type: '1'
};
const res = await getTreeLimit(params);
loading.value = false;
@@ -215,8 +211,6 @@ const tableRef = ref<any>();
const toggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
- console.log(isExpandAll.value);
-
tableData.value.forEach((row) => {
tableRef.value.toggleRowExpansion(row, isExpandAll.value);
});
@@ -254,7 +248,7 @@ const handleExport = () => {
projectId: currentProject.value?.id,
sheet: queryForm.value.sheet
},
- `限价一览表${queryForm.value.sheet}.xlsx`
+ `投标成本核算清单${queryForm.value.sheet}.xlsx`
);
};
// 审核
diff --git a/src/views/biddingManagemen/biddingLimit/indexEdit.vue b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
index 450d058..9e268ce 100644
--- a/src/views/biddingManagemen/biddingLimit/indexEdit.vue
+++ b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
@@ -19,13 +19,35 @@
<h3 class="text-lg font-semibold text-gray-800">成本核算清单</h3>
</div>
<div class="p-6">
- <el-form ref="leaveFormRef" disabled :model="form" :rules="rules" label-width="100px" class="space-y-4">
- <div class="grid grid-cols-1 md:grid-cols-2 gap-4" v-for="item in sheets" :key="item">
- <el-form-item label="表格文件">
- <span style="color: #8d8d8d">{{ item }}</span>
- </el-form-item>
+ <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
+ <div class="grid grid-cols-1 gap-4">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="版本号" prop="formNo">
+ <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
+ </el-form-item>
+ <el-form-item label="表名" prop="sheet">
+ <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+ <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
</div>
</el-form>
+ <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" default-expand-all border>
+ <el-table-column prop="num" label="编号" />
+ <el-table-column prop="name" label="名称" />
+ <el-table-column prop="specification" label="规格" />
+ <el-table-column prop="unit" label="单位" />
+ <el-table-column prop="quantity" label="数量" />
+ <el-table-column prop="unitPrice" label="单价" align="center" />
+ <el-table-column prop="price" label="总价" align="center">
+ <template #default="scope">
+ {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ </template>
+ </el-table-column>
+ </el-table>
</div>
</el-card>
<!-- 提交组件 -->
@@ -68,9 +90,9 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import ApprovalButton from '@/components/Process/approvalButton.vue';
import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
import { useUserStoreHook } from '@/store/modules/user';
-import { getVersionDetail } from '@/api/bidding/biddingLimit';
+import { getVersionDetail, sheetList, getTreeLimit } from '@/api/bidding/biddingLimit';
// 获取用户 store
const userStore = useUserStoreHook();
@@ -82,8 +104,8 @@ const loading = ref(true);
const routeParams = ref<Record<string, any>>({});
const flowCodeOptions = [
{
- value: currentProject.value?.id + '_costAccounting',
- label: '成本核算清单审批'
+ value: currentProject.value?.id + '_biddingLimitList',
+ label: '投标一览审核'
}
];
@@ -99,7 +121,6 @@ const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
//按钮组件
const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
-const sheets = ref([]);
const versions = ref({});
const leaveFormRef = ref<ElFormInstance>();
const dialog = reactive({
@@ -124,7 +145,10 @@ const initFormData = {
fileSuffix: undefined,
originalName: undefined,
remark: undefined,
- fileId: undefined
+ fileId: undefined,
+ status: undefined,
+ versions: undefined,
+ sheet: undefined
};
const data = reactive({
form: { ...initFormData },
@@ -150,12 +174,49 @@ const getInfo = () => {
buttonLoading.value = false;
nextTick(async () => {
const res = await getVersionDetail(routeParams.value.id);
+ console.log(res);
Object.assign(form.value, res.data);
loading.value = false;
buttonLoading.value = false;
+ getSheetName();
});
};
+const sheets = ref([]);
+//获取表名
+const getSheetName = async () => {
+ try {
+ const params = {
+ projectId: currentProject.value?.id,
+ versions: form.value.versions
+ };
+ const res = await sheetList(params);
+ if (res.code == 200) {
+ sheets.value = res.data;
+ if (res.data.length > 0) {
+ form.value.sheet = res.data[0];
+ }
+ getListTable();
+ }
+ } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+ getListTable();
+};
+const tableData = ref([]);
+//获取列表
+const getListTable = async () => {
+ const res = await getTreeLimit({
+ projectId: currentProject.value?.id,
+ versions: form.value.versions,
+ sheet: form.value.sheet,
+ type: '0'
+ });
+ if (res.code == 200) {
+ tableData.value = res.data;
+ }
+};
/** 提交按钮 */
const submitForm = (status1: string) => {
status.value = status1;
@@ -227,12 +288,10 @@ onMounted(() => {
nextTick(async () => {
reset();
routeParams.value = proxy.$route.query;
- sheets.value = routeParams.value.sheets;
- versions.value = routeParams.value.versions;
- Object.assign(form.value, versions.value);
loading.value = false;
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getInfo();
+ console.log('routeParams.value', routeParams.value);
}
});
});
diff --git a/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue b/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue
new file mode 100644
index 0000000..1e7356c
--- /dev/null
+++ b/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue
@@ -0,0 +1,524 @@
+<template>
+ <div class="p-4 bg-gray-50 min-h-screen">
+ <!-- 卡片容器：控制最大宽度+居中+圆角阴影 -->
+ <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
+ <!-- 卡片头部：项目信息展示区（非表单布局） -->
+ <template #header>
+ <div class="bg-blue-50 px-6 rounded-t-xl" style="padding: 10px 20px">
+ <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息</h3>
+ <h4>{{ currentProject.name }}</h4>
+ <!-- 项目信息部分 -->
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+ <div class="project-info-item">
+ <span>负责人：</span>
+ <span> {{ projectInfo.principal || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>负责人电话：</span>
+ <span> {{ projectInfo.principalPhone || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>项目类型：</span>
+ <span> {{ getDictLabel(project_type, projectInfo.projectType) || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>项目阶段：</span>
+ <span> {{ getDictLabel(project_stage, projectInfo.projectStage) || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>开工时间：</span>
+ <span> {{ projectInfo.onStreamTime || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>经纬度：</span>
+ <span> {{ projectInfo.lng || '-' }}，{{ projectInfo.lat || '-' }}</span>
+ </div>
+ <div class="project-info-item md:col-span-2 lg:col-span-3">
+ <span>项目地址：</span>
+ <span> {{ projectInfo.projectSite || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>计划容量(M)：</span>
+ <span> {{ projectInfo.plan || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>实际容量(M)：</span>
+ <span> {{ projectInfo.actual || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>设计总量(M)：</span>
+ <span> {{ projectInfo.designTotal || '-' }}</span>
+ </div>
+ <div class="project-info-item md:col-span-2 lg:col-span-3">
+ <span>备注：</span>
+ <span> {{ projectInfo.remark || '-' }}</span>
+ </div>
+ </div>
+ </div>
+ <div class="mt-4 mb-6">
+ <el-button @click="isDisabled = false" type="primary" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
+ 点击编辑
+ </el-button>
+ </div>
+ </template>
+ <!-- 中标信息表单区域（保持原有逻辑） -->
+ <el-form
+ :disabled="isDisabled"
+ ref="listOfWinningBidsFormRef"
+ :model="form"
+ :rules="rules"
+ label-width="150px"
+ class="p-6 pt-4"
+ style="background-color: #ffffff"
+ >
+ <el-row :gutter="32">
+ <el-col :span="12">
+ <el-form-item label="中标价(美元)" prop="winningBidOriginal" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model.number="form.winningBidOriginal" type="number" placeholder="请输入中标价" @input="calculateWinningBid" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="汇率" prop="exchangeRate" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model.number="form.exchangeRate" type="number" placeholder="请输入汇率" step="0.0001" @input="calculateWinningBid" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="币种" prop="currency" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.currency" placeholder="请输入币种" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="中标价(人民币)" prop="winningBid" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.winningBid" type="number" placeholder="根据美元中标价和汇率自动计算" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="中标日期" prop="bidWinningDate" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-date-picker
+ clearable
+ v-model="form.bidWinningDate"
+ type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择中标日期"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="投标保证金(人民币)" prop="bidDeposit" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.bidDeposit" type="number" placeholder="请输入投标保证金" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="是否退还" prop="whetherSendBack" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-radio-group v-model="form.whetherSendBack">
+ <el-radio label="是" border>是</el-radio>
+ <el-radio label="否" border>否</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="所属主体" prop="subject" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.subject" placeholder="请输入所属主体" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="建设单位" prop="construction" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.construction" placeholder="请输入建设单位" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="总造价" prop="totalCost" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.totalCost" placeholder="请输入总造价" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="立项申请人" prop="projectApplicant" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="立项部门" prop="projectApplicantDept" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="立项申请日期" prop="projectApplicantTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-date-picker
+ clearable
+ v-model="form.projectApplicantTime"
+ type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择立项申请日期"
+ />
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item label="项目编号" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" />
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="12">
+ <el-form-item label="中标通知书" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <file-upload v-model="form.bidFile" :limit="10" :file-type="['pdf']" :file-size="50" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 操作按钮区域 -->
+ <el-row v-if="!isDisabled" class="mt-8">
+ <el-col :span="24" class="text-center">
+ <el-button
+ :loading="buttonLoading"
+ type="primary"
+ @click="submitForm"
+ v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+ class="rounded-full px-8"
+ size="large"
+ >
+ 确认提交
+ </el-button>
+ <el-button type="default" @click="resetForm" class="ml-6 rounded-full px-8" size="large"> 重置 </el-button>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
+ </div>
+</template>
+
+<script setup name="ListOfWinningBidsForm" lang="ts">
+import { ref, reactive, toRefs, watch, onMounted, onUnmounted, getCurrentInstance, ComponentInternalInstance, computed } from 'vue';
+import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids, getListOfWinningBids } from '@/api/bidding/listOfWinningBids';
+import { ListOfWinningBidsVO, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
+import { useUserStoreHook } from '@/store/modules/user';
+import { ElFormInstance, ElMessage } from 'element-plus';
+import { getProject, updateProject } from '@/api/project/project'; // 补充项目信息更新接口
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { project_type, project_stage } = toRefs<any>(proxy?.useDict('project_type', 'project_stage'));
+
+// 用户状态管理
+const userStore = useUserStoreHook();
+// 当前选中项目（从store获取）
+const currentProject = computed(() => userStore.selectedProject);
+
+// 项目信息（非表单绑定，直接响应式数据）
+const projectInfo = reactive({
+ projectName: undefined,
+ shortName: undefined,
+ pId: undefined,
+ status: undefined,
+ picUrl: undefined,
+ remark: undefined,
+ projectType: undefined,
+ projectCategory: undefined,
+ deletedAt: undefined,
+ projectSite: undefined,
+ principal: undefined,
+ principalPhone: undefined,
+ actual: undefined,
+ lng: undefined,
+ lat: undefined,
+ plan: undefined,
+ onStreamTime: undefined,
+ playCardStart: undefined,
+ playCardEnd: undefined,
+ designTotal: undefined,
+ securityAgreement: undefined,
+ sort: 0,
+ showHidden: undefined,
+ isDelete: undefined
+});
+
+// 表单相关引用
+const listOfWinningBidsFormRef = ref<ElFormInstance>();
+// 加载状态
+const buttonLoading = ref(false);
+// 编辑/查看状态控制
+const isDisabled = ref(false);
+
+// 表单初始数据
+const initFormData: ListOfWinningBidsForm = {
+ id: undefined,
+ projectId: currentProject.value?.id,
+ projectStatus: undefined,
+ projectName: undefined,
+ winningBidOriginal: undefined,
+ exchangeRate: undefined,
+ currency: undefined,
+ subject: undefined,
+ winningBid: undefined,
+ bidWinningDate: undefined,
+ bidDeposit: undefined,
+ whetherSendBack: undefined,
+ construction: undefined,
+ totalCost: undefined,
+ projectApplicant: undefined,
+ projectApplicantDept: undefined,
+ projectApplicantTime: undefined,
+ processStatus: undefined,
+ projectNumbering: undefined
+};
+
+// 表单数据与验证规则
+const data = reactive({
+ form: { ...initFormData } as ListOfWinningBidsForm,
+ rules: {
+ projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+ projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+ winningBidOriginal: [{ required: true, message: '请输入原始中标价', trigger: 'blur' }],
+ exchangeRate: [
+ { required: true, message: '请输入汇率', trigger: 'blur' },
+ { type: 'number', min: 0.001, message: '汇率需大于0', trigger: 'blur' }
+ ],
+ currency: [{ required: true, message: '请输入币种', trigger: 'blur' }],
+ subject: [{ required: true, message: '请输入所属主体', trigger: 'blur' }],
+ winningBid: [{ required: true, message: '请输入中标价', trigger: 'blur' }],
+ bidWinningDate: [{ required: true, message: '请选择中标日期', trigger: 'blur' }],
+ projectNumbering: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+ } as Record<string, any>
+});
+
+// 解构响应式数据
+const { form, rules } = toRefs(data);
+
+/**
+ * 根据字典值获取字典标签（用于项目类型/阶段的文本展示）
+ */
+const getDictLabel = (dictList: any[], value: any) => {
+ if (!dictList || !value) return '';
+ const dictItem = dictList.find((item) => item.value === value);
+ return dictItem ? dictItem.label : '';
+};
+
+/**
+ * 计算人民币中标价
+ */
+const calculateWinningBid = () => {
+ const dollarAmount = Number(form.value.winningBidOriginal);
+ const rate = Number(form.value.exchangeRate);
+
+ if (isNaN(dollarAmount) || isNaN(rate) || dollarAmount <= 0 || rate <= 0) {
+ form.value.winningBid = undefined;
+ return;
+ }
+
+ const result = dollarAmount * rate;
+ form.value.winningBid = Number(result.toFixed(2));
+};
+
+/**
+ * 页面初始化 - 获取已有数据（如存在）
+ */
+const initData = async () => {
+ try {
+ if (currentProject.value?.id) {
+ const res = await listListOfWinningBids({ projectId: currentProject.value.id });
+ if (res.code === 200) {
+ resetForm();
+ if (!res.data) {
+ isDisabled.value = false;
+ return;
+ }
+ Object.assign(form.value, res.data);
+ isDisabled.value = true;
+ }
+ }
+ } catch (error) {
+ console.error('初始化中标数据失败:', error);
+ }
+};
+
+/**
+ * 提交表单（含项目信息+中标信息同步提交）
+ */
+const submitForm = () => {
+ listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ try {
+ // 1. 计算人民币中标价
+ calculateWinningBid();
+ // 2. 绑定项目ID和项目名称（从项目信息同步）
+ form.value.projectId = currentProject.value?.id;
+ form.value.projectName = projectInfo.projectName;
+
+ // 3. 先更新项目信息（若项目信息有修改）
+ if (currentProject.value?.id) {
+ await updateProject({ id: currentProject.value.id, ...projectInfo });
+ }
+
+ // 4. 再提交中标信息（新增/编辑逻辑）
+ const isEdit = !!form.value.id;
+ if (isEdit) {
+ await updateListOfWinningBids(form.value);
+ } else {
+ await addListOfWinningBids(form.value);
+ }
+
+ // 5. 提交成功后切换为查看状态
+ isDisabled.value = true;
+ ElMessage.success(isEdit ? '编辑成功' : '提交成功');
+ } catch (error) {
+ ElMessage.error('提交失败，请重试');
+ console.error('提交表单失败:', error);
+ } finally {
+ buttonLoading.value = false;
+ }
+ }
+ });
+};
+
+/**
+ * 获取项目详细信息
+ */
+const getProjectDetail = async () => {
+ try {
+ if (currentProject.value?.id) {
+ const res = await getProject(currentProject.value.id);
+ Object.assign(projectInfo, res.data);
+ }
+ } catch (error) {
+ console.error('获取项目详情失败:', error);
+ ElMessage.error('获取项目信息失败');
+ }
+};
+
+/**
+ * 重置表单（含项目信息重置）
+ */
+const resetForm = () => {
+ // 重置中标表单
+ form.value = { ...initFormData, projectId: currentProject.value?.id };
+ listOfWinningBidsFormRef.value?.resetFields();
+
+ // 重置项目信息（恢复为当前项目的原始数据）
+ getProjectDetail();
+};
+
+/**
+ * 监听项目ID变化 - 重新初始化数据
+ */
+const projectIdWatcher = watch(
+ () => currentProject.value?.id,
+ (newId) => {
+ if (newId) {
+ form.value.projectId = newId;
+ getProjectDetail();
+ initData();
+ }
+ }
+);
+
+// 页面挂载时初始化
+onMounted(() => {
+ getProjectDetail();
+ initData();
+});
+
+// 页面卸载时清除监听
+onUnmounted(() => {
+ projectIdWatcher();
+});
+</script>
+
+<style scoped>
+/* 全局背景色 */
+.bg-gray-50 {
+ background-color: #f9fafb;
+}
+
+/* 项目信息项布局样式 */
+.project-info-item {
+ transition: all 0.2s ease;
+ padding: 4px 0;
+ color: #696969;
+}
+
+/* 输入框/选择器统一样式 */
+.el-input__wrapper,
+.el-date-editor .el-input__wrapper,
+.el-select__wrapper {
+ border-radius: 6px !important;
+ transition: all 0.2s ease;
+}
+
+/* 输入框hover效果 */
+.el-input__wrapper:hover,
+.el-date-editor .el-input__wrapper:hover,
+.el-select__wrapper:hover {
+ border-color: #409eff;
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+}
+
+/* 卡片头部文字样式 */
+.el-card__header-title {
+ display: flex;
+ align-items: center;
+ height: 100%;
+}
+
+/* 按钮样式优化 */
+.el-button {
+ transition: all 0.2s ease;
+}
+.el-button:hover {
+ transform: translateY(-1px);
+}
+
+/* 表单项样式优化 */
+.el-form-item {
+ transition: all 0.2s ease;
+}
+.el-form-item:hover {
+ border-color: #e6f7ff;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* 响应式网格布局适配 */
+@media (max-width: 767px) {
+ .grid {
+ display: grid;
+ }
+ .grid-cols-1 {
+ grid-template-columns: repeat(1, minmax(0, 1fr));
+ }
+}
+
+@media (min-width: 768px) and (max-width: 1023px) {
+ .md\:grid-cols-2 {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+ .md\:col-span-2 {
+ grid-column: span 2 / span 2;
+ }
+}
+
+@media (min-width: 1024px) {
+ .lg\:grid-cols-3 {
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ }
+ .lg\:col-span-3 {
+ grid-column: span 3 / span 3;
+ }
+}
+
+/* 间距样式 */
+.gap-6 {
+ gap: 1.5rem;
+}
+.mb-1 {
+ margin-bottom: 0.25rem;
+}
+.mb-6 {
+ margin-bottom: 1.5rem;
+}
+.mt-4 {
+ margin-top: 1rem;
+}
+.mt-6 {
+ margin-top: 1.5rem;
+}
+.mt-8 {
+ margin-top: 2rem;
+}
+</style>
diff --git a/src/views/biddingManagemen/listOfWinningBids/index copy.vue b/src/views/biddingManagemen/listOfWinningBids/index copy.vue
deleted file mode 100644
index cd2f39a..0000000
--- a/src/views/biddingManagemen/listOfWinningBids/index copy.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
- <div class="p-2">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div v-show="showSearch" class="mb-[10px]">
- <el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
- <el-form-item label="项目名称" prop="projectName">
- <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="建设单位" prop="construction">
- <el-input v-model="queryParams.construction" placeholder="请输入建设单位" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="立项申请人" prop="projectApplicant">
- <el-input v-model="queryParams.projectApplicant" placeholder="请输入立项申请人" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
- <el-button icon="Refresh" @click="resetQuery">重置</el-button>
- </el-form-item>
- </el-form>
- </el-card>
- </div>
- </transition>
- <el-card shadow="never">
- <template #header>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bidding:listOfWinningBids:add']">新增</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- </template>
-
- <el-table v-loading="loading" :data="listOfWinningBidsList" @selection-change="handleSelectionChange">
- <!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column label="序号" align="center" type="index" width="60" />
- <el-table-column label="项目状态" align="center" prop="projectStatus" />
- <el-table-column label="项目名称" align="center" prop="projectName" />
- <el-table-column label="中标价" align="center" prop="winningBidOriginal" />
- <el-table-column label="汇率" align="center" prop="exchangeRate" />
- <el-table-column label="币种" align="center" prop="currency" />
- <el-table-column label="所属主体" align="center" prop="subject" />
- <el-table-column label="中标价" align="center" prop="winningBid" />
- <el-table-column label="中标日期" align="center" prop="bidWinningDate" width="120"> </el-table-column>
- <el-table-column label="投标保证金" align="center" prop="bidDeposit" width="120" />
- <el-table-column label="是否退还" align="center" prop="whetherSendBack" />
- <el-table-column label="建设单位" align="center" prop="construction" />
- <el-table-column label="总造价" align="center" prop="totalCost" />
- <el-table-column label="立项申请人" align="center" prop="projectApplicant" width="120" />
- <el-table-column label="立项部门" align="center" prop="projectApplicantDept" />
- <el-table-column label="立项申请日期" align="center" prop="projectApplicantTime" width="120"> </el-table-column>
- <el-table-column label="流程状态" align="center" prop="processStatus" />
- <el-table-column label="项目编号" align="center" prop="projectNumbering" />
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['bidding:listOfWinningBids:edit']"
- >修改</el-button
- >
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['bidding:listOfWinningBids:remove']">
- 删除</el-button
- >
- </template>
- </el-table-column>
- </el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
- </el-card>
- <!-- 添加或修改中标项目一览对话框 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
- <el-form ref="listOfWinningBidsFormRef" :model="form" :rules="rules" label-width="110px">
- <el-row :gutter="24">
- <el-col :span="12">
- <el-form-item label="项目名称" prop="projectName"> <el-input v-model="form.projectName" placeholder="请输入项目名称" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="中标价" prop="winningBidOriginal">
- <el-input v-model="form.winningBidOriginal" placeholder="请输入中标价" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="汇率" prop="exchangeRate"> <el-input v-model="form.exchangeRate" placeholder="请输入汇率" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="币种" prop="currency"> <el-input v-model="form.currency" placeholder="请输入币种" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="所属主体" prop="subject"> <el-input v-model="form.subject" placeholder="请输入所属主体" /> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="中标价" prop="winningBid"> <el-input v-model="form.winningBid" placeholder="请输入中标价" /> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="中标日期" prop="bidWinningDate">
- <el-date-picker
- clearable
- v-model="form.bidWinningDate"
- type="date"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- placeholder="请选择中标日期"
- >
- </el-date-picker> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="投标保证金" prop="bidDeposit"> <el-input v-model="form.bidDeposit" placeholder="请输入投标保证金" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="是否退还" prop="whetherSendBack">
- <el-input v-model="form.whetherSendBack" placeholder="请输入是否退还" /> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="建设单位" prop="construction"> <el-input v-model="form.construction" placeholder="请输入建设单位" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="总造价" prop="totalCost"> <el-input v-model="form.totalCost" placeholder="请输入总造价" /> </el-form-item
- ></el-col>
- <el-col :span="12">
- <el-form-item label="立项申请人" prop="projectApplicant">
- <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" /> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="立项部门" prop="projectApplicantDept">
- <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" /> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="立项申请日期" prop="projectApplicantTime">
- <el-date-picker
- clearable
- v-model="form.projectApplicantTime"
- type="date"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- placeholder="请选择立项申请日期"
- >
- </el-date-picker> </el-form-item
- ></el-col>
- <el-col :span="12"
- ><el-form-item label="项目编号" prop="projectNumbering">
- <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" /> </el-form-item
- ></el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
- <el-button @click="cancel">取 消</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="ListOfWinningBids" lang="ts">
-import {
- listListOfWinningBids,
- getListOfWinningBids,
- delListOfWinningBids,
- addListOfWinningBids,
- updateListOfWinningBids
-} from '@/api/bidding/listOfWinningBids';
-import { ListOfWinningBidsVO, ListOfWinningBidsQuery, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
-import { useUserStoreHook } from '@/store/modules/user';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 获取用户 store
-const userStore = useUserStoreHook();
-// 从 store 中获取当前选中的项目
-const currentProject = computed(() => userStore.selectedProject);
-const listOfWinningBidsList = ref<ListOfWinningBidsVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const listOfWinningBidsFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
-});
-
-const initFormData: ListOfWinningBidsForm = {
- id: undefined,
- projectId: currentProject.value?.id,
- projectStatus: undefined,
- projectName: undefined,
- winningBidOriginal: undefined,
- exchangeRate: undefined,
- currency: undefined,
- subject: undefined,
- winningBid: undefined,
- bidWinningDate: undefined,
- bidDeposit: undefined,
- whetherSendBack: undefined,
- construction: undefined,
- totalCost: undefined,
- projectApplicant: undefined,
- projectApplicantDept: undefined,
- projectApplicantTime: undefined,
- processStatus: undefined,
- projectNumbering: undefined
-};
-const data = reactive<PageData<ListOfWinningBidsForm, ListOfWinningBidsQuery>>({
- form: { ...initFormData },
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- projectId: currentProject.value?.id,
- projectStatus: undefined,
- projectName: undefined,
- winningBidOriginal: undefined,
- exchangeRate: undefined,
- currency: undefined,
- subject: undefined,
- winningBid: undefined,
- bidWinningDate: undefined,
- bidDeposit: undefined,
- whetherSendBack: undefined,
- construction: undefined,
- totalCost: undefined,
- projectApplicant: undefined,
- projectApplicantDept: undefined,
- projectApplicantTime: undefined,
- processStatus: undefined,
- projectNumbering: undefined,
- params: {}
- },
- rules: {
- id: [{ required: true, message: '不能为空', trigger: 'blur' }],
- projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }]
- }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询中标项目一览列表 */
-const getList = async () => {
- loading.value = true;
- const res = await listListOfWinningBids(queryParams.value);
- listOfWinningBidsList.value = res.rows;
- total.value = res.total;
- loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
- reset();
- dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
- form.value = { ...initFormData };
- listOfWinningBidsFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
- queryFormRef.value?.resetFields();
- handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: ListOfWinningBidsVO[]) => {
- ids.value = selection.map((item) => item.id);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
- reset();
- dialog.visible = true;
- dialog.title = '添加中标项目一览';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: ListOfWinningBidsVO) => {
- reset();
- const _id = row?.id || ids.value[0];
- const res = await getListOfWinningBids(_id);
- Object.assign(form.value, res.data);
- dialog.visible = true;
- dialog.title = '修改中标项目一览';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
- listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
- if (valid) {
- buttonLoading.value = true;
- if (form.value.id) {
- await updateListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
- } else {
- await addListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
- }
- proxy?.$modal.msgSuccess('操作成功');
- dialog.visible = false;
- await getList();
- }
- });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ListOfWinningBidsVO) => {
- const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('是否确认删除中标项目一览编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
- await delListOfWinningBids(_ids);
- proxy?.$modal.msgSuccess('删除成功');
- await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
- proxy?.download(
- 'bidding/listOfWinningBids/export',
- {
- ...queryParams.value
- },
- `listOfWinningBids_${new Date().getTime()}.xlsx`
- );
-};
-//监听项目id刷新数据
-const listeningProject = watch(
- () => currentProject.value?.id,
- (nid, oid) => {
- getList();
- }
-);
-
-onUnmounted(() => {
- listeningProject();
-});
-onMounted(() => {
- getList();
-});
-</script>
diff --git a/src/views/biddingManagemen/listOfWinningBids/index.vue b/src/views/biddingManagemen/listOfWinningBids/index.vue
index f2c7700..47210c6 100644
--- a/src/views/biddingManagemen/listOfWinningBids/index.vue
+++ b/src/views/biddingManagemen/listOfWinningBids/index.vue
@@ -2,18 +2,67 @@
<div class="p-4 bg-gray-50 min-h-screen">
<!-- 卡片容器：控制最大宽度+居中+圆角阴影 -->
<el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
- <!-- 卡片头部：独立背景色+内边距+圆角 -->
+ <!-- 卡片头部：项目信息展示区 -->
<template #header>
- <div class="bg-blue-50 px-6 py-4 rounded-t-xl mb-0">
- <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息填写</h3>
- <span>{{ currentProject.name }}</span>
- <div style="margin-top: 10px">
- <el-button @click="isDisabled = false" type="primary" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
- 点击编辑
- </el-button>
+ <div class="bg-blue-50 px-6 rounded-t-xl" style="padding: 10px 20px">
+ <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息</h3>
+ <h4>{{ currentProject.name }}</h4>
+ <!-- 项目信息部分 -->
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+ <div class="project-info-item">
+ <span>负责人：</span>
+ <span> {{ projectInfo.principal || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>负责人电话：</span>
+ <span> {{ projectInfo.principalPhone || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>项目类型：</span>
+ <span> {{ getDictLabel(project_type, projectInfo.projectType) || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>项目阶段：</span>
+ <span> {{ getDictLabel(project_stage, projectInfo.projectStage) || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>开工时间：</span>
+ <span> {{ projectInfo.onStreamTime || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>经纬度：</span>
+ <span> {{ projectInfo.lng || '-' }}，{{ projectInfo.lat || '-' }}</span>
+ </div>
+ <div class="project-info-item md:col-span-2 lg:col-span-3">
+ <span>项目地址：</span>
+ <span> {{ projectInfo.projectSite || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>计划容量(M)：</span>
+ <span> {{ projectInfo.plan || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>实际容量(M)：</span>
+ <span> {{ projectInfo.actual || '-' }}</span>
+ </div>
+ <div class="project-info-item">
+ <span>设计总量(M)：</span>
+ <span> {{ projectInfo.designTotal || '-' }}</span>
+ </div>
+ <div class="project-info-item md:col-span-2 lg:col-span-3">
+ <span>备注：</span>
+ <span> {{ projectInfo.remark || '-' }}</span>
+ </div>
</div>
</div>
+ <!-- <div class="mt-4 mb-6">
+ <el-button @click="isDisabled = false" type="primary"
+ class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
+ 点击编辑
+ </el-button>
+ </div> -->
</template>
+ <!-- 中标信息表单区域 -->
<el-form
:disabled="isDisabled"
ref="listOfWinningBidsFormRef"
@@ -24,103 +73,88 @@
style="background-color: #ffffff"
>
<el-row :gutter="32">
+ <!-- 招标代理机构 -->
<el-col :span="12">
- <el-form-item label="中标价(美元)" prop="winningBidOriginal" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model.number="form.winningBidOriginal" type="number" placeholder="请输入中标价" @input="calculateWinningBid" />
+ <el-form-item label="招标代理机构" prop="biddingAgency" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.biddingAgency" placeholder="请输入招标代理机构" />
</el-form-item>
</el-col>
+ <!-- 招标人 -->
<el-col :span="12">
- <el-form-item label="汇率" prop="exchangeRate" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model.number="form.exchangeRate" type="number" placeholder="请输入汇率" step="0.0001" @input="calculateWinningBid" />
+ <el-form-item label="招标人" prop="tenderer" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.tenderer" placeholder="请输入招标人" />
</el-form-item>
</el-col>
+ <!-- 投标截止时间 -->
<el-col :span="12">
- <el-form-item label="币种" prop="currency" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.currency" placeholder="请输入币种" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="中标价(人民币)" prop="winningBid" class="rounded-lg border border-gray-100 p-1 mb-5">
- <!-- 人民币输入框：添加readonly禁止手动修改 -->
- <el-input v-model="form.winningBid" type="number" placeholder="根据美元中标价和汇率自动计算" readonly />
- </el-form-item>
- </el-col>
- <!-- 其他表单项保持不变 -->
- <el-col :span="12">
- <el-form-item label="中标日期" prop="bidWinningDate" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-form-item label="投标截止时间" prop="biddingDeadline" class="rounded-lg border border-gray-100 p-1 mb-5">
<el-date-picker
- clearable
- v-model="form.bidWinningDate"
- type="date"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- placeholder="请选择中标日期"
+ v-model="form.biddingDeadline"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="请选择投标截止时间"
/>
</el-form-item>
</el-col>
+ <!-- 开标时间 -->
<el-col :span="12">
- <el-form-item label="投标保证金(人民币)" prop="bidDeposit" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.bidDeposit" type="number" placeholder="请输入投标保证金" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="是否退还" prop="whetherSendBack" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-radio-group v-model="form.whetherSendBack">
- <el-radio label="是" border>是</el-radio>
- <el-radio label="否" border>否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="所属主体" prop="subject" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.subject" placeholder="请输入所属主体" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="建设单位" prop="construction" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.construction" placeholder="请输入建设单位" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="总造价" prop="totalCost" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.totalCost" placeholder="请输入总造价" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="立项申请人" prop="projectApplicant" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="立项部门" prop="projectApplicantDept" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="立项申请日期" prop="projectApplicantTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-form-item label="开标时间" prop="bidopeningTime" class="rounded-lg border border-gray-100 p-1 mb-5">
<el-date-picker
- clearable
- v-model="form.projectApplicantTime"
- type="date"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- placeholder="请选择立项申请日期"
+ v-model="form.bidopeningTime"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="请选择开标时间"
/>
</el-form-item>
</el-col>
+
+ <!-- 建设地点 -->
<el-col :span="12">
- <el-form-item label="项目编号" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" />
+ <el-form-item label="建设地点" prop="constructionsite" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.constructionsite" placeholder="请输入建设地点" />
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
- <el-form-item label="项目状态" prop="projectStatus" class="rounded-lg border border-gray-100 p-1 mb-5">
- <el-input v-model="form.projectStatus" placeholder="请输入项目状态(如：进行中/已完成)" />
+ <!-- 计划工期 -->
+ <el-col :span="12">
+ <el-form-item label="计划工期" prop="planDuration" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.planDuration" placeholder="请输入计划工期（如：180天）" />
</el-form-item>
- </el-col> -->
+ </el-col>
+ <!-- 答疑截止时间 -->
+ <el-col :span="12">
+ <el-form-item label="答疑截止时间" prop="answeringDeadlineTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-date-picker
+ v-model="form.answeringDeadlineTime"
+ type="datetime"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="请选择答疑截止时间"
+ />
+ </el-form-item>
+ </el-col>
+ <!-- 澄清截止时间 -->
+ <el-col :span="12">
+ <el-form-item label="澄清截止时间" prop="clarifyDeadlineTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-date-picker
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss "
+ v-model="form.clarifyDeadlineTime"
+ type="datetime"
+ placeholder="请选择澄清截止时间"
+ />
+ </el-form-item>
+ </el-col>
+ <!-- 项目概况 -->
+ <el-col :span="24">
+ <el-form-item label="项目概况" prop="projectOverview" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.projectOverview" type="textarea" placeholder="请输入项目概况" />
+ </el-form-item>
+ </el-col>
</el-row>
<!-- 操作按钮区域 -->
- <el-row v-if="!isDisabled" class="mt-8">
+ <el-row v-if="!form.id" class="mt-4">
<el-col :span="24" class="text-center">
<el-button
:loading="buttonLoading"
@@ -136,210 +170,406 @@
</el-col>
</el-row>
</el-form>
+ <div style="margin-top: 20px" v-if="form.id">
+ <span style="color: rgb(38 153 255); display: inline-block; margin-left: 40px; font-weight: 700">是否中标配置</span>
+ <el-form
+ ref="listOfWinningBidsFormRef"
+ :disabled="iswhetherBid"
+ :model="form"
+ :rules="rules"
+ label-width="150px"
+ class="p-6 pt-4"
+ style="background-color: #ffffff"
+ >
+ <el-row>
+ <!-- 是否中标（必填） -->
+ <el-col :span="12">
+ <el-form-item label="是否中标" prop="whetherBid" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-radio-group v-model="form.whetherBid">
+ <el-radio label="0" border>中标</el-radio>
+ <el-radio label="1" border>未中标</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <!-- 中标价（必填，仅中标时显示） -->
+ <el-col :span="12" v-if="form.whetherBid == '0'">
+ <el-form-item label="中标价(人民币)" prop="bidPrice" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-model="form.bidPrice" type="number" placeholder="请输入中标价" />
+ </el-form-item>
+ </el-col>
+ <!-- 中标通知书（必填，仅中标时显示） -->
+ <!-- <el-col :span="12" v-if="form.whetherBid == '0'">
+ <el-form-item label="中标通知书" prop="bidFileId" class="rounded-lg border border-gray-100 p-1 mb-5">
+ <el-input v-if="form.bidFileName" v-model="form.bidFileName" disabled placeholder="请输入中标通知书" />
+ <file-upload v-else v-model="form.bidFileId" :limit="1" :file-type="['pdf']" :file-size="50" />
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <!-- 操作按钮区域 -->
+ <el-row class="mt-4" v-if="!iswhetherBid && form.whetherBid == '0'">
+ <el-col :span="24" class="text-center">
+ <el-button
+ :loading="buttonLoading1"
+ type="primary"
+ @click="submitForm"
+ v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+ class="rounded-full px-8"
+ size="large"
+ >
+ 中标
+ </el-button>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
</el-card>
</div>
</template>
<script setup name="ListOfWinningBidsForm" lang="ts">
import { ref, reactive, toRefs, watch, onMounted, onUnmounted, getCurrentInstance, ComponentInternalInstance, computed } from 'vue';
-import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids, getListOfWinningBids } from '@/api/bidding/listOfWinningBids';
-import { ListOfWinningBidsVO, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
+import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids } from '@/api/bidding/listOfWinningBids';
+import { ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
import { useUserStoreHook } from '@/store/modules/user';
import { ElFormInstance, ElMessage } from 'element-plus';
-
-// 获取组件实例
+import { getProject, updateProject } from '@/api/project/project';
+import { globalHeaders } from '@/utils/request';
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
+import { genFileId } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 用户状态管理
+const { project_type, project_stage } = toRefs<any>(proxy?.useDict('project_type', 'project_stage'));
+const headers = ref(globalHeaders());
+const fileList = ref([]);
+// 用户状态管理与当前项目
const userStore = useUserStoreHook();
-// 当前选中项目（从store获取）
+const iswhetherBid = ref(false); // 是否中标
const currentProject = computed(() => userStore.selectedProject);
+// 项目信息（仅展示，非表单编辑）
+const projectInfo = reactive({
+ principal: undefined,
+ principalPhone: undefined,
+ projectType: undefined,
+ projectStage: undefined,
+ onStreamTime: undefined,
+ lng: undefined,
+ lat: undefined,
+ projectSite: undefined,
+ plan: undefined,
+ actual: undefined,
+ designTotal: undefined,
+ remark: undefined,
+ projectName: undefined
+});
-// 表单相关引用
+// 表单核心变量
const listOfWinningBidsFormRef = ref<ElFormInstance>();
-// 加载状态
const buttonLoading = ref(false);
+const buttonLoading1 = ref(false);
const isDisabled = ref(false);
-// 表单初始数据
-const initFormData: ListOfWinningBidsForm = {
+const fileObj = ref({
+ bidFile: undefined,
+ bidFileName: undefined
+});
+// 表单初始数据（新增招标相关参数）
+const initFormData = {
id: undefined,
projectId: currentProject.value?.id,
- projectStatus: undefined,
- projectName: undefined,
- winningBidOriginal: undefined,
- exchangeRate: undefined,
- currency: undefined,
- subject: undefined,
- winningBid: undefined,
- bidWinningDate: undefined,
- bidDeposit: undefined,
- whetherSendBack: undefined,
- construction: undefined,
- totalCost: undefined,
- projectApplicant: undefined,
- projectApplicantDept: undefined,
- projectApplicantTime: undefined,
- processStatus: undefined,
- projectNumbering: undefined
+ whetherBid: '1', // 是否中标：0=中标，1=未中标
+ bidPrice: undefined, // 中标价（人民币）
+ bidFileId: undefined, // 中标通知书
+ biddingAgency: undefined, //招标代理机构
+ tenderer: undefined, //招标人
+ biddingDeadline: undefined, //投标截止时间
+ bidopeningTime: undefined, //开标时间
+ projectOverview: undefined, //项目概况
+ constructionsite: undefined, //建设地点
+ planDuration: undefined, //计划工期
+ answeringDeadlineTime: undefined, //答疑截止时间
+ clarifyDeadlineTime: undefined //澄清截止时间
};
-// 表单数据与验证规则
+// 表单数据与验证规则（核心：是否中标/中标价/中标通知书均设为必填，新增参数添加基础验证）
const data = reactive({
form: { ...initFormData } as ListOfWinningBidsForm,
rules: {
- projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
- projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
- winningBidOriginal: [{ required: true, message: '请输入原始中标价', trigger: 'blur' }],
- exchangeRate: [
- { required: true, message: '请输入汇率', trigger: 'blur' },
- { type: 'number', min: 0.001, message: '汇率需大于0', trigger: 'blur' }
+ // 是否中标：必填
+ whetherBid: [{ required: true, message: '请选择是否中标', trigger: 'change' }],
+ // 中标价：仅中标时必填，且为正数
+ bidPrice: [
+ {
+ required: true,
+ message: '请输入中标价',
+ trigger: 'blur',
+ validator: (rule: any, value: any, callback: any) => {
+ if (form.value.whetherBid === '0') {
+ if (!value && value !== 0) {
+ return callback(new Error('请输入中标价'));
+ }
+ if (Number(value) <= 0) {
+ return callback(new Error('中标价需大于0'));
+ }
+ }
+ callback();
+ }
+ }
],
- currency: [{ required: true, message: '请输入币种', trigger: 'blur' }],
- subject: [{ required: true, message: '请输入所属主体', trigger: 'blur' }],
- winningBid: [{ required: true, message: '请输入中标价', trigger: 'blur' }],
- bidWinningDate: [{ required: true, message: '请选择中标日期', trigger: 'blur' }],
- projectNumbering: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+ // 中标通知书：仅中标时必填
+ bidFileId: [
+ {
+ required: true,
+ message: '请上传中标通知书',
+ trigger: 'change',
+ validator: (rule: any, value: any, callback: any) => {
+ if (form.value.whetherBid === '0' && !value) {
+ return callback(new Error('请上传中标通知书'));
+ }
+ callback();
+ }
+ }
+ ],
+ // 招标代理机构：必填
+ biddingAgency: [{ required: true, message: '请输入招标代理机构', trigger: 'blur' }],
+ // 招标人：必填
+ tenderer: [{ required: true, message: '请输入招标人', trigger: 'blur' }],
+ // 投标截止时间：必填
+ biddingDeadline: [{ required: true, message: '请选择投标截止时间', trigger: 'change' }],
+ // 开标时间：必填
+ bidopeningTime: [{ required: true, message: '请选择开标时间', trigger: 'change' }],
+ // 项目概况：必填
+ projectOverview: [{ required: true, message: '请输入项目概况', trigger: 'blur' }],
+ // 建设地点：必填
+ constructionsite: [{ required: true, message: '请输入建设地点', trigger: 'blur' }],
+ // 计划工期：必填
+ planDuration: [{ required: true, message: '请输入计划工期', trigger: 'blur' }],
+ // 答疑截止时间：必填
+ answeringDeadlineTime: [{ required: true, message: '请选择答疑截止时间', trigger: 'change' }],
+ // 澄清截止时间：必填
+ clarifyDeadlineTime: [{ required: true, message: '请选择澄清截止时间', trigger: 'change' }]
} as Record<string, any>
});
-// 解构响应式数据
const { form, rules } = toRefs(data);
+
/**
- * 计算人民币中标价
- * 显式触发的计算函数，确保执行时机可靠
+ * 字典标签转换（项目类型/阶段）
*/
-const calculateWinningBid = () => {
- // 确保数据类型正确
- const dollarAmount = Number(form.value.winningBidOriginal);
- const rate = Number(form.value.exchangeRate);
-
- // 验证输入有效性
- if (isNaN(dollarAmount) || isNaN(rate) || dollarAmount <= 0 || rate <= 0) {
- form.value.winningBid = undefined;
- return;
- }
-
- // 计算并保留2位小数
- const result = dollarAmount * rate;
- form.value.winningBid = Number(result.toFixed(2));
+const getDictLabel = (dictList: any[], value: any) => {
+ if (!dictList || !value) return '';
+ const dictItem = dictList.find((item) => item.value === value);
+ return dictItem ? dictItem.label : '';
};
/**
- * 页面初始化 - 获取已有数据（如存在）
+ * 初始化中标数据（根据项目ID查询已有记录）
*/
const initData = async () => {
try {
if (currentProject.value?.id) {
const res = await listListOfWinningBids({ projectId: currentProject.value.id });
- if (res.code == 200) {
- console.log(res.data);
+ console.log(res);
+ if (res.code === 200) {
resetForm();
- if (!res.data) {
- isDisabled.value = false;
- return;
- } else {
+ if (res.data) {
+ if (res.data.bidPrice) {
+ iswhetherBid.value = true;
+ } else {
+ iswhetherBid.value = false;
+ }
Object.assign(form.value, res.data);
+ isDisabled.value = true;
+ } else {
+ isDisabled.value = false;
}
- isDisabled.value = true;
}
}
} catch (error) {
- // ElMessage.error('初始化数据失败');
+ console.error('初始化中标数据失败:', error);
+ ElMessage.error('初始化数据失败');
}
};
/**
- * 提交表单
+ * 提交表单（含项目信息更新+中标信息提交）
*/
-const submitForm = () => {
+const submitForm = async () => {
listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
try {
- // 提交前确保计算正确
- calculateWinningBid();
+ // 1. 同步项目ID和名称
form.value.projectId = currentProject.value?.id;
- await addListOfWinningBids(form.value);
+ form.value.projectName = projectInfo.projectName;
+ delete projectInfo.id;
+ await addListOfWinningBids({ ...form.value, ...projectInfo });
+ initData();
+ // 4. 提交成功后切换为查看状态
isDisabled.value = true;
ElMessage.success('提交成功');
- } catch (error) {
- ElMessage.error('提交失败，请重试');
- console.error('提交表单失败:', error);
} finally {
buttonLoading.value = false;
}
}
});
};
+
/**
- * 重置表单
+ * 获取项目详细信息（用于展示）
+ */
+const getProjectDetail = async () => {
+ try {
+ if (currentProject.value?.id) {
+ const res = await getProject(currentProject.value.id);
+
+ Object.assign(projectInfo, res.data);
+ }
+ } catch (error) {
+ console.error('获取项目详情失败:', error);
+ ElMessage.error('获取项目信息失败');
+ }
+};
+
+/**
+ * 重置表单（恢复初始状态+重新拉取项目信息）
*/
const resetForm = () => {
form.value = { ...initFormData, projectId: currentProject.value?.id };
listOfWinningBidsFormRef.value?.resetFields();
+ getProjectDetail();
};
+
/**
- * 监听项目ID变化 - 重新初始化数据
+ * 监听项目ID变化，重新初始化数据
*/
const projectIdWatcher = watch(
() => currentProject.value?.id,
(newId) => {
if (newId) {
form.value.projectId = newId;
+ getProjectDetail();
initData();
}
}
);
-// 页面挂载时初始化
+// 生命周期钩子
onMounted(() => {
+ getProjectDetail();
initData();
});
-// 页面卸载时清除监听
onUnmounted(() => {
projectIdWatcher();
});
</script>
<style scoped>
-/* 全局背景色：柔和灰色，区分页面与卡片 */
+/* 全局背景色 */
.bg-gray-50 {
background-color: #f9fafb;
}
-/* 表单项优化：hover效果+边框过渡，提升交互感 */
-.el-form-item {
+/* 项目信息项样式 */
+.project-info-item {
+ transition: all 0.2s ease;
+ padding: 4px 0;
+ color: #696969;
+}
+
+/* 输入框/选择器统一样式 */
+.el-input__wrapper,
+.el-date-editor .el-input__wrapper,
+.el-select__wrapper {
+ border-radius: 6px !important;
transition: all 0.2s ease;
}
-.el-form-item:hover {
- border-color: #e6f7ff;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+
+/* 输入框hover效果 */
+.el-input__wrapper:hover,
+.el-date-editor .el-input__wrapper:hover,
+.el-select__wrapper:hover {
+ border-color: #409eff;
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
}
-/* 输入框/选择器统一圆角 */
-.el-input__wrapper,
-.el-date-editor .el-input__wrapper {
- border-radius: 6px !important;
-}
-
-/* 卡片头部文字对齐优化 */
+/* 卡片头部文字样式 */
.el-card__header-title {
display: flex;
align-items: center;
height: 100%;
}
-/* 按钮间距与过渡效果 */
+/* 按钮样式优化 */
.el-button {
transition: all 0.2s ease;
}
+
.el-button:hover {
transform: translateY(-1px);
}
-/* 只读输入框样式优化（区分可编辑状态） */
-.el-input--readonly .el-input__wrapper {
- background-color: #f9fafb;
- cursor: not-allowed;
+/* 表单项样式优化 */
+.el-form-item {
+ transition: all 0.2s ease;
+}
+
+.el-form-item:hover {
+ border-color: #e6f7ff;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* 响应式网格布局适配 */
+@media (max-width: 767px) {
+ .grid {
+ display: grid;
+ }
+
+ .grid-cols-1 {
+ grid-template-columns: repeat(1, minmax(0, 1fr));
+ }
+}
+
+@media (min-width: 768px) and (max-width: 1023px) {
+ .md\:grid-cols-2 {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+
+ .md\:col-span-2 {
+ grid-column: span 2 / span 2;
+ }
+}
+
+@media (min-width: 1024px) {
+ .lg\:grid-cols-3 {
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ }
+
+ .lg\:col-span-3 {
+ grid-column: span 3 / span 3;
+ }
+}
+
+/* 间距样式 */
+.gap-6 {
+ gap: 1.5rem;
+}
+
+.mb-5 {
+ margin-bottom: 1.25rem;
+}
+
+.mb-6 {
+ margin-bottom: 1.5rem;
+}
+
+.mt-4 {
+ margin-top: 1rem;
+}
+
+.mt-6 {
+ margin-top: 1.5rem;
+}
+
+.mt-8 {
+ margin-top: 2rem;
}
</style>
diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue
new file mode 100644
index 0000000..34bdbb1
--- /dev/null
+++ b/src/views/contract/bidCost/index.vue
@@ -0,0 +1,335 @@
+<template>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <el-card shadow="always">
+ <el-form :model="queryForm" :inline="true">
+ <el-form-item label="版本号" prop="versions">
+ <el-select v-model="queryForm.versions" placeholder="选择版本号" @change="changeVersions">
+ <el-option v-for="item in options" :key="item.id" :label="item.versions" :value="item.versions" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="表名" prop="sheet">
+ <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
+ <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-upload
+ ref="uploadRef"
+ class="upload-demo"
+ :http-request="importExcel"
+ :show-file-list="false"
+ v-hasPermi="['bidding:biddingLimitList:importExcelFile']"
+ >
+ <template #trigger>
+ <el-button type="primary">导入excel</el-button>
+ </template>
+ </el-upload>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ v-if="versionObj.status == 'draft'"
+ icon="Edit"
+ @click="handleAudit"
+ v-hasPermi="['bidding:biddingLimitList:getVersionDetail']"
+ >审核</el-button
+ >
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="warning"
+ icon="view"
+ @click="handleViewInfo"
+ v-hasPermi="['bidding:biddingLimitList:getVersionDetail']"
+ v-if="versionObj.status && versionObj.status != 'draft'"
+ >查看流程</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </transition>
+ <el-card shadow="never" class="mb8">
+ <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
+ <el-table-column prop="num" label="编号" />
+ <el-table-column prop="name" label="工程或费用名称" />
+ <el-table-column prop="unit" label="单位" align="center" />
+ <el-table-column prop="specification" label="规格" align="center"/>
+ <el-table-column prop="quantity" label="数量" align="center">
+ <template #default="scope">
+ {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" label="单价" align="center">
+ <template #default="scope">
+ <el-input-number
+ :disabled="versionObj.status != 'draft'"
+ :model-value="scope.row.unitPrice"
+ @change="
+ (val) => {
+ scope.row.unitPrice = val;
+ changePrice(scope.row);
+ }
+ "
+ :precision="2"
+ :step="0.1"
+ :controls="false"
+ v-if="scope.row.quantity && scope.row.quantity != 0"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column prop="price" label="总价" align="center">
+ <template #default="scope">
+ {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="operate" label="操作" align="center">
+ <template #default="scope">
+ <el-button
+ type="primary"
+ size="small"
+ :disabled="versionObj.status != 'draft'"
+ @click="handleSave(scope.row, 'all')"
+ v-if="scope.row.quantity && scope.row.quantity != 0"
+ v-hasPermi="['bidding:biddingLimitList:edit']"
+ >确定</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ </div>
+</template>
+
+<script setup lang="ts">
+import { useUserStoreHook } from '@/store/modules/user';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList, obtainAllVersionNumbers } from '@/api/bidding/biddingLimit';
+const { proxy } = getCurrentInstance() as any;
+
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const queryForm = ref({
+ versions: '',
+ sheet: ''
+});
+const loading = ref(false);
+const options = ref<any[]>([]);
+const sheets = ref<any[]>([]);
+const tableData = ref<any[]>([]);
+const isExpandAll = ref(true);
+const versionObj: any = ref({});
+const versionMap = new Map();
+//获取版本号
+const getVersionNums = async () => {
+ try {
+ const params = {
+ projectId: currentProject.value?.id,
+ pageSize: 1000,
+ pageNum: 1
+ };
+ const res = await obtainAllVersionNumbers(params);
+ if (res.code == 200) {
+ options.value = res.data;
+ if (res.data.length > 0) {
+ res.data.forEach((item: any) => {
+ versionMap.set(item.versions, item);
+ });
+ queryForm.value.versions = res.data[0].versions;
+ versionObj.value = res.data[0];
+ getSheetName();
+ } else {
+ queryForm.value.versions = '';
+ versionObj.value = {};
+ }
+ }
+ } catch (error) {
+ console.log(error);
+ }
+};
+//选择版本号
+const changeVersions = (val) => {
+ getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+ getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+ const params = {
+ projectId: currentProject.value?.id,
+ versions: queryForm.value.versions
+ };
+ const res = await sheetList(params);
+ if (res.code == 200) {
+ sheets.value = res.data;
+ if (res.data.length > 0) {
+ queryForm.value.sheet = res.data[0];
+ } else {
+ queryForm.value.sheet = '';
+ }
+ getTableData();
+ }
+};
+//获取表格
+const getTableData = async () => {
+ loading.value = true;
+ const params = {
+ projectId: currentProject.value?.id,
+ sheet: queryForm.value.sheet,
+ versions: queryForm.value.versions,
+ type: '0'
+ };
+ const res = await getTreeLimit(params);
+ loading.value = false;
+ if (res.code == 200) {
+ if (res.data && res.data.length > 0) {
+ tableData.value = [res.data[0]];
+ } else {
+ tableData.value = [];
+ }
+ }
+};
+const modifyPrice = new Map();
+
+const changePrice = (row: any) => {
+ modifyPrice.set(row.id, row);
+ // if (!row.unitPrice) {
+ // modifyPrice.delete(row.id);
+ // }
+};
+//修改单价 biddingLimitListUpdate
+const handleSave = (row?: any, type?: any) => {
+ try {
+ if (type == 'single') {
+ loading.value = true;
+ const list = [{ ...row }];
+ biddingLimitListUpdate(list).then((res) => {
+ if (res.code == 200) {
+ ElMessage({
+ message: '修改成功',
+ type: 'success'
+ });
+ getTableData();
+ }
+ });
+ }
+ if (type == 'all') {
+ loading.value = true;
+ const list = [];
+ modifyPrice.forEach((item) => {
+ list.push({ ...item });
+ });
+ biddingLimitListUpdate(list).then((res) => {
+ if (res.code == 200) {
+ ElMessage({
+ message: '修改成功',
+ type: 'success'
+ });
+ getTableData();
+ }
+ });
+ }
+ } catch (error) {
+ ElMessage({
+ message: '修改失败',
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+};
+const tableRef = ref<any>();
+
+const toggleExpandAll = () => {
+ isExpandAll.value = !isExpandAll.value;
+ console.log(isExpandAll.value);
+
+ tableData.value.forEach((row) => {
+ tableRef.value.toggleRowExpansion(row, isExpandAll.value);
+ });
+};
+//导入
+const importExcel = (options: any): any => {
+ let formData = new FormData();
+ formData.append('file', options.file);
+ loading.value = true;
+ BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
+ .then((res) => {
+ const { code } = res;
+ if (code == 200) {
+ proxy.$modal.msgSuccess(res.msg || '导入成功');
+ getTableData();
+ }
+ })
+ .catch((err) => {})
+ .finally(() => {
+ loading.value = false;
+ });
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+ () => currentProject.value?.id,
+ (nid, oid) => {
+ getVersionNums();
+ // getSheetName();
+ }
+);
+const handleExport = () => {
+ proxy?.download(
+ '/bidding/biddingLimitList/export',
+ {
+ projectId: currentProject.value?.id,
+ sheet: queryForm.value.sheet
+ },
+ `投标成本核算${queryForm.value.sheet}.xlsx`
+ );
+};
+// 审核
+const handleAudit = () => {
+ proxy.$tab.closePage(proxy.$route);
+ let id = versionMap.get(queryForm.value.versions).id;
+ proxy.$router.push({
+ path: `/approval/biddingLimit/indexEdit`,
+ query: {
+ id,
+ type: 'update',
+ sheets: sheets.value,
+ versions: versionObj.value
+ }
+ });
+};
+// 查看审核
+const handleViewInfo = () => {
+ proxy.$tab.closePage(proxy.$route);
+ let id = versionMap.get(queryForm.value.versions).id;
+ console.log(versionObj.value);
+
+ proxy.$router.push({
+ path: `/approval/biddingLimit/indexEdit`,
+ query: {
+ id,
+ type: 'view',
+ sheets: sheets.value,
+ versions: versionObj.value
+ }
+ });
+};
+onUnmounted(() => {
+ listeningProject();
+});
+onMounted(() => {
+ getVersionNums();
+ // getSheetName();
+});
+</script>
+
+<style scoped></style>
diff --git a/src/views/contract/bidCost/indexEdit.vue b/src/views/contract/bidCost/indexEdit.vue
new file mode 100644
index 0000000..f97c080
--- /dev/null
+++ b/src/views/contract/bidCost/indexEdit.vue
@@ -0,0 +1,343 @@
+<template>
+ <div class="p-4 bg-gray-50">
+ <div class="max-w-4xl mx-auto">
+ <!-- 顶部按钮区域 -->
+ <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+ <approvalButton
+ @submitForm="submitForm"
+ @approvalVerifyOpen="approvalVerifyOpen"
+ @handleApprovalRecord="handleApprovalRecord"
+ :buttonLoading="buttonLoading"
+ :id="form.id"
+ :status="form.status"
+ :pageType="routeParams.type"
+ />
+ </el-card>
+ <!-- 表单区域 -->
+ <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+ <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+ <h3 class="text-lg font-semibold text-gray-800">成本核算清单</h3>
+ </div>
+ <div class="p-6">
+ <el-form ref="leaveFormRef" disabled :model="form" :rules="rules" label-width="100px" class="space-y-4">
+ <div class="grid grid-cols-1 md:grid-cols-2 gap-4" v-for="item in sheets" :key="item">
+ <el-form-item label="表格文件">
+ <span style="color: #8d8d8d">{{ item }}</span>
+ </el-form-item>
+ </div>
+ </el-form>
+ </div>
+ </el-card>
+ <!-- 提交组件 -->
+ <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+ <approvalRecord ref="approvalRecordRef"></approvalRecord>
+ <!-- 流程选择对话框 -->
+ <el-dialog
+ draggable
+ v-model="dialogVisible.visible"
+ :title="dialogVisible.title"
+ :before-close="handleClose"
+ width="500"
+ class="rounded-lg shadow-lg"
+ >
+ <div class="p-4">
+ <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+ <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+ <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ </div>
+ <template #footer>
+ <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+ <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+ >取消</el-button
+ >
+ <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+ >确认</el-button
+ >
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as any;
+import { useUserStoreHook } from '@/store/modules/user';
+import { getVersionDetail } from '@/api/bidding/biddingLimit';
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+ {
+ value: currentProject.value?.id + '_biddingLimitList',
+ label: '成本核算清单审批'
+ }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+ visible: false,
+ title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+const sheets = ref([]);
+const versions = ref({});
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+ visible: false,
+ title: '',
+ isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+ businessId: '',
+ flowCode: '',
+ variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+ id: undefined,
+ projectId: currentProject.value?.id,
+ versionNumber: undefined,
+ fileName: undefined,
+ fileUrl: undefined,
+ fileType: undefined,
+ fileSuffix: undefined,
+ originalName: undefined,
+ remark: undefined,
+ fileId: undefined
+};
+const data = reactive({
+ form: { ...initFormData },
+ rules: {}
+});
+
+const handleClose = () => {
+ dialogVisible.visible = false;
+ flowCode.value = '';
+ buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+ form.value = { ...initFormData };
+ leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+ loading.value = true;
+ buttonLoading.value = false;
+ nextTick(async () => {
+ const res = await getVersionDetail(routeParams.value.id);
+ Object.assign(form.value, res.data);
+ loading.value = false;
+ buttonLoading.value = false;
+ });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+ status.value = status1;
+ buttonLoading.value = true;
+ submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+ handleStartWorkFlow(form.value);
+ dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+ try {
+ submitFormData.value.flowCode = flowCode.value;
+ submitFormData.value.businessId = data.id;
+ //流程变量
+ taskVariables.value = {
+ // leave4/5 使用的流程变量
+ userList: ['1', '3', '4']
+ };
+ submitFormData.value.variables = taskVariables.value;
+ const resp = await startWorkFlow(submitFormData.value);
+ if (submitVerifyRef.value) {
+ buttonLoading.value = false;
+ submitVerifyRef.value.openDialog(resp.data.taskId);
+ }
+ } finally {
+ buttonLoading.value = false;
+ }
+};
+//审批记录
+const handleApprovalRecord = () => {
+ approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+ await proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+ submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+ form.value = data;
+ if (status === 'draft') {
+ buttonLoading.value = false;
+ proxy?.$modal.msgSuccess('暂存成功');
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+ } else {
+ if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+ flowCode.value = flowCodeOptions[0].value;
+ dialogVisible.visible = true;
+ return;
+ }
+ //说明启动过先随意穿个参数
+ if (flowCode.value === '' || flowCode.value === null) {
+ flowCode.value = 'xx';
+ }
+ console.log(data);
+ await handleStartWorkFlow(data);
+ }
+};
+
+onMounted(() => {
+ nextTick(async () => {
+ reset();
+ routeParams.value = proxy.$route.query;
+ sheets.value = routeParams.value.sheets;
+ versions.value = routeParams.value.versions;
+ Object.assign(form.value, versions.value);
+ loading.value = false;
+ if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+ getInfo();
+ }
+ });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+ --primary: #409eff;
+ --primary-light: #66b1ff;
+ --primary-dark: #3a8ee6;
+ --success: #67c23a;
+ --warning: #e6a23c;
+ --danger: #f56c6c;
+ --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+ .el-form-item__label {
+ color: #606266;
+ font-weight: 500;
+ }
+
+ .el-input__inner,
+ .el-select .el-input__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+
+ .el-textarea__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+}
+
+/* 按钮样式优化 */
+.el-button {
+ border-radius: 4px;
+ transition: all 0.2s;
+
+ &.is-primary {
+ background-color: var(--primary);
+ border-color: var(--primary);
+
+ &:hover {
+ background-color: var(--primary-light);
+ border-color: var(--primary-light);
+ }
+
+ &:active {
+ background-color: var(--primary-dark);
+ border-color: var(--primary-dark);
+ }
+ }
+
+ &.is-text {
+ color: var(--primary);
+
+ &:hover {
+ color: var(--primary-light);
+ background-color: rgba(64, 158, 255, 0.05);
+ }
+ }
+}
+
+/* 卡片样式优化 */
+.el-card {
+ transition: all 0.3s ease;
+
+ &:hover {
+ /* transform: translateY(-2px); */
+ }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+ .el-dialog__header {
+ background-color: #f5f7fa;
+ border-bottom: 1px solid #ebeef5;
+ padding: 15px 20px;
+ }
+
+ .el-dialog__title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ .el-dialog__footer {
+ padding: 15px 20px;
+ border-top: 1px solid #ebeef5;
+ }
+}
+</style>
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index e6a10d1..b8e6768 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -25,20 +25,40 @@
</el-table-column>
<el-table-column prop="name" label="名称" />
<el-table-column prop="content" label="内容" />
- <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
+ <el-table-column prop="price" label="限价" />
+ <el-table-column prop="plannedBiddingTime" align="center">
+ <template #header> <span style="color: red">*</span>计划招标时间 </template>
<template #default="scope">
<el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
</template>
</el-table-column>
<el-table-column prop="price" label="操作" align="center">
<template #default="scope">
- <el-button type="warning" size="small" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+ <el-button
+ type="warning"
+ icon="view"
+ size="small"
+ link
+ @click="handleDetail(scope.row)"
+ v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
>详情</el-button
>
- <el-button type="primary" size="small" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
- >修改</el-button
+ <el-button
+ type="primary"
+ icon="edit"
+ size="small"
+ link
+ @click="handleSave(scope.row)"
+ v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+ >确定</el-button
>
- <el-button type="danger" size="small" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+ <el-button
+ type="danger"
+ icon="delete"
+ size="small"
+ link
+ @click="delHandle(scope.row)"
+ v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
>删除</el-button
>
</template>
@@ -76,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>
@@ -98,7 +115,8 @@
<el-table-column prop="name" label="工程或费用名称" />
<el-table-column prop="unit" label="单位" />
<!-- <el-table-column prop="quantity" label="数量" /> -->
- <el-table-column prop="selectNum" label="选择数量" align="center">
+ <el-table-column prop="quantity" label="计划量" align="center" />
+ <el-table-column prop="selectNum" label="设计量" align="center">
<template #default="scope">
<el-input-number
:model-value="scope.row.selectNum"
@@ -112,22 +130,51 @@
:step="1"
:controls="false"
:max="Math.floor(scope.row.quantity)"
- v-if="scope.row.quantity && scope.row.quantity != 0"
+ v-if="scope.row.quantity && scope.row.quantity != 0 && scope.row.unitPrice"
/>
</template>
</el-table-column>
- <el-table-column prop="unitPrice" label="单价" align="center" />
- <!-- <el-table-column prop="price" label="总价" align="center">
+
+ <el-table-column prop="useQuantity" label="剩余量" align="center">
<template #default="scope">
- {{ scope.row.price }}
+ {{
+ (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) ==
+ 0
+ ? ''
+ : (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
+ }}
</template>
- </el-table-column> -->
+ </el-table-column>
+
+ <el-table-column prop="unitPrice" label="单价" align="center" />
+ <el-table-column prop="price" label="总价" align="center">
+ <template #default="scope">
+ {{
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
+ Number(scope.row.unitPrice) ==
+ 0
+ ? ''
+ : (
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
+ Number(scope.row.unitPrice)
+ ).toFixed(2)
+ }}
+ </template>
+ </el-table-column>
</el-table>
</el-col>
</el-row>
<template #footer>
<el-button @click="closeDialog">取消</el-button>
- <el-button type="primary" @click="submitForm(formRef)">确定</el-button>
+ <el-button type="primary" @click="submitForm(formRef)" :loading="loadingBtn">确定</el-button>
</template>
</el-dialog>
<el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
@@ -190,7 +237,7 @@ const rules = ref({
content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
});
const loading = ref(false);
-
+const loadingBtn = ref();
//字典获取数据
const getTabsList = async () => {
const res = await getDicts('subcontracting_type');
@@ -290,18 +337,10 @@ const getVersionNums = async () => {
getSheetName();
} else {
treeForm.value.versions = '';
- ElMessage({
- message: '获取版本号失败',
- type: 'warning'
- });
}
}
} catch (error) {
console.log(error);
- ElMessage({
- message: '获取版本号失败',
- type: 'warning'
- });
}
};
//获取表名
@@ -318,19 +357,11 @@ const getSheetName = async () => {
treeForm.value.sheet = res.data[0];
} else {
treeForm.value.sheet = '';
- ElMessage({
- message: '获取表名失败',
- type: 'warning'
- });
}
getTreeList();
}
} catch (error) {
console.log(error);
- ElMessage({
- message: '获取表名失败',
- type: 'warning'
- });
}
};
const handleSelection = (selection: any) => {
@@ -372,11 +403,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 () => {
@@ -418,6 +450,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
});
return;
}
+ loadingBtn.value = true;
const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
ElMessage.error('存在未填写数量的工程或费用名称，请检查');
@@ -449,6 +482,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
}
} catch (error) {
console.log(error);
+ } finally {
+ loadingBtn.value = false;
}
} else {
console.log('error submit!', fields);
@@ -505,7 +540,7 @@ const handleDetail = (row: any) => {
getDetails(row);
};
const getDetails = (row: any) => {
- getDetailsList({ id: row.id, type: '1' }).then((res) => {
+ getDetailsList({ id: row.id, type: '1', projectId: currentProject.value?.id }).then((res) => {
if (res.code == 200) {
detailData.value = res.data;
}
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 9128276..505add3 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -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"
@@ -35,6 +33,26 @@
<el-form-item>
<el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
</el-form-item>
+
+ <el-form-item>
+ <el-button
+ type="primary"
+ v-if="reviewStatus && reviewStatus == 'draft'"
+ @click="clickApprovalSheet()"
+ v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+ >审核</el-button
+ >
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="warning"
+ icon="view"
+ v-if="reviewStatus && reviewStatus != 'draft'"
+ @click="clickApprovalSheet()"
+ v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+ >查看流程</el-button
+ >
+ </el-form-item>
</el-form>
</el-card>
</transition>
@@ -42,13 +60,25 @@
<el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="工程或费用名称" />
- <el-table-column prop="unit" label="单位" />
- <el-table-column prop="quantity" label="数量" />
- <el-table-column prop="remark" label="单价" align="center">
+ <el-table-column prop="unit" label="单位" align="center" />
+ <el-table-column prop="taxRate" label="税率" align="center" />
+ <el-table-column prop="specification" label="规格" align="center" />
+ <el-table-column prop="quantity" label="数量" align="center">
+ <template #default="scope">
+ {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="unitPrice" label="单价" align="center">
<template #default="scope">
<el-input-number
+ :disabled="reviewStatus != 'draft'"
:model-value="scope.row.unitPrice"
- @change="(val) => (scope.row.unitPrice = val)"
+ @change="
+ (val) => {
+ scope.row.unitPrice = val;
+ changePrice(scope.row);
+ }
+ "
:precision="2"
:step="0.1"
:controls="false"
@@ -56,17 +86,20 @@
/>
</template>
</el-table-column>
- <el-table-column prop="price" label="总价" align="center">
+ <el-table-column prop="price" label="总价" align="center" >
<template #default="scope">
- {{ scope.row.price }}
+ <!-- {{ scope.row.children.length > 0 ? scope.row.children.reduce((sum, child) => sum + child.price, 0) : scope.row.price }} -->
+ {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ <!-- {{ scope.row.price }} -->
</template>
</el-table-column>
- <el-table-column prop="price" label="操作" align="center">
+ <el-table-column prop="operate" label="操作" align="center">
<template #default="scope">
<el-button
type="primary"
size="small"
- @click="handleSave(scope.row)"
+ :disabled="reviewStatus != 'draft'"
+ @click="handleSave(scope.row, 'all')"
v-if="scope.row.quantity && scope.row.quantity != 0"
v-hasPermi="['tender:billofquantitiesLimitList:edit']"
>确定</el-button
@@ -81,7 +114,7 @@
<script setup lang="ts">
import { useUserStoreHook } from '@/store/modules/user';
import { listBillofquantitiesLimitList, obtainAllVersionNumbers, sheetList, updatePrice, importExcelFile } from '@/api/contract/index';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
@@ -93,8 +126,10 @@ const loading = ref(false);
const options = ref<any[]>([]);
const sheets = ref<any[]>([]);
const tableData = ref<any[]>([]);
-const isExpandAll = ref(false);
-
+const isExpandAll = ref(true);
+const reviewStatus = ref('');
+const versionObj: any = ref({});
+const versionMap = new Map();
//获取版本号
const getVersionNums = async () => {
try {
@@ -109,27 +144,27 @@ const getVersionNums = async () => {
if (res.code == 200) {
options.value = res.data;
if (res.data.length > 0) {
+ res.data.forEach((item: any) => {
+ versionMap.set(item.versions, item);
+ });
queryForm.value.versions = res.data[0].versions;
-
+ reviewStatus.value = res.data[0].status;
getSheetName();
} else {
queryForm.value.versions = '';
- ElMessage({
- message: '获取版本号失败',
- type: 'warning'
- });
}
}
} catch (error) {
console.log(error);
- ElMessage({
- message: '获取版本号失败',
- type: 'warning'
- });
}
};
//选择版本号
-const changeVersions = () => {
+const changeVersions = (val) => {
+ options.value.forEach((item) => {
+ if (item.versions == val) {
+ reviewStatus.value = item.status;
+ }
+ });
getSheetName();
};
@@ -152,19 +187,11 @@ const getSheetName = async () => {
queryForm.value.sheet = res.data[0];
} else {
queryForm.value.sheet = '';
- ElMessage({
- message: '获取表名失败',
- type: 'warning'
- });
}
getTableData();
}
} catch (error) {
console.log(error);
- ElMessage({
- message: '获取表名失败',
- type: 'warning'
- });
}
};
//获取表格
@@ -179,54 +206,70 @@ const getTableData = async () => {
};
const res = await listBillofquantitiesLimitList(params);
if (res.code == 200) {
- tableData.value = [res.data[0]];
+ tableData.value = res.data;
}
} catch (error) {
console.log(error);
- ElMessage({
- message: '获取表格失败',
- type: 'error'
- });
tableData.value = [];
loading.value = false;
} finally {
loading.value = false;
}
};
+const modifyPrice = new Map();
+
+const changePrice = (row: any) => {
+ modifyPrice.set(row.id, row);
+};
//修改单价
-const handleSave = (row: any) => {
+const handleSave = (row?: any, type?: any) => {
try {
- if (!row.unitPrice) {
- ElMessage({
- message: '请输入单价',
- type: 'warning'
+ if (type == 'single') {
+ loading.value = true;
+ const list = [{ ...row, type: '1' }];
+ updatePrice(list).then((res) => {
+ if (res.code == 200) {
+ ElMessage({
+ message: '修改成功',
+ type: 'success'
+ });
+ getTableData();
+ }
+ });
+ }
+ if (type == 'all') {
+ loading.value = true;
+ const list = [];
+ modifyPrice.forEach((item) => {
+ list.push({ ...item, type: '1' });
+ });
+ updatePrice(list).then((res) => {
+ if (res.code == 200) {
+ ElMessage({
+ message: '修改成功',
+ type: 'success'
+ });
+ getTableData();
+ }
});
- return;
}
- loading.value = true;
- updatePrice({ ...row, type: '1' }).then((res) => {
- if (res.code == 200) {
- ElMessage({
- message: '修改成功',
- type: 'success'
- });
- getTableData();
- }
- });
} catch (error) {
ElMessage({
message: '修改失败',
type: 'error'
});
+ } finally {
+ loading.value = false;
}
};
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 => {
@@ -266,11 +309,25 @@ const handleExport = () => {
versions: queryForm.value.versions,
type: '1'
},
- `限价一览表${queryForm.value.sheet}.xlsx`
+ `限价一览${queryForm.value.sheet}.xlsx`
);
};
+// 审批
+const clickApprovalSheet = () => {
+ proxy.$tab.closePage(proxy?.$route);
+ let id = versionMap.get(queryForm.value.versions).id;
+ proxy?.$router.push({
+ path: `/approval/contractLimitPrice/indexEdit`,
+ query: {
+ id: id,
+ type: 'update',
+ sheets: queryForm.value.sheet
+ }
+ });
+};
onUnmounted(() => {
listeningProject();
+ // console.log(11111111);
});
onMounted(() => {
getVersionNums();
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
new file mode 100644
index 0000000..facd683
--- /dev/null
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -0,0 +1,385 @@
+<template>
+ <div class="p-4 bg-gray-50">
+ <div class="max-w-4xl mx-auto">
+ <!-- 顶部按钮区域 -->
+ <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+ <approvalButton
+ @submitForm="submitForm"
+ @approvalVerifyOpen="approvalVerifyOpen"
+ @handleApprovalRecord="handleApprovalRecord"
+ :buttonLoading="buttonLoading"
+ :id="form.versions"
+ :status="form.status"
+ :pageType="routeParams.type"
+ />
+ </el-card>
+ <!-- 表单区域 -->
+ <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+ <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+ <h3 class="text-lg font-semibold text-gray-800">合约限价审核</h3>
+ </div>
+ <div class="p-6">
+ <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="100px" class="space-y-4">
+ <div class="grid grid-cols-1 gap-4">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="版本号" prop="formNo">
+ <el-input :disabled="true" v-model="form.versions" placeholder="请输入文件名称" />
+ </el-form-item>
+ <el-form-item label="表名" prop="sheet">
+ <el-select v-model="form.sheet" placeholder="选择表名" @change="changeSheet">
+ <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ </el-form>
+ <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" default-expand-all border>
+ <el-table-column prop="num" label="编号" />
+ <el-table-column prop="name" label="名称" />
+ <el-table-column prop="specification" label="规格" />
+ <el-table-column prop="unit" label="单位" />
+ <el-table-column prop="quantity" label="数量" />
+ <el-table-column prop="unitPrice" label="单价" align="center" />
+ <el-table-column prop="price" label="总价" align="center">
+ <template #default="scope">
+ {{ scope.row.price != 0 ? Number(scope.row.price).toFixed(2) : null }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ <!-- 提交组件 -->
+ <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+ <approvalRecord ref="approvalRecordRef"></approvalRecord>
+ <!-- 流程选择对话框 -->
+ <el-dialog
+ draggable
+ v-model="dialogVisible.visible"
+ :title="dialogVisible.title"
+ :before-close="handleClose"
+ width="500"
+ class="rounded-lg shadow-lg"
+ >
+ <div class="p-4">
+ <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+ <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+ <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ </div>
+ <template #footer>
+ <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+ <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
+ <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as any;
+import { useUserStoreHook } from '@/store/modules/user';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+import { listBillofquantitiesLimitList, getVersionDetails, sheetList } from '@/api/contract/index';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+ visible: false,
+ title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const flowCodeOptions = [
+ {
+ value: currentProject.value?.id + '_xianjiayilan',
+ label: '合约限价审核'
+ }
+];
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+ visible: false,
+ title: '',
+ isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+ businessId: '',
+ flowCode: '',
+ variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+ versions: '',
+ sheet: '',
+ status: '',
+ id: ''
+};
+const data = reactive({
+ form: { ...initFormData },
+ tableData: [],
+ rules: {}
+});
+
+const handleClose = () => {
+ dialogVisible.visible = false;
+ flowCode.value = '';
+ buttonLoading.value = false;
+};
+const { form, rules, tableData } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+ form.value = { ...initFormData };
+ leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+ loading.value = true;
+ buttonLoading.value = false;
+ nextTick(async () => {
+ const res = await getVersionDetails(routeParams.value.id);
+ console.log(res);
+ Object.assign(form.value, res.data);
+ loading.value = false;
+ buttonLoading.value = false;
+ getSheetName();
+ });
+};
+const sheets = ref([]);
+//获取表名
+const getSheetName = async () => {
+ try {
+ const params = {
+ projectId: currentProject.value?.id,
+ versions: form.value.versions
+ };
+ const res = await sheetList(params);
+ if (res.code == 200) {
+ sheets.value = res.data;
+ if (res.data.length > 0) {
+ form.value.sheet = res.data[0];
+ }
+ getListTable();
+ }
+ } catch (error) {}
+};
+//选择表名
+const changeSheet = () => {
+ getListTable();
+};
+//获取列表
+const getListTable = async () => {
+ const res = await listBillofquantitiesLimitList({
+ projectId: currentProject.value?.id,
+ versions: form.value.versions,
+ sheet: form.value.sheet
+ });
+ if (res.code == 200) {
+ tableData.value = res.data;
+ }
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+ status.value = status1;
+ submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+ handleStartWorkFlow(form.value);
+ dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: any) => {
+ try {
+ submitFormData.value.flowCode = flowCode.value;
+ submitFormData.value.businessId = data.id;
+ //流程变量
+ taskVariables.value = {
+ // leave4/5 使用的流程变量
+ userList: ['1', '3', '4']
+ };
+ submitFormData.value.variables = taskVariables.value;
+ const resp = await startWorkFlow(submitFormData.value);
+ if (submitVerifyRef.value) {
+ buttonLoading.value = false;
+ submitVerifyRef.value.openDialog(resp.data.taskId);
+ }
+ } finally {
+ buttonLoading.value = false;
+ }
+};
+//审批记录
+const handleApprovalRecord = () => {
+ approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+ await proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+ submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+ form.value = data;
+ if (status === 'draft') {
+ buttonLoading.value = false;
+ proxy?.$modal.msgSuccess('暂存成功');
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+ } else {
+ if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+ flowCode.value = flowCodeOptions[0].value;
+ dialogVisible.visible = true;
+ return;
+ }
+ //说明启动过先随意穿个参数
+ if (flowCode.value === '' || flowCode.value === null) {
+ flowCode.value = 'xx';
+ }
+ await handleStartWorkFlow(data);
+ }
+};
+
+onMounted(() => {
+ nextTick(async () => {
+ routeParams.value = proxy.$route.query;
+ reset();
+ loading.value = false;
+ console.log(routeParams.value);
+ if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+ getInfo();
+ console.log('routeParams.value', routeParams.value);
+ }
+ });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+ --primary: #409eff;
+ --primary-light: #66b1ff;
+ --primary-dark: #3a8ee6;
+ --success: #67c23a;
+ --warning: #e6a23c;
+ --danger: #f56c6c;
+ --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+ .el-form-item__label {
+ color: #606266;
+ font-weight: 500;
+ }
+
+ .el-input__inner,
+ .el-select .el-input__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+
+ .el-textarea__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+}
+
+/* 按钮样式优化 */
+.el-button {
+ border-radius: 4px;
+ transition: all 0.2s;
+
+ &.is-primary {
+ background-color: var(--primary);
+ border-color: var(--primary);
+
+ &:hover {
+ background-color: var(--primary-light);
+ border-color: var(--primary-light);
+ }
+
+ &:active {
+ background-color: var(--primary-dark);
+ border-color: var(--primary-dark);
+ }
+ }
+
+ &.is-text {
+ color: var(--primary);
+
+ &:hover {
+ color: var(--primary-light);
+ background-color: rgba(64, 158, 255, 0.05);
+ }
+ }
+}
+
+/* 卡片样式优化 */
+.el-card {
+ transition: all 0.3s ease;
+
+ &:hover {
+ /* transform: translateY(-2px); */
+ }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+ .el-dialog__header {
+ background-color: #f5f7fa;
+ border-bottom: 1px solid #ebeef5;
+ padding: 15px 20px;
+ }
+
+ .el-dialog__title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ .el-dialog__footer {
+ padding: 15px 20px;
+ border-top: 1px solid #ebeef5;
+ }
+}
+</style>
diff --git a/src/views/cory/template/components/contactform.vue b/src/views/cory/template/components/contactform.vue
index d280eb9..6949f1b 100644
--- a/src/views/cory/template/components/contactform.vue
+++ b/src/views/cory/template/components/contactform.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-box">
<el-table :data="data" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column align="center" prop="projectName" label="工程名称" />
<el-table-column align="center" prop="serialNumber" label="编号" />
<el-table-column align="center" prop="to" label="致" />
diff --git a/src/views/cory/template/components/engineeringChangeApplicationForm.vue b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
index 123467c..d7e9e0c 100644
--- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue
+++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-box">
<el-table :data="data" style="width: 100%" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column align="center" prop="projectName" label="工程名称" />
<el-table-column align="center" prop="submitUnit" label="提出单位" />
<el-table-column align="center" prop="specialty" label="专业">
@@ -30,7 +30,7 @@
</el-button>
<el-button link type="primary" icon="View" @click="handleViewInfo(scope.row)" class="ml-3"> 查看流程 </el-button>
<el-button link type="success" icon="View" @click="handleDetail(scope.row)" class="ml-3"> 详情 </el-button>
- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button>
+ <!-- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"> 删除 </el-button> -->
</template>
</el-table-column>
</el-table>
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 91e3fe6..bc55402 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -36,12 +36,42 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工程名称">
- <el-input v-model="form.projectName" />
+ <el-input disabled v-model="form.projectName" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提出单位">
- <el-input v-model="form.submitUnit" />
+ <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 卷册名称 & 附图 -->
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="卷册号">
+ <!-- <el-input v-model="form.volumeName" /> -->
+ <el-select
+ id="projectSelect"
+ v-model="form.volumeNumber"
+ placeholder="请选择原卷册号"
+ clearable
+ filterable
+ @change="handleSelect"
+ style="width: 150px; margin-right: 20px"
+ >
+ <el-option
+ v-for="project in volumeCatalogList"
+ :key="project.volumeNumber"
+ :label="project.volumeNumber"
+ :value="project.volumeNumber"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <!-- 卷册号 -->
+ <el-form-item label="卷册名称">
+ <el-input disabled v-model="form.volumeName" />
</el-form-item>
</el-col>
</el-row>
@@ -50,7 +80,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="专业">
- <el-select v-model="form.specialty" placeholder="">
+ <el-select disabled v-model="form.specialty" placeholder="请选择专业">
<el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@@ -62,27 +92,9 @@
</el-col>
</el-row>
- <!-- 卷册名称 & 附图 -->
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="卷册名称">
- <el-input v-model="form.volumeName" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="附图">
- <file-Upload v-model="form.attachmentsImg" :file-type="['pdf', 'png', 'jpg', 'jpeg', 'gif', 'bmp']">
- <el-button type="primary">上传附件</el-button>
- </file-Upload>
- </el-form-item>
- </el-col>
- </el-row>
-
- <!-- 卷册号 -->
- <el-form-item label="卷册号">
- <el-input v-model="form.volumeNumber" />
+ <el-form-item label="附图">
+ <file-Upload :fileSize="50" v-model="form.attachmentsImg" :file-type="['png', 'jpg', 'jpeg']"> </file-Upload>
</el-form-item>
-
<!-- 变更原因 -->
<el-form-item label="变更原因">
<el-checkbox-group v-model="form.changeReasons">
@@ -100,10 +112,10 @@
<el-input v-model="form.content" type="textarea" :rows="6" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="附件" prop="attachments">
- <file-upload v-model="form.attachments" :limit="1" :file-type="['pdf']"></file-upload>
+ <file-upload :fileSize="50" v-model="form.attachments" :limit="1" :file-type="['pdf']"></file-upload>
</el-form-item>
<el-form-item label="变更费用估算" prop="costEstimation">
- <el-input v-model="form.costEstimation" :rows="6" placeholder="请输入变更费用估算" />
+ <el-input v-model="form.costEstimation" :rows="6" type="number" placeholder="请输入变更费用估算" />
</el-form-item>
<el-divider class="mb-10! mt-10!">施工项目部</el-divider>
<el-form-item label="项目负责人" prop="contractorLeader">
@@ -177,6 +189,7 @@ import { useUserStoreHook } from '@/store/modules/user';
import { listByIds } from '@/api/system/oss';
import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice';
const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { catalogList } from '@/api/design/designChange';
// 获取用户 store
const userStore = useUserStoreHook();
@@ -221,11 +234,11 @@ const initFormData = {
id: undefined,
projectId: currentProject.value?.id,
projectType: '',
- projectName: '',
+ projectName: currentProject.value?.name,
serialNumber: '',
to: '',
subject: '',
- costEstimation: '',
+ costEstimation: 0,
content: '',
attachments: '',
contractorLeader: '',
@@ -275,13 +288,27 @@ const handleClose = () => {
buttonLoading.value = false;
};
const { form, rules } = toRefs(data);
-
+const volumeCatalogList = ref([]);
+let volumeMap = new Map();
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
leaveFormRef.value?.resetFields();
};
-
+// 获取卷册号列表
+const getJuance = async () => {
+ const res = await catalogList(currentProject.value?.id);
+ volumeCatalogList.value = res.data;
+ volumeCatalogList.value.forEach((e) => {
+ volumeMap.set(e.volumeNumber, e);
+ });
+};
+const handleSelect = (val) => {
+ let obj = volumeMap.get(val);
+ console.log(obj);
+ form.value.volumeName = obj.documentName;
+ form.value.specialty = obj.specialty;
+};
/** 获取详情 */
const getInfo = () => {
loading.value = true;
@@ -345,7 +372,8 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
//流程变量
taskVariables.value = {
// leave4/5 使用的流程变量
- userList: ['1', '3', '4']
+ userList: ['1', '3', '4'],
+ costEstimation: form.value.costEstimation
};
submitFormData.value.variables = taskVariables.value;
const resp = await startWorkFlow(submitFormData.value);
@@ -402,6 +430,7 @@ onMounted(() => {
routeParams.value = proxy.$route.query;
thumbnailUrl.value = proxy.$route.query.thumbnailUrl;
reset();
+ getJuance();
loading.value = false;
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getInfo();
diff --git a/src/views/cory/workMessage/components/notice.vue b/src/views/cory/workMessage/components/notice.vue
index 08c25c1..8ab8df5 100644
--- a/src/views/cory/workMessage/components/notice.vue
+++ b/src/views/cory/workMessage/components/notice.vue
@@ -5,7 +5,7 @@
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="处理状态" align="center" prop="status">
<template #default="scope">
- <dict-tag :options="safety_inspection_type" :value="scope.row.status" />
+ <dict-tag :options="wf_business_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="检查人" align="center" prop="correctorName" />
@@ -46,13 +46,16 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
<template #default="scope">
<el-space>
- <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
- 详情
+ <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"> 详情 </el-button>
+ <el-button link type="primary" icon="Edit" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status == 'draft'"
+ >审批
</el-button>
- <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
+ <el-button link type="primary" icon="View" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status != 'draft'"
+ >查看流程
+ </el-button>
+ <!-- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
删除
- </el-button>
+ </el-button> -->
</el-space>
</template>
</el-table-column>
@@ -191,9 +194,10 @@ const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
-const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type } = toRefs<any>(
- useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type')
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
+ useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const safetyInspectionDetail = ref<SafetyInspectionVO>();
const form = reactive({
@@ -236,6 +240,18 @@ const handleDetail = async (row) => {
rectificationFileList.value = rectificationFileRes.data;
}
};
+const handleAddApp = (row) => {
+ // 添加审批
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/approval/workMessage/indexEdit`,
+ query: {
+ id: row.id,
+
+ type: 'update'
+ }
+ });
+};
const getList = (row) => {};
const handleDelete = (row) => {};
</script>
diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue
index 27204d5..805cdc0 100644
--- a/src/views/cory/workMessage/index.vue
+++ b/src/views/cory/workMessage/index.vue
@@ -21,7 +21,7 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd" v-hasPermi="['quality:qualityInspection:add']"
+ <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd" v-hasPermi="['cory:contactnotice:add']"
>新增</el-button
>
</el-col>
@@ -31,13 +31,7 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete()"
- v-hasPermi="['quality:qualityInspection:remove']"
+ <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['cory:contactnotice:remove']"
>删除</el-button
>
</el-col>
@@ -306,6 +300,7 @@ const selectType = (value: string) => {
const resetForm = () => {
formRef.value?.resetFields();
};
+
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value?.id,
diff --git a/src/views/cory/workMessage/indexEdit.vue b/src/views/cory/workMessage/indexEdit.vue
new file mode 100644
index 0000000..c04c34b
--- /dev/null
+++ b/src/views/cory/workMessage/indexEdit.vue
@@ -0,0 +1,482 @@
+<template>
+ <div class="p-4 bg-gray-50">
+ <div class="max-w-4xl mx-auto">
+ <!-- 顶部按钮区域 -->
+ <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+ <approvalButton
+ @submitForm="submitForm"
+ @approvalVerifyOpen="approvalVerifyOpen"
+ @handleApprovalRecord="handleApprovalRecord"
+ :buttonLoading="buttonLoading"
+ :id="form.id"
+ :status="form.status"
+ :pageType="routeParams.type"
+ />
+ </el-card>
+
+ <!-- 表单区域 -->
+ <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+ <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+ <h3 class="text-lg font-semibold text-gray-800">工作联系单审批</h3>
+ </div>
+ <div class="p-6">
+ <div class="w80% ma">
+ <h2 style="text-align: center; margin-top: 5px; font-weight: bold">通知单</h2>
+ <el-row>
+ <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.creatorName }}</el-col>
+ <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+ </el-row>
+ <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
+ <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
+ >{{ currentProject?.name }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
+ <dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
+ <dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="检查时间" class-name="zebra"
+ >{{ safetyInspectionDetail?.checkTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="检查人" class-name="zebra"
+ >{{ safetyInspectionDetail?.creatorName }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
+ >{{ safetyInspectionDetail?.correctorName }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
+ {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+ </el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions border direction="vertical" size="large">
+ <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions :column="2" border label-width="160px" size="large">
+ <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+ >{{ safetyInspectionDetail?.hiddenDanger }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+ <el-space wrap>
+ <div v-for="item in checkFileList" :key="item.ossId">
+ <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+ <image-preview :src="item.url" width="200px" />
+ </span>
+ <span v-else>
+ <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+ <span> {{ item.originalName }} </span>
+ </el-link>
+ </span>
+ </div>
+ </el-space>
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
+ <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="finish">
+ <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
+ </el-steps>
+ </el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions border direction="vertical" size="large">
+ <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions :column="2" border label-width="160px" size="large">
+ <el-descriptions-item label-align="center" label="班组" label-class-name="white"
+ >{{ safetyInspectionDetail?.teamName }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
+ >{{ safetyInspectionDetail?.rectificationTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
+ {{ safetyInspectionDetail?.measure }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+ <el-space wrap>
+ <div v-for="item in rectificationFileList" :key="item.ossId">
+ <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+ <image-preview :src="item.url" width="200px" />
+ </span>
+ <span v-else>
+ <el-link :href="`${item.url}`" :underline="false" target="_blank">
+ <span> {{ item.originalName }} </span>
+ </el-link>
+ </span>
+ </div>
+ </el-space>
+ </el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions border direction="vertical" size="large">
+ <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions :column="2" border label-width="160px" size="large">
+ <el-descriptions-item label-align="center" label="复查人" label-class-name="white"
+ >{{ safetyInspectionDetail?.creatorName }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
+ >{{ safetyInspectionDetail?.reviewTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+ >{{ safetyInspectionDetail?.review }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </div>
+ </div>
+ </el-card>
+ <!-- 提交组件 -->
+ <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+ <approvalRecord ref="approvalRecordRef"></approvalRecord>
+ <!-- 流程选择对话框 -->
+ <el-dialog
+ draggable
+ v-model="dialogVisible.visible"
+ :title="dialogVisible.title"
+ :before-close="handleClose"
+ width="500"
+ class="rounded-lg shadow-lg"
+ >
+ <div class="p-4">
+ <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+ <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+ <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ </div>
+ <template #footer>
+ <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+ <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+ >取消</el-button
+ >
+ <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+ >确认</el-button
+ >
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { listByIds } from '@/api/system/oss';
+import { dayjs } from 'element-plus';
+import { useDict } from '@/utils/dict';
+import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
+// const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { getContactnotice } from '@/api/cory/contactnotice';
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
+ useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
+);
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const thumbnailUrl = ref('');
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+ {
+ value: currentProject.value?.id + '_contactForm',
+ label: '工作联系单审批'
+ }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+ visible: false,
+ title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+ visible: false,
+ title: '',
+ isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+ businessId: '',
+ flowCode: '',
+ variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+ id: undefined,
+ projectId: currentProject.value?.id,
+ projectType: '',
+ projectName: '',
+ serialNumber: '',
+ to: '',
+ subject: '',
+ costEstimation: '',
+ content: '',
+ attachments: '',
+ contractorLeader: '',
+ contractorDate: '',
+ supervisorLeader: '',
+ supervisorDate: '',
+ ownerRep: '',
+ ownerDate: '',
+ unitName: '',
+ profession: '',
+ applyDate: '',
+ bookName: '',
+ bookNo: '',
+ hasAttachment: '',
+ changeReasons: [],
+ changeContent: '',
+ costEstimate: '',
+ status: ''
+};
+const data = reactive({
+ form: { ...initFormData },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ projectId: currentProject.value?.id,
+ fileName: undefined,
+ fileType: undefined,
+ fileSuffix: undefined,
+ fileStatus: undefined,
+ originalName: undefined,
+ newest: undefined,
+ params: {}
+ }
+});
+const safetyInspectionDetail = ref<SafetyInspectionVO>();
+const handleClose = () => {
+ dialogVisible.visible = false;
+ flowCode.value = '';
+ buttonLoading.value = false;
+};
+const { form } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+ form.value = { ...initFormData };
+ leaveFormRef.value?.resetFields();
+};
+
+const checkFileList: any = ref([]);
+const rectificationFileList: any = ref([]);
+/** 获取详情 */
+const getInfo = () => {
+ loading.value = true;
+ buttonLoading.value = false;
+ nextTick(async () => {
+ const res = await getContactnotice(routeParams.value.id);
+ console.log(res.data);
+ const detail = res.data.detail ? JSON.parse(res.data.detail) : {};
+ safetyInspectionDetail.value = { ...res.data, ...detail };
+ if (safetyInspectionDetail.value.checkFile) {
+ const checkFileRes = await listByIds(safetyInspectionDetail.value.checkFile.split(','));
+ checkFileList.value = checkFileRes.data;
+ }
+ if (safetyInspectionDetail.value.rectificationFile) {
+ const rectificationFileRes = await listByIds(safetyInspectionDetail.value.rectificationFile.split(','));
+ rectificationFileList.value = rectificationFileRes.data;
+ }
+
+ Object.assign(form.value, safetyInspectionDetail.value);
+ loading.value = false;
+ buttonLoading.value = false;
+ });
+};
+
+const submitFlow = async () => {
+ console.log('form.value', form.value);
+
+ handleStartWorkFlow(form.value);
+ dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+ console.log('data', data);
+
+ try {
+ submitFormData.value.flowCode = flowCode.value;
+ submitFormData.value.businessId = data.id;
+ //流程变量
+ taskVariables.value = {
+ // leave4/5 使用的流程变量
+ userList: ['1', '3', '4']
+ };
+ submitFormData.value.variables = taskVariables.value;
+ const resp = await startWorkFlow(submitFormData.value);
+ if (submitVerifyRef.value) {
+ buttonLoading.value = false;
+ submitVerifyRef.value.openDialog(resp.data.taskId);
+ }
+ } finally {
+ buttonLoading.value = false;
+ }
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+ status.value = status1;
+ submit(status.value, form.value);
+};
+//审批记录
+const handleApprovalRecord = () => {
+ approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+ await proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+};
+
+//审批
+const approvalVerifyOpen = async () => {
+ submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+ form.value = data;
+ if (status === 'draft') {
+ buttonLoading.value = false;
+ proxy?.$modal.msgSuccess('暂存成功');
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.go(-1);
+ } else {
+ if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+ flowCode.value = flowCodeOptions[0].value;
+ dialogVisible.visible = true;
+ return;
+ }
+ //说明启动过先随意穿个参数
+ if (flowCode.value === '' || flowCode.value === null) {
+ flowCode.value = 'xx';
+ }
+ console.log('data', data);
+ await handleStartWorkFlow(data);
+ }
+};
+
+onMounted(() => {
+ nextTick(async () => {
+ routeParams.value = proxy.$route.query;
+ reset();
+ loading.value = false;
+ if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+ getInfo();
+ }
+ });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+ --primary: #409eff;
+ --primary-light: #66b1ff;
+ --primary-dark: #3a8ee6;
+ --success: #67c23a;
+ --warning: #e6a23c;
+ --danger: #f56c6c;
+ --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+ .el-form-item__label {
+ color: #606266;
+ font-weight: 500;
+ }
+
+ .el-input__inner,
+ .el-select .el-input__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+
+ .el-textarea__inner {
+ border-radius: 4px;
+ transition:
+ border-color 0.2s,
+ box-shadow 0.2s;
+
+ &:focus {
+ border-color: var(--primary-light);
+ box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+ }
+ }
+}
+
+/* 按钮样式优化 */
+.el-button {
+ border-radius: 4px;
+ transition: all 0.2s;
+
+ &.is-primary {
+ background-color: var(--primary);
+ border-color: var(--primary);
+
+ &:hover {
+ background-color: var(--primary-light);
+ border-color: var(--primary-light);
+ }
+
+ &:active {
+ background-color: var(--primary-dark);
+ border-color: var(--primary-dark);
+ }
+ }
+
+ &.is-text {
+ color: var(--primary);
+
+ &:hover {
+ color: var(--primary-light);
+ background-color: rgba(64, 158, 255, 0.05);
+ }
+ }
+}
+
+/* 卡片样式优化 */
+.el-card {
+ transition: all 0.3s ease;
+
+ &:hover {
+ /* transform: translateY(-2px); */
+ }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+ .el-dialog__header {
+ background-color: #f5f7fa;
+ border-bottom: 1px solid #ebeef5;
+ padding: 15px 20px;
+ }
+
+ .el-dialog__title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ .el-dialog__footer {
+ padding: 15px 20px;
+ border-top: 1px solid #ebeef5;
+ }
+}
+</style>
diff --git a/src/views/ctr/expensesContract/index.vue b/src/views/ctr/expensesContract/index.vue
index f7dbf2b..9c5e632 100644
--- a/src/views/ctr/expensesContract/index.vue
+++ b/src/views/ctr/expensesContract/index.vue
@@ -1,94 +1,57 @@
<template>
<div class="p-2">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
- :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div v-show="showSearch" class="mb-[10px]">
- <el-card shadow="hover">
+ <el-card shadow="never">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
- <!-- <el-form-item label="项目ID" prop="projectId">
- <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
- </el-form-item> -->
<el-form-item label="合同编号" prop="contractCode">
<el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供应商" prop="contractSupplier">
- <el-input v-model="queryParams.contractSupplier" placeholder="请输入供应商" clearable
- @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.contractSupplier" placeholder="请输入供应商" clearable @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="合同金额" prop="amount">
- <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <!-- <el-form-item label="招标Id" prop="tenderId">
- <el-input v-model="queryParams.tenderId" placeholder="请输入招标Id" clearable @keyup.enter="handleQuery" />
- </el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
- </el-card>
- </div>
- </transition>
-
- <el-card shadow="never">
- <template #header>
- <el-row :gutter="10" class="mb8">
- <!-- <el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd"
- v-hasPermi="['ctr:expensesContract:add']">新增</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
- v-hasPermi="['ctr:expensesContract:edit']">修改</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
- v-hasPermi="['ctr:expensesContract:remove']">删除</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport"
- v-hasPermi="['ctr:expensesContract:export']">导出</el-button>
- </el-col>-->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="expensesContractList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
<el-table-column type="index" width="50" label="序号" />
- <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
<el-table-column label="合同编号" align="center" prop="contractCode" />
- <el-table-column label="合同类型" align="center" prop="contractType" />
<el-table-column label="合同类型" align="center" prop="contractType">
<template #default="scope">
<dict-tag :options="expenses_contract_type" :value="scope.row.contractType" />
</template>
</el-table-column>
+ <el-table-column label="支付方式" align="center" prop="payType">
+ <template #default="scope">
+ <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+ <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="供应商" align="center" prop="contractSupplier" />
- <el-table-column label="分包内容" align="center" prop="contractedContent" />
<el-table-column label="合同金额" align="center" prop="amount" />
- <!-- <el-table-column label="招标Id" align="center" prop="tenderId" /> -->
+ <el-table-column label="预付款比例(%)" align="center" prop="advancePayRatio" />
+ <el-table-column label="尾款比例(%)" align="center" prop="balancePayRatio" />
+ <el-table-column label="质保金比例(%)" align="center" prop="assuranceDepositRatio" />
+ <el-table-column label="付款比例(%)" align="center" prop="payRatio" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <!-- <el-tooltip content="修改" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['ctr:expensesContract:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="删除" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
- v-hasPermi="['ctr:expensesContract:remove']"></el-button>
- </el-tooltip> -->
- <el-tooltip content="查看附件列表" placement="top">
- <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
- </el-tooltip>
+ <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看分包内容</el-button>
+ <el-button link type="primary" v-hasPermi="['ctr:expensesContract:query']" icon="View" @click="handleShowFileList(scope.row)"
+ >查看附件列表</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改支出合同对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -123,20 +86,33 @@
</template>
</el-dialog>
<FileList v-model="fileListVisible" :fileList="fileList" />
+ <el-dialog v-model="detailVisible" title="分包内容详情" width="45%">
+ <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="detailVisible = false"> 关闭 </el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup name="ExpensesContract" lang="ts">
-import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getFileList } from '@/api/ctr/expensesContract';
+import {
+ listExpensesContract,
+ getExpensesContract,
+ delExpensesContract,
+ addExpensesContract,
+ updateExpensesContract,
+ getFileList
+} from '@/api/ctr/expensesContract';
import { ExpensesContractVO, ExpensesContractQuery, ExpensesContractForm } from '@/api/ctr/expensesContract/types';
import FileList from '@/components/FileList/index.vue';
import useUserStore from '@/store/modules/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-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 expensesContractList = ref<ExpensesContractVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@@ -151,6 +127,8 @@ const userStore = useUserStore();
const queryFormRef = ref<ElFormInstance>();
const expensesContractFormRef = ref<ElFormInstance>();
const currentProject = computed(() => userStore.selectedProject);
+const detailContent = ref('');
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
const dialog = reactive<DialogOption>({
visible: false,
@@ -166,8 +144,8 @@ const initFormData: ExpensesContractForm = {
contractedContent: undefined,
amount: undefined,
tenderId: undefined,
- remark: undefined,
-}
+ remark: undefined
+};
const data = reactive<PageData<ExpensesContractForm, ExpensesContractQuery>>({
form: { ...initFormData },
queryParams: {
@@ -180,16 +158,11 @@ const data = reactive<PageData<ExpensesContractForm, ExpensesContractQuery>>({
contractedContent: undefined,
amount: undefined,
tenderId: undefined,
- params: {
- }
+ params: {}
},
rules: {
- id: [
- { required: true, message: "主键ID不能为空", trigger: "blur" }
- ],
- projectId: [
- { required: true, message: "项目ID不能为空", trigger: "blur" }
- ],
+ id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+ projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }]
}
});
@@ -202,55 +175,55 @@ const getList = async () => {
expensesContractList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
-}
+};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
expensesContractFormRef.value?.resetFields();
-}
+};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ExpensesContractVO[]) => {
- ids.value = selection.map(item => item.id);
+ ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
- dialog.title = "添加支出合同";
-}
+ dialog.title = '添加支出合同';
+};
/** 修改按钮操作 */
const handleUpdate = async (row?: ExpensesContractVO) => {
reset();
- const _id = row?.id || ids.value[0]
+ const _id = row?.id || ids.value[0];
const res = await getExpensesContract(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "修改支出合同";
-}
+ dialog.title = '修改支出合同';
+};
/** 提交按钮 */
const submitForm = () => {
@@ -258,43 +231,51 @@ const submitForm = () => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
- await updateExpensesContract(form.value).finally(() => buttonLoading.value = false);
+ await updateExpensesContract(form.value).finally(() => (buttonLoading.value = false));
} else {
- await addExpensesContract(form.value).finally(() => buttonLoading.value = false);
+ await addExpensesContract(form.value).finally(() => (buttonLoading.value = false));
}
- proxy?.$modal.msgSuccess("操作成功");
+ proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
-}
+};
/** 删除按钮操作 */
const handleDelete = async (row?: ExpensesContractVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('是否确认删除支出合同编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+ await proxy?.$modal.confirm('是否确认删除支出合同编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delExpensesContract(_ids);
- proxy?.$modal.msgSuccess("删除成功");
+ proxy?.$modal.msgSuccess('删除成功');
await getList();
-}
+};
/** 导出按钮操作 */
const handleExport = () => {
- proxy?.download('ctr/expensesContract/export', {
- ...queryParams.value
- }, `expensesContract_${new Date().getTime()}.xlsx`)
-}
+ proxy?.download(
+ 'ctr/expensesContract/export',
+ {
+ ...queryParams.value
+ },
+ `expensesContract_${new Date().getTime()}.xlsx`
+ );
+};
// 查看附件列表操作
const handleShowFileList = async (row: ExpensesContractVO) => {
- await getFileList({ contractId: row.id }).then(res => {
- fileList.value = res.rows
- fileListVisible.value = true;
- }).catch(() => {
- proxy?.$modal.error("获取文件列表失败");
- });
-
-}
-
+ await getFileList({ contractId: row.id })
+ .then((res) => {
+ fileList.value = res.rows;
+ fileListVisible.value = true;
+ })
+ .catch(() => {
+ proxy?.$modal.error('获取文件列表失败');
+ });
+};
+const handleShowDetail = (data) => {
+ detailContent.value = data.contractedContent;
+ detailVisible.value = true;
+};
onMounted(() => {
getList();
});
diff --git a/src/views/ctr/incomeContract/index.vue b/src/views/ctr/incomeContract/index.vue
index c9a4ad9..1ff9073 100644
--- a/src/views/ctr/incomeContract/index.vue
+++ b/src/views/ctr/incomeContract/index.vue
@@ -1,89 +1,65 @@
<template>
<div class="p-2">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
- :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div v-show="showSearch" class="mb-[10px]">
- <el-card shadow="hover">
+ <el-card shadow="never">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
- <!-- <el-form-item label="项目ID" prop="projectId">
- <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
- </el-form-item> -->
<el-form-item label="合同编号" prop="contractCode">
<el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="业主单位" prop="contractOwner">
- <el-input v-model="queryParams.contractOwner" placeholder="请输入业主单位" clearable
- @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="合同金额" prop="amount">
- <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.contractOwner" placeholder="请输入业主单位" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
- </el-card>
- </div>
- </transition>
-
- <el-card shadow="never">
- <template #header>
- <el-row :gutter="10" class="mb8">
- <!-- <el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd"
- v-hasPermi="['ctr:incomeContract:add']">新增</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
- v-hasPermi="['ctr:incomeContract:edit']">修改</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
- v-hasPermi="['ctr:incomeContract:remove']">删除</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport"
- v-hasPermi="['ctr:incomeContract:export']">导出</el-button>
- </el-col>-->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="incomeContractList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
<el-table-column type="index" width="50" label="序号" />
- <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
<el-table-column label="合同编号" align="center" prop="contractCode" />
<el-table-column label="合同类型" align="center" prop="contractType">
<template #default="scope">
<dict-tag :options="income_contract_type" :value="scope.row.contractType" />
</template>
</el-table-column>
- <el-table-column label="业主单位" align="center" prop="contractOwner" />
- <el-table-column label="承包内容" align="center" prop="contractedContent" />
- <el-table-column label="合同金额" align="center" prop="amount" />
- <el-table-column label="备注" align="center" prop="remark" />
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="支付方式" align="center" prop="payType">
<template #default="scope">
- <!-- <el-tooltip content="修改" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['ctr:incomeContract:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="删除" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
- v-hasPermi="['ctr:incomeContract:remove']"></el-button>
- </el-tooltip> -->
- <el-tooltip content="查看附件列表" placement="top">
- <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
- </el-tooltip>
+ <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+ <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="业主单位" align="center" prop="contractOwner" />
+ <el-table-column label="合同金额" align="center" prop="amount" />
+ <el-table-column label="预付款比例(%)" align="center" prop="advancePayRatio" />
+ <el-table-column label="尾款比例(%)" align="center" prop="balancePayRatio" />
+ <el-table-column label="质保金比例(%)" align="center" prop="assuranceDepositRatio" />
+ <el-table-column label="付款比例(%)" align="center" prop="payRatio" />
+ <el-table-column label="备注" align="center" prop="remark" />
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ v-hasPermi="['ctr:incomeContract:edit']"
+ icon="edit"
+ @click="handleEdit(scope.row)"
+ v-if="scope.row.isUpdate"
+ >修改合同</el-button
+ >
+ <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看合同内容</el-button>
+ <el-button link type="primary" v-hasPermi="['ctr:incomeContract:query']" icon="View" @click="handleShowFileList(scope.row)"
+ >查看附件列表</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改收入合同对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -115,21 +91,39 @@
</template>
</el-dialog>
<FileList v-model="fileListVisible" :fileList="fileList" />
+ <el-dialog v-model="detailVisible" title="合同内容详情" width="45%">
+ <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
+
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="detailVisible = false"> 关闭 </el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup name="IncomeContract" lang="ts">
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
+import {
+ listIncomeContract,
+ getIncomeContract,
+ delIncomeContract,
+ addIncomeContract,
+ updateIncomeContract,
+ getFileList,
+ getInfoByProjectId
+} from '@/api/ctr/incomeContract';
import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
import FileList from '@/components/FileList/index.vue';
import useUserStore from '@/store/modules/user';
+import { useRouter } from 'vue-router';
+
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
const currentProject = computed(() => userStore.selectedProject);
+const router = useRouter();
-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 incomeContractList = ref<IncomeContractVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@@ -146,7 +140,8 @@ const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
-
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
+const detailContent = ref('');
const initFormData: IncomeContractForm = {
id: undefined,
projectId: undefined,
@@ -155,8 +150,8 @@ const initFormData: IncomeContractForm = {
contractOwner: undefined,
contractedContent: undefined,
amount: undefined,
- remark: undefined,
-}
+ remark: undefined
+};
const data = reactive<PageData<IncomeContractForm, IncomeContractQuery>>({
form: { ...initFormData },
queryParams: {
@@ -168,16 +163,11 @@ const data = reactive<PageData<IncomeContractForm, IncomeContractQuery>>({
contractOwner: undefined,
contractedContent: undefined,
amount: undefined,
- params: {
- }
+ params: {}
},
rules: {
- id: [
- { required: true, message: "主键ID不能为空", trigger: "blur" }
- ],
- projectId: [
- { required: true, message: "项目ID不能为空", trigger: "blur" }
- ],
+ id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+ projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }]
}
});
@@ -190,55 +180,55 @@ const getList = async () => {
incomeContractList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
-}
+};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
incomeContractFormRef.value?.resetFields();
-}
+};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 多选框选中数据 */
const handleSelectionChange = (selection: IncomeContractVO[]) => {
- ids.value = selection.map(item => item.id);
+ ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
- dialog.title = "添加收入合同";
-}
+ dialog.title = '添加收入合同';
+};
/** 修改按钮操作 */
const handleUpdate = async (row?: IncomeContractVO) => {
reset();
- const _id = row?.id || ids.value[0]
+ const _id = row?.id || ids.value[0];
const res = await getIncomeContract(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "修改收入合同";
-}
+ dialog.title = '修改收入合同';
+};
/** 提交按钮 */
const submitForm = () => {
@@ -246,44 +236,63 @@ const submitForm = () => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
- await updateIncomeContract(form.value).finally(() => buttonLoading.value = false);
+ await updateIncomeContract(form.value).finally(() => (buttonLoading.value = false));
} else {
- await addIncomeContract(form.value).finally(() => buttonLoading.value = false);
+ await addIncomeContract(form.value).finally(() => (buttonLoading.value = false));
}
- proxy?.$modal.msgSuccess("操作成功");
+ proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
-}
+};
/** 删除按钮操作 */
const handleDelete = async (row?: IncomeContractVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('是否确认删除收入合同编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+ await proxy?.$modal.confirm('是否确认删除收入合同编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delIncomeContract(_ids);
- proxy?.$modal.msgSuccess("删除成功");
+ proxy?.$modal.msgSuccess('删除成功');
await getList();
-}
+};
/** 导出按钮操作 */
const handleExport = () => {
- proxy?.download('ctr/incomeContract/export', {
- ...queryParams.value
- }, `incomeContract_${new Date().getTime()}.xlsx`)
-}
+ proxy?.download(
+ 'ctr/incomeContract/export',
+ {
+ ...queryParams.value
+ },
+ `incomeContract_${new Date().getTime()}.xlsx`
+ );
+};
// 查看附件列表操作
const handleShowFileList = async (row: IncomeContractVO) => {
console.log(row.id);
- await getFileList({ contractId: row.id }).then(res => {
- fileList.value = res.rows
- fileListVisible.value = true;
- }).catch(() => {
- proxy?.$modal.error("获取文件列表失败");
- });
+ await getFileList({ contractId: row.id })
+ .then((res) => {
+ fileList.value = res.rows;
+ fileListVisible.value = true;
+ })
+ .catch(() => {
+ proxy?.$modal.error('获取文件列表失败');
+ });
+};
+const handleEdit = (row: IncomeContractVO) => {
+ // console.log(router);
-}
+ router.push({
+ path: '/ctr/update',
+ query: {
+ id: row.id
+ }
+ });
+};
+const handleShowDetail = (data) => {
+ detailContent.value = data.contractedContent;
+ detailVisible.value = true;
+};
onMounted(() => {
getList();
});
diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index 851d61e..96f5c49 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -1,408 +1,439 @@
<template>
- <div class="container">
- <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
- <el-step title="选择合同类型" />
- <el-step title="录入合同内容" />
- <el-step title="录入收款方式" />
- </el-steps>
- <div class="content">
- <template v-if="active == 0">
- <div>
- <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>
- <template v-if="contract_type == 'income'">
- <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules"
- label-width="80px">
- <!-- <el-form-item label="项目名称">
+ <div class="container">
+ <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+ <el-step title="选择合同类型" />
+ <el-step title="录入合同内容" />
+ <el-step title="录入收款方式" />
+ </el-steps>
+ <div class="content">
+ <template v-if="active == 0">
+ <div>
+ <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>
+ <template v-if="contract_type == 'income'">
+ <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> -->
- <el-form-item label="合同编号" prop="contractCode">
- <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
- </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-select>
- </el-form-item>
- <el-form-item label="业主单位" prop="contractOwner">
- <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
- </el-form-item>
- <el-form-item label="承包内容">
- <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-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" />
- </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-item label="项目名称">
+ <el-form-item label="合同编号" prop="contractCode">
+ <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+ </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-select>
+ </el-form-item>
+ <el-form-item label="业主单位" prop="contractOwner">
+ <el-input disabled v-model="form.contractOwner" placeholder="请输入业主单位" />
+ </el-form-item>
+ <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>
+ <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-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" />
+ </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-item label="项目名称">
<el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
</el-form-item> -->
- <el-form-item label="合同编号" prop="contractCode">
- <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
- </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-select>
- </el-form-item>
- <el-form-item label="招标计划" prop="tenderId">
- <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
- <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
- <el-button type="primary" @click="handleChoose">选择招标</el-button>
- </el-form-item>
- <el-form-item label="供应商" prop="contractSupplier">
- <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
- </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-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 />
- </el-form-item>
+ <el-form-item label="合同编号" prop="contractCode">
+ <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+ </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-select>
+ </el-form-item>
+ <el-form-item label="招标计划" prop="tenderId">
+ <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
+ <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
+ <el-button type="primary" @click="handleChoose" v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button>
+ </el-form-item>
+ <el-form-item label="供应商" prop="contractSupplier">
+ <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
+ </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-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
+ />
+ </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" />
- </el-form-item>
- </el-form>
- </template>
- <div>
- <el-button @click="back(true)">上一步</el-button>
- <el-button type="primary" @click="next">下一步</el-button>
- </div>
- </template>
- <template v-else-if="active == 2">
- <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">
- <el-option :value="1" label="月结算">月结算</el-option>
- <el-option :value="2" label="形象节点">形象节点</el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="预付款比例（%）" prop="advancePayRatio">
- <el-input v-model="form.advancePayRatio" 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="balancePayRatio">
- <el-input v-model="form.balancePayRatio" 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="assuranceDepositRatio;">
- <el-input v-model="form.assuranceDepositRatio" 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="payRatio">
- <el-input v-model="form.payRatio" placeholder="请输入付款比例"
- oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
- </el-form-item>
- <el-form-item>
- <div>
- <el-button @click="back(false)">上一步</el-button>
- <el-button type="success" @click="submitForm">提交</el-button>
- </div>
- </el-form-item>
- </el-form>
- </template>
+ <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" />
+ </el-form-item>
+ </el-form>
+ </template>
+ <div>
+ <el-button @click="back(true)">上一步</el-button>
+ <el-button type="primary" @click="next">下一步</el-button>
</div>
- <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
- <el-table :data="planList">
- <el-table-column type="index" width="50" label="序号" />
- <el-table-column label="名称" align="center" prop="name" />
- <el-table-column label="合同额" align="center" prop="contractPrice" />
- <el-table-column label="分包内容" align="center" prop="content" />
- <el-table-column label="中标单位" align="center" prop="winningBidder" />
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
- </template>
- </el-table-column>
- </el-table>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">
- 关闭
- </el-button>
- </div>
- </template>
- </el-dialog>
+ </template>
+ <template v-else-if="active == 2">
+ <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">
+ <el-option :value="1" label="月结算">月结算</el-option>
+ <el-option :value="2" label="形象节点">形象节点</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+ <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+ <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+ <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="付款比例（%）" prop="payRatio">
+ <el-input-number v-model="payRatioComputed" disabled />
+ </el-form-item>
+ <el-form-item>
+ <div>
+ <el-button @click="back(false)">上一步</el-button>
+ <el-button type="success" @click="submitForm">提交</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ </template>
</div>
+ <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
+ <el-table :data="planList">
+ <el-table-column type="index" width="50" label="序号" />
+ <el-table-column label="名称" align="center" prop="name" />
+ <el-table-column label="合同额" align="center" prop="contractPrice" />
+ <el-table-column label="分包内容" align="center" prop="content" />
+ <el-table-column label="中标单位" align="center" prop="winningBidder" />
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="dialogVisible = false"> 关闭 </el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
</template>
<script setup>
import FileUpload from '@/components/FileUpload';
-import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { addExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
+import { addIncomeContract, getInfoByProjectId } from '@/api/ctr/incomeContract';
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);
const payMentRef = ref(null);
const incomeContractFormRules = {
- contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
- contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
- contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
- amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
- remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+ contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+ contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+ contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+ amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+ remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
};
const expensesContractFormRules = {
- contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
- contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+ contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+ contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
- contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
- amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
- tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+ contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+ 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' }],
- payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }],
+ payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+ advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+ balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+ assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }]
};
const project = computed(() => {
- console.log(111);
+ console.log(111);
- return JSON.parse(localStorage.getItem("selectedProject"))
+ return JSON.parse(localStorage.getItem('selectedProject'));
});
+const payRatioComputed = computed({
+ get: () => {
+ const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+ const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+ // form.value.payRatio = total;
+ return total;
+ },
+ // 只读
+ set: () => {}
+});
const checkContractType = (type) => {
- contract_type.value = type;
- form.value.contract_type = type;
- active.value = 1;
- form.value.step = active.value;
+ contract_type.value = type;
+ form.value.contract_type = type;
+ active.value = 1;
+ form.value.step = active.value;
};
const onUploadSuccess = (data) => {
- fileList.value = data
-}
+ fileList.value = data;
+};
const back = async (reset) => {
- console.log(active.value);
+ console.log(active.value);
- if (reset) {
- await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- }).then(() => {
- resetForm();
- active.value--;
- }).catch(() => {
- return;
- });
- } else {
+ if (reset) {
+ await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ resetForm();
active.value--;
- }
- console.log(active.value);
-
- form.value.step = active.value;
+ })
+ .catch(() => {
+ return;
+ });
+ } else {
+ active.value--;
+ }
+ console.log(active.value);
+ form.value.step = active.value;
};
const next = async () => {
- if (contract_type.value === 'income') {
- await incomeContractFormRef.value.validate((valid) => {
- if (valid) {
- active.value++;
- } else {
- ElMessage.error('请填写完整的收入合同信息');
- }
- });
- } else if (contract_type.value === 'expenses') {
- await expensesContractFormRef.value.validate((valid) => {
- if (valid) {
- active.value++;
- } else {
- ElMessage.error('请填写完整的支出合同信息');
- }
- });
- }
- console.log(active.value);
+ if (contract_type.value === 'income') {
+ await incomeContractFormRef.value.validate((valid) => {
+ if (valid) {
+ active.value++;
+ } else {
+ ElMessage.error('请填写完整的收入合同信息');
+ }
+ });
+ } else if (contract_type.value === 'expenses') {
+ await expensesContractFormRef.value.validate((valid) => {
+ if (valid) {
+ active.value++;
+ } else {
+ ElMessage.error('请填写完整的支出合同信息');
+ }
+ });
+ }
+ console.log(active.value);
- form.value.step = active.value;
+ form.value.step = active.value;
};
const resetForm = () => {
- form.value = {
- payType: 1,
- contractCode: '',
- contractType: '',
- contractOwner: '',
- contractedContent: '',
- amount: '',
- remark: '',
- advancePayRatio: '',
- balancePayRatio: '',
- assuranceDepositRatio: '',
- payRatio: ''
- };
- fileList.value = [];
- tempFileList.value = [];
- contract_type.value = '';
- setTimeout(() => {
- localStorage.removeItem("tempContractForm");
- }, 0);
+ form.value = {
+ payType: 1,
+ contractCode: '',
+ contractType: '',
+ contractOwner: '',
+ contractedContent: '',
+ amount: '',
+ remark: '',
+ advancePayRatio: '',
+ balancePayRatio: '',
+ assuranceDepositRatio: '',
+ payRatio: ''
+ };
+ fileList.value = [];
+ tempFileList.value = [];
+ contract_type.value = '';
+ setTimeout(() => {
+ localStorage.removeItem('tempContractForm');
+ }, 0);
};
+
const submitForm = async () => {
- console.log(payMentRef.value);
-
- await payMentRef.value.validate(async (valid) => {
- if (valid) {
- // 提交付款信息逻辑
- console.log('提交付款信息', form.value, fileList.value);
- // 这里可以调用API提交数据
- form.value.projectId = project.value.id;
- form.value.fileList = fileList.value.map((data) => {
- return {
- ...data,
- fileName: data.name,
- fileUrl: data.url,
- }
- })
- if (contract_type.value === 'income') {
- await addIncomeContract({ ...form.value });
- } else if (contract_type.value === 'expenses') {
- await addExpensesContract({ ...form.value });
- }
- resetForm();
- ElMessage.success('合同提交成功');
- } else {
- ElMessage.error('请填写完整的付款信息');
- }
- });
- // if (contract_type.value === 'income') {
- // const incomeContractFormRef = ref(null);
- // await incomeContractFormRef.value.validate(async (valid) => {
- // if (valid) {
- // // 提交收入合同逻辑
- // console.log('提交收入合同', form.value, fileList.value);
- // // 这里可以调用API提交数据
- // resetForm();
- // ElMessage.success('收入合同提交成功');
- // } else {
- // ElMessage.error('请填写完整的收入合同信息');
- // }
- // });
- // } else if (contract_type.value === 'expenses') {
- // const expensesContractFormRef = ref(null);
- // await expensesContractFormRef.value.validate(async (valid) => {
- // if (valid) {
- // // 提交支出合同逻辑
- // console.log('提交支出合同', form.value, fileList.value);
- // // 这里可以调用API提交数据
- // resetForm();
- // ElMessage.success('支出合同提交成功');
- // } else {
- // ElMessage.error('请填写完整的支出合同信息');
- // }
- // });
- // }
-}
-const handleChoose = async () => {
- if (!form.value.contractType) {
- ElMessage.error('请先选择合同类型');
+ await payMentRef.value.validate(async (valid) => {
+ if (valid) {
+ if (payRatioComputed.value < 0) {
+ ElMessage.error('四项付款比例之和必须等于100%');
return;
- }
- const formData = {
- projectId: userStore.selectedProject.id,
- dictName: form.value.contractType,
- status: 1,
- }
- const { data } = await getTenderPlan(formData)
- if (data.length === 0) {
- ElMessage.warning('当前没有招标计划，请先创建招标计划');
- return;
- }
- planList.value = data
- dialogVisible.value = true;
+ }
+ form.value.payRatio = payRatioComputed.value;
-}
-const handleChooseData = (row) => {
- form.value.tenderId = row.id;
- form.value.name = row.name;
- form.value.contractPrice = row.contractPrice;
- form.value.content = row.content;
- form.value.winningBidder = row.winningBidder;
- dialogVisible.value = false;
+ // 提交付款信息逻辑
+ console.log('提交付款信息', form.value, fileList.value);
+ // 这里可以调用API提交数据
+ form.value.projectId = project.value.id;
+ form.value.fileList = fileList.value.map((data) => {
+ return {
+ ...data,
+ fileName: data.name,
+ fileUrl: data.url
+ };
+ });
+ if (contract_type.value === 'income') {
+ await addIncomeContract({ ...form.value });
+ } else if (contract_type.value === 'expenses') {
+ await addExpensesContract({ ...form.value });
+ }
+ resetForm();
+ ElMessage.success('合同提交成功');
+ active.value = 0; // 重置步骤
+ if (contract_type.value === 'income') {
+ proxy.$router.push('/ctr/incomeContract');
+ } else {
+ proxy.$router.push('/ctr/expensesContract');
+ }
+ } else {
+ ElMessage.error('请填写完整的付款信息');
+ }
+ });
+ // if (contract_type.value === 'income') {
+ // const incomeContractFormRef = ref(null);
+ // await incomeContractFormRef.value.validate(async (valid) => {
+ // if (valid) {
+ // // 提交收入合同逻辑
+ // console.log('提交收入合同', form.value, fileList.value);
+ // // 这里可以调用API提交数据
+ // resetForm();
+ // ElMessage.success('收入合同提交成功');
+ // } else {
+ // ElMessage.error('请填写完整的收入合同信息');
+ // }
+ // });
+ // } else if (contract_type.value === 'expenses') {
+ // const expensesContractFormRef = ref(null);
+ // await expensesContractFormRef.value.validate(async (valid) => {
+ // if (valid) {
+ // // 提交支出合同逻辑
+ // console.log('提交支出合同', form.value, fileList.value);
+ // // 这里可以调用API提交数据
+ // resetForm();
+ // ElMessage.success('支出合同提交成功');
+ // } else {
+ // ElMessage.error('请填写完整的支出合同信息');
+ // }
+ // });
+ // }
+};
+const handleChoose = async () => {
+ if (!form.value.contractType) {
+ ElMessage.error('请先选择合同类型');
+ return;
+ }
+ const formData = {
+ projectId: userStore.selectedProject.id,
+ dictName: form.value.contractType,
+ status: 1
+ };
+ const { data } = await getTenderPlan(formData);
+ if (data.length === 0) {
+ ElMessage.warning('当前没有招标计划，请先创建招标计划');
+ return;
+ }
+ planList.value = data;
+ dialogVisible.value = true;
+};
+const handleChooseData = (row) => {
+ form.value.tenderId = row.id;
+ form.value.name = row.name;
+ // form.value.contractPrice = row.contractPrice;
+ form.value.content = row.content;
+ form.value.contractSupplier = row.winningBidder;
+ 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 }
+);
+// 获取投标列表
+const getInfoByProjectIdList = async () => {
+ const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id });
+ console.log(res);
+ form.value.contractOwner = res.data.planDuration;
};
-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 });
onMounted(() => {
- const tempForm = localStorage.getItem("tempContractForm");
- if (tempForm) {
- ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
- confirmButtonText: '继续',
- cancelButtonText: '取消',
- type: 'warning',
- }).then(() => {
- const t = JSON.parse(tempForm);
- const { fileList: files, ...rest } = JSON.parse(tempForm);
- form.value = rest;
- fileList.value = files || [];
- tempFileList.value = files || [];
- contract_type.value = form.value.contract_type;
- active.value = form.value.step || 0;
+ getInfoByProjectIdList();
- }).catch(() => {
- localStorage.removeItem("tempContractForm");
- });
-
- }
+ const tempForm = localStorage.getItem('tempContractForm');
+ if (tempForm) {
+ ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
+ confirmButtonText: '继续',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ const t = JSON.parse(tempForm);
+ const { fileList: files, ...rest } = JSON.parse(tempForm);
+ form.value = rest;
+ fileList.value = files || [];
+ tempFileList.value = files || [];
+ contract_type.value = form.value.contract_type;
+ active.value = form.value.step || 0;
+ })
+ .catch(() => {
+ localStorage.removeItem('tempContractForm');
+ });
+ }
});
</script>
<style scoped lang="scss">
.container {
- padding: 20px;
+ padding: 20px;
- .content {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 30px;
- flex-direction: column;
- }
+ .content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 30px;
+ flex-direction: column;
+ }
}
</style>
diff --git a/src/views/ctr/update/index.vue b/src/views/ctr/update/index.vue
new file mode 100644
index 0000000..4908951
--- /dev/null
+++ b/src/views/ctr/update/index.vue
@@ -0,0 +1,234 @@
+<template>
+ <div class="container">
+ <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+ <el-step title="选择合同类型" />
+ <el-step title="修改合同内容" />
+ <el-step title="修改收款方式" />
+ </el-steps>
+ <div class="content">
+ <template v-if="active == 1">
+ <h1>修改收入合同</h1>
+ <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+ <el-form-item label="合同编号" prop="contractCode">
+ <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+ </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-select>
+ </el-form-item>
+ <el-form-item label="业主单位" prop="contractOwner">
+ <el-input v-model="form.contractOwner" placeholder="请输入业主单位" disabled />
+ </el-form-item>
+ <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>
+ <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-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" />
+ </el-form-item>
+ </el-form>
+ <div>
+ <el-button type="primary" @click="next">下一步</el-button>
+ </div>
+ </template>
+ <template v-else-if="active == 2">
+ <h1>修改收入合同</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">
+ <el-option :value="1" label="月结算">月结算</el-option>
+ <el-option :value="2" label="形象节点">形象节点</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+ <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+ <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+ <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+ </el-form-item>
+ <el-form-item label="付款比例（%）" prop="payRatio">
+ <el-input-number v-model="payRatioComputed" disabled />
+ </el-form-item>
+ <el-form-item>
+ <div>
+ <el-button @click="back(false)">上一步</el-button>
+ <el-button type="success" @click="submitForm">提交</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ </template>
+ </div>
+ </div>
+</template>
+<script setup>
+import FileUpload from '@/components/FileUpload';
+import { getTenderPlan } from '@/api/ctr/expensesContract';
+import { updateIncomeContract } from '@/api/ctr/incomeContract';
+import { useUserStore } from '@/store/modules/user';
+const active = ref(1);
+const contract_type = ref('income');
+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 { income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
+const fileRef = ref(null);
+const incomeContractFormRef = ref(null);
+const expensesContractFormRef = ref(null);
+const payMentRef = ref(null);
+const incomeContractFormRules = {
+ contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+ contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+ contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+ amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+ remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
+};
+const expensesContractFormRules = {
+ contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+ contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+
+ contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+ amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+ tenderId: [{ required: true, 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' }]
+};
+
+const project = computed(() => {
+ return JSON.parse(localStorage.getItem('selectedProject'));
+});
+
+const payRatioComputed = computed({
+ get: () => {
+ const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+ const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+ // form.value.payRatio = total;
+ return total;
+ },
+ // 只读
+ set: () => { }
+});
+
+const onUploadSuccess = (data) => {
+ fileList.value = data;
+};
+
+const next = async () => {
+ if (contract_type.value === 'income') {
+ await incomeContractFormRef.value.validate((valid) => {
+ if (valid) {
+ active.value++;
+ } else {
+ ElMessage.error('请填写完整的收入合同信息');
+ }
+ });
+ } else if (contract_type.value === 'expenses') {
+ await expensesContractFormRef.value.validate((valid) => {
+ if (valid) {
+ active.value++;
+ } else {
+ ElMessage.error('请填写完整的支出合同信息');
+ }
+ });
+ }
+ console.log(active.value);
+
+ form.value.step = active.value;
+};
+const submitForm = async () => {
+ await payMentRef.value.validate(async (valid) => {
+ if (valid) {
+ if (payRatioComputed.value < 0) {
+ ElMessage.error('四项付款比例之和必须等于100%');
+ return;
+ }
+ form.value.payRatio = payRatioComputed.value;
+
+ // 提交付款信息逻辑
+ console.log('提交付款信息', form.value, fileList.value);
+ // 这里可以调用API提交数据
+ form.value.projectId = project.value.id;
+ form.value.fileList = fileList.value.map((data) => {
+ return {
+ ...data,
+ fileName: data.name,
+ fileUrl: data.url
+ };
+ });
+ if (contract_type.value === 'income') {
+ await updateIncomeContract({ ...form.value });
+ }
+ ElMessage.success('合同修改成功');
+ } else {
+ ElMessage.error('请填写完整的付款信息');
+ }
+ });
+};
+const handleChoose = async () => {
+ if (!form.value.contractType) {
+ ElMessage.error('请先选择合同类型');
+ return;
+ }
+ const formData = {
+ projectId: userStore.selectedProject.id,
+ dictName: form.value.contractType,
+ status: 1
+ };
+ const { data } = await getTenderPlan(formData);
+ if (data.length === 0) {
+ ElMessage.warning('当前没有招标计划，请先创建招标计划');
+ return;
+ }
+ planList.value = data;
+ dialogVisible.value = true;
+};
+
+onMounted(async () => {
+ const id = route.query.id;
+ if (id) {
+ const { data } = await getIncomeContract(id);
+ form.value.id = data.id;
+ form.value.contractOwner = data.contractOwner
+ } else {
+ router.push('/ctr/incomeContract');
+ }
+})
+</script>
+<style scoped lang="scss">
+.container {
+ padding: 20px;
+
+ .content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 30px;
+ flex-direction: column;
+ }
+}
+</style>
diff --git a/src/views/demo/components/1.html b/src/views/demo/components/1.html
new file mode 100644
index 0000000..846de09
--- /dev/null
+++ b/src/views/demo/components/1.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <!-- 引入图标（这里用的是阿里图标库示例，实际可替换成自己的图标资源） -->
+ <link rel="stylesheet" href="https://at.alicdn.com/t/c/font_4245527_xxxxxx.css">
+ <!-- <link rel="stylesheet" href="style.css"> -->
+ <style>
+ /* 初始化样式 */
+ * {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ }
+
+ body {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ min-height: 100vh;
+ background: #eef5ff;
+ font-family: sans-serif;
+ }
+
+ /* 时间轴容器 */
+ .weather-timeline {
+ display: flex;
+ align-items: center;
+ background: #fff;
+ border-radius: 12px;
+ padding: 20px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+ overflow-x: auto;
+ /* 适配小屏幕横向滚动 */
+ }
+
+ /* 每个时间项 */
+ .time-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: 0 12px;
+ min-width: 80px;
+ /* 保证 item 最小宽度 */
+ }
+
+ /* 当前时间项特殊样式 */
+ .time-item.current {
+ background: #e3f0ff;
+ border-radius: 8px;
+ padding: 10px;
+ transform: scale(1.1);
+ /* 稍微放大突出 */
+ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ }
+
+ /* 时间文本 */
+ .time {
+ font-size: 14px;
+ color: #333;
+ margin-bottom: 4px;
+ }
+
+ /* 温度文本 */
+ .temp {
+ font-size: 16px;
+ color: #666;
+ margin-bottom: 8px;
+ }
+
+ /* 图标样式（基于阿里图标库，可替换成自己的图标字体或图片） */
+ .iconfont {
+ font-size: 24px;
+ color: #f9b115;
+ /* 太阳/主色调 */
+ }
+
+ .icon-rain {
+ color: #9ec8f2;
+ /* 雨/蓝色系 */
+ }
+
+ .icon-cloud-moon {
+ color: #c9d6e5;
+ /* 多云 moon/浅灰蓝 */
+ }
+ </style>
+ <title>天气时间轴
+
+
+
+
- 
+
+
+
+
+
+
+
+ 16:00
+ 30°C
+
+
+
+ 17:00
+ 29°C
+
+
+
+ 18:00
+ 25°C
+
+
+
+ 现在
+ 25°C
+
+
+
+ 20:00
+ 25°C
+
+
+
+ 21:00
+ 20°C
+
+