合并

.env.production

@@ -14,7 +14,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+VITE_APP_BASE_API = 'http://xny.yj-3d.com:8899'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/App.vue

@@ -19,22 +19,3 @@ onMounted(() => {
   });
 });
 </script>
-<style>
-* {
-  -webkit-touch-callout: none; /*系统默认菜单被禁用*/
-  -webkit-user-select: none; /*webkit浏览器*/
-  -khtml-user-select: none; /*早期浏览器*/
-  -moz-user-select: none; /*火狐*/
-  -ms-user-select: none; /*IE10*/
-  user-select: none;
-}
-
-input {
-  -webkit-user-select: auto; /*webkit浏览器*/
-  user-select: auto;
-}
-textarea {
-  user-select: auto;
-  -webkit-user-select: auto; /*webkit浏览器*/
-}
-</style>

src/api/bidding/appointment/index.ts

@@ -0,0 +1,31 @@
+import request from '@/utils/request';
+
+/**
+ * 查询招标人员列表
+ * @param query
+ * @returns {*}
+ */
+
+export const biddingGetUser = (query) => {
+  return request({
+    url: '/bidding/biddingUser/getUser',
+    method: 'get',
+    params: query
+  });
+};
+// 新增招投标人员
+export const AddbiddingUser = (data) => {
+  return request({
+    url: '/bidding/biddingUser',
+    method: 'post',
+    data
+  });
+};
+// 新增招投标人员
+export const biddingUserList = (projectId) => {
+  return request({
+    url: '/bidding/biddingUser/list',
+    method: 'get',
+    params: { projectId }
+  });
+};

src/api/bidding/biddingLimit/index.ts

@@ -0,0 +1,55 @@
+import request from '@/utils/request';
+
+/**
+ * 导入成本-投标excel
+ * @param query
+ * @returns {*}
+ */
+
+export const BiddingImportExcelFile = (params?, data?) => {
+  return request({
+    url: '/bidding/biddingLimitList/importExcelFile',
+    method: 'post',
+    params,
+    data
+  });
+};
+//  导出成本-投标excel
+export const biddingLimitListExport = (data?) => {
+  return request({
+    url: '/bidding/biddingLimitList/export',
+    method: 'post',
+    data
+  });
+};
+//  获取成本-投标详细信息
+export const biddingLimitList = (id?) => {
+  return request({
+    url: '/bidding/biddingLimitList/' + id,
+    method: 'get'
+  });
+};
+//  查询成本-投标列表
+export const getTreeLimit = (params?) => {
+  return request({
+    url: '/bidding/biddingLimitList/getTree',
+    method: 'get',
+    params: params
+  });
+};
+//  修改成本-投标
+export const biddingLimitListUpdate = (data?) => {
+  return request({
+    url: '/bidding/biddingLimitList',
+    method: 'put',
+    data
+  });
+};
+//获取sheet
+export const sheetList = (query) => {
+  return request({
+    url: '/bidding/biddingLimitList/sheetList',
+    method: 'get',
+    params: query
+  });
+};

src/api/bidding/biddingLimitList/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BiddingLimitListVO, BiddingLimitListForm, BiddingLimitListQuery } from '@/api/bidding/biddingLimitList/types';
+
+/**
+ * 查询成本-投标列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBiddingLimitList = (query?: BiddingLimitListQuery): AxiosPromise<BiddingLimitListVO[]> => {
+  return request({
+    url: '/bidding/biddingLimitList/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询成本-投标详细
+ * @param id
+ */
+export const getBiddingLimitList = (id: string | number): AxiosPromise<BiddingLimitListVO> => {
+  return request({
+    url: '/bidding/biddingLimitList/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增成本-投标
+ * @param data
+ */
+export const addBiddingLimitList = (data: BiddingLimitListForm) => {
+  return request({
+    url: '/bidding/biddingLimitList',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改成本-投标
+ * @param data
+ */
+export const updateBiddingLimitList = (data: BiddingLimitListForm) => {
+  return request({
+    url: '/bidding/biddingLimitList',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除成本-投标
+ * @param id
+ */
+export const delBiddingLimitList = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/bidding/biddingLimitList/' + id,
+    method: 'delete'
+  });
+};

src/api/bidding/biddingLimitList/types.ts

@@ -0,0 +1,201 @@
+export interface BiddingLimitListVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目Id
+   */
+  projectId: string | number;
+
+  /**
+   * 版本号
+   */
+  versions: string;
+
+  /**
+   * 表名
+   */
+  sheet: string;
+
+  /**
+   * 子ID
+   */
+  sid: string | number;
+
+  /**
+   * 父ID
+   */
+  pid: string | number;
+
+  /**
+   * 编号
+   */
+  num: string;
+
+  /**
+   * 名称
+   */
+  name: string;
+
+  /**
+   * 规格
+   */
+  specification: string;
+
+  /**
+   * 单位
+   */
+  unit: string;
+
+  /**
+   * 数量
+   */
+  quantity: number;
+
+  /**
+   * 单价
+   */
+  unitPrice: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface BiddingLimitListForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目Id
+   */
+  projectId?: string | number;
+
+  /**
+   * 版本号
+   */
+  versions?: string;
+
+  /**
+   * 表名
+   */
+  sheet?: string;
+
+  /**
+   * 子ID
+   */
+  sid?: string | number;
+
+  /**
+   * 父ID
+   */
+  pid?: string | number;
+
+  /**
+   * 编号
+   */
+  num?: string;
+
+  /**
+   * 名称
+   */
+  name?: string;
+
+  /**
+   * 规格
+   */
+  specification?: string;
+
+  /**
+   * 单位
+   */
+  unit?: string;
+
+  /**
+   * 数量
+   */
+  quantity?: number;
+
+  /**
+   * 单价
+   */
+  unitPrice?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BiddingLimitListQuery extends PageQuery {
+
+  /**
+   * 项目Id
+   */
+  projectId?: string | number;
+
+  /**
+   * 版本号
+   */
+  versions?: string;
+
+  /**
+   * 表名
+   */
+  sheet?: string;
+
+  /**
+   * 子ID
+   */
+  sid?: string | number;
+
+  /**
+   * 父ID
+   */
+  pid?: string | number;
+
+  /**
+   * 编号
+   */
+  num?: string;
+
+  /**
+   * 名称
+   */
+  name?: string;
+
+  /**
+   * 规格
+   */
+  specification?: string;
+
+  /**
+   * 单位
+   */
+  unit?: string;
+
+  /**
+   * 数量
+   */
+  quantity?: number;
+
+  /**
+   * 单价
+   */
+  unitPrice?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/bidding/biddingUser/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BiddingUserVO, BiddingUserForm, BiddingUserQuery } from '@/api/bidding/biddingUser/types';
+
+/**
+ * 查询招投标人员列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBiddingUser = (query?: BiddingUserQuery): AxiosPromise<BiddingUserVO[]> => {
+  return request({
+    url: '/bidding/biddingUser/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询招投标人员详细
+ * @param id
+ */
+export const getBiddingUser = (id: string | number): AxiosPromise<BiddingUserVO> => {
+  return request({
+    url: '/bidding/biddingUser/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增招投标人员
+ * @param data
+ */
+export const addBiddingUser = (data: BiddingUserForm) => {
+  return request({
+    url: '/bidding/biddingUser',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改招投标人员
+ * @param data
+ */
+export const updateBiddingUser = (data: BiddingUserForm) => {
+  return request({
+    url: '/bidding/biddingUser',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除招投标人员
+ * @param id
+ */
+export const delBiddingUser = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/bidding/biddingUser/' + id,
+    method: 'delete'
+  });
+};

src/api/bidding/biddingUser/types.ts

@@ -0,0 +1,71 @@
+export interface BiddingUserVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId: string | number;
+
+  /**
+   * 招投标人员id
+   */
+  userId: string | number;
+
+  /**
+   * 招投标人员姓名
+   */
+  userName: string;
+
+}
+
+export interface BiddingUserForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 招投标人员id
+   */
+  userId?: string | number;
+
+  /**
+   * 招投标人员姓名
+   */
+  userName?: string;
+
+}
+
+export interface BiddingUserQuery extends PageQuery {
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 招投标人员id
+   */
+  userId?: string | number;
+
+  /**
+   * 招投标人员姓名
+   */
+  userName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/bidding/listOfWinningBids/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ListOfWinningBidsVO, ListOfWinningBidsForm, ListOfWinningBidsQuery } from '@/api/bidding/listOfWinningBids/types';
+
+/**
+ * 查询中标项目一览列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listListOfWinningBids = (query?: ListOfWinningBidsQuery): AxiosPromise<ListOfWinningBidsVO[]> => {
+  return request({
+    url: '/bidding/listOfWinningBids/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询中标项目一览详细
+ * @param id
+ */
+export const getListOfWinningBids = (id: string | number): AxiosPromise<ListOfWinningBidsVO> => {
+  return request({
+    url: '/bidding/listOfWinningBids/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增中标项目一览
+ * @param data
+ */
+export const addListOfWinningBids = (data: ListOfWinningBidsForm) => {
+  return request({
+    url: '/bidding/listOfWinningBids',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改中标项目一览
+ * @param data
+ */
+export const updateListOfWinningBids = (data: ListOfWinningBidsForm) => {
+  return request({
+    url: '/bidding/listOfWinningBids',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除中标项目一览
+ * @param id
+ */
+export const delListOfWinningBids = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/bidding/listOfWinningBids/' + id,
+    method: 'delete'
+  });
+};

src/api/bidding/listOfWinningBids/types.ts

@@ -0,0 +1,296 @@
+export interface ListOfWinningBidsVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId: string | number;
+
+  /**
+   * 项目状态
+   */
+  projectStatus: string;
+
+  /**
+   * 项目名称
+   */
+  projectName: string;
+
+  /**
+   * 中标价（原币）
+   */
+  winningBidOriginal: string | number;
+
+  /**
+   * 汇率
+   */
+  exchangeRate: number;
+
+  /**
+   * 币种
+   */
+  currency: string;
+
+  /**
+   * 所属主体
+   */
+  subject: string;
+
+  /**
+   * 中标价
+   */
+  winningBid: string | number;
+
+  /**
+   * 中标日期
+   */
+  bidWinningDate: string | number;
+
+  /**
+   * 投标保证金
+   */
+  bidDeposit: string | number;
+
+  /**
+   * 是否退还
+   */
+  whetherSendBack: string;
+
+  /**
+   * 建设单位（客户）
+   */
+  construction: string;
+
+  /**
+   * 总造价
+   */
+  totalCost: number;
+
+  /**
+   * 立项申请人
+   */
+  projectApplicant: string;
+
+  /**
+   * 立项部门
+   */
+  projectApplicantDept: string;
+
+  /**
+   * 立项申请日期
+   */
+  projectApplicantTime: string;
+
+  /**
+   * 流程状态
+   */
+  processStatus: string;
+
+  /**
+   * 项目编号
+   */
+  projectNumbering: string;
+
+}
+
+export interface ListOfWinningBidsForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目状态
+   */
+  projectStatus?: string;
+
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 中标价（原币）
+   */
+  winningBidOriginal?: string | number;
+
+  /**
+   * 汇率
+   */
+  exchangeRate?: number;
+
+  /**
+   * 币种
+   */
+  currency?: string;
+
+  /**
+   * 所属主体
+   */
+  subject?: string;
+
+  /**
+   * 中标价
+   */
+  winningBid?: string | number;
+
+  /**
+   * 中标日期
+   */
+  bidWinningDate?: string | number;
+
+  /**
+   * 投标保证金
+   */
+  bidDeposit?: string | number;
+
+  /**
+   * 是否退还
+   */
+  whetherSendBack?: string;
+
+  /**
+   * 建设单位（客户）
+   */
+  construction?: string;
+
+  /**
+   * 总造价
+   */
+  totalCost?: number;
+
+  /**
+   * 立项申请人
+   */
+  projectApplicant?: string;
+
+  /**
+   * 立项部门
+   */
+  projectApplicantDept?: string;
+
+  /**
+   * 立项申请日期
+   */
+  projectApplicantTime?: string;
+
+  /**
+   * 流程状态
+   */
+  processStatus?: string;
+
+  /**
+   * 项目编号
+   */
+  projectNumbering?: string;
+
+}
+
+export interface ListOfWinningBidsQuery extends PageQuery {
+
+  /**
+   * 项目id
+   */
+  projectId?: string | number;
+
+  /**
+   * 项目状态
+   */
+  projectStatus?: string;
+
+  /**
+   * 项目名称
+   */
+  projectName?: string;
+
+  /**
+   * 中标价（原币）
+   */
+  winningBidOriginal?: string | number;
+
+  /**
+   * 汇率
+   */
+  exchangeRate?: number;
+
+  /**
+   * 币种
+   */
+  currency?: string;
+
+  /**
+   * 所属主体
+   */
+  subject?: string;
+
+  /**
+   * 中标价
+   */
+  winningBid?: string | number;
+
+  /**
+   * 中标日期
+   */
+  bidWinningDate?: string | number;
+
+  /**
+   * 投标保证金
+   */
+  bidDeposit?: string | number;
+
+  /**
+   * 是否退还
+   */
+  whetherSendBack?: string;
+
+  /**
+   * 建设单位（客户）
+   */
+  construction?: string;
+
+  /**
+   * 总造价
+   */
+  totalCost?: number;
+
+  /**
+   * 立项申请人
+   */
+  projectApplicant?: string;
+
+  /**
+   * 立项部门
+   */
+  projectApplicantDept?: string;
+
+  /**
+   * 立项申请日期
+   */
+  projectApplicantTime?: string;
+
+  /**
+   * 流程状态
+   */
+  processStatus?: string;
+
+  /**
+   * 项目编号
+   */
+  projectNumbering?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/contract/index.ts

@@ -0,0 +1,93 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+//获取版本
+export const obtainAllVersionNumbers = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/obtainAllVersionNumbers',
+    method: 'get',
+    params: query
+  });
+};
+//获取sheet
+export const sheetList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/sheetList',
+    method: 'get',
+    params: query
+  });
+};
+
+//获取一览表
+export const listBillofquantitiesLimitList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/list',
+    method: 'get',
+    params: query
+  });
+};
+//获取一览数据树
+export const treeList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/getTree',
+    method: 'get',
+    params: query
+  });
+};
+//修改单价
+export const updatePrice = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/billofquantitiesLimitList',
+    method: 'put',
+    data: query
+  });
+};
+//查询分标策划
+export const getPlanningList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/list',
+    method: 'get',
+    params: query
+  });
+};
+
+//新增分标策划
+export const segmentedIndicatorPlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning',
+    method: 'post',
+    data: query
+  });
+};
+//编辑分标策划
+export const updatePlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning',
+    method: 'put',
+    data: query
+  });
+};
+//编辑分标策划
+export const delPlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/' + query.ids,
+    method: 'delete'
+  });
+};
+//导出分标
+export const importExcelFile = (params: any, data: any): AxiosPromise => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/importExcelFile',
+    method: 'post',
+    params,
+    data
+  });
+};
+//获取详情
+export const getDetailsList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/getMore',
+    method: 'get',
+    params: query
+  });
+};

src/api/ctr/expensesContract/index.ts

@@ -0,0 +1,74 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ExpensesContractVO, ExpensesContractForm, ExpensesContractQuery } from '@/api/ctr/expensesContract/types';
+
+/**
+ * 查询支出合同列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listExpensesContract = (query?: ExpensesContractQuery): AxiosPromise<ExpensesContractVO[]> => {
+  return request({
+    url: '/ctr/expensesContract/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询支出合同详细
+ * @param id
+ */
+export const getExpensesContract = (id: string | number): AxiosPromise<ExpensesContractVO> => {
+  return request({
+    url: '/ctr/expensesContract/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增支出合同
+ * @param data
+ */
+export const addExpensesContract = (data: ExpensesContractForm) => {
+  return request({
+    url: '/ctr/expensesContract',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改支出合同
+ * @param data
+ */
+export const updateExpensesContract = (data: ExpensesContractForm) => {
+  return request({
+    url: '/ctr/expensesContract',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除支出合同
+ * @param id
+ */
+export const delExpensesContract = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/ctr/expensesContract/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 查看支出合同附件列表
+ * @param id
+ */
+export const getFileList = (data) => {
+  return request({
+    url: '/ctr/expensesContract/file/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/ctr/expensesContract/types.ts

@@ -0,0 +1,141 @@
+export interface ExpensesContractVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode: string;
+
+  /**
+   * 合同类型
+   */
+  contractType: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent: string;
+
+  /**
+   * 合同金额
+   */
+  amount: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface ExpensesContractForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier?: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ExpensesContractQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 供应商
+   */
+  contractSupplier?: string;
+
+  /**
+   * 分包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 招标Id
+   */
+  tenderId?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/ctr/incomeContract/index.ts

@@ -0,0 +1,74 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { IncomeContractVO, IncomeContractForm, IncomeContractQuery } from '@/api/ctr/incomeContract/types';
+
+/**
+ * 查询收入合同列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listIncomeContract = (query?: IncomeContractQuery): AxiosPromise<IncomeContractVO[]> => {
+  return request({
+    url: '/ctr/incomeContract/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询收入合同详细
+ * @param id
+ */
+export const getIncomeContract = (id: string | number): AxiosPromise<IncomeContractVO> => {
+  return request({
+    url: '/ctr/incomeContract/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增收入合同
+ * @param data
+ */
+export const addIncomeContract = (data: IncomeContractForm) => {
+  return request({
+    url: '/ctr/incomeContract',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改收入合同
+ * @param data
+ */
+export const updateIncomeContract = (data: IncomeContractForm) => {
+  return request({
+    url: '/ctr/incomeContract',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除收入合同
+ * @param id
+ */
+export const delIncomeContract = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/ctr/incomeContract/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 查看收入合同附件列表
+ * @param id
+ */
+export const getFileList = (data) => {
+  return request({
+    url: '/ctr/incomeContract/file/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/ctr/incomeContract/types.ts

@@ -0,0 +1,126 @@
+export interface IncomeContractVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode: string;
+
+  /**
+   * 合同类型
+   */
+  contractType: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent: string;
+
+  /**
+   * 合同金额
+   */
+  amount: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface IncomeContractForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner?: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface IncomeContractQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同类型
+   */
+  contractType?: string;
+
+  /**
+   * 业主单位
+   */
+  contractOwner?: string;
+
+  /**
+   * 承包内容
+   */
+  contractedContent?: string;
+
+  /**
+   * 合同金额
+   */
+  amount?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/design/volumeCatalog/index.ts

@@ -116,3 +116,17 @@ export const getileDetail = (id) => {
     method: 'get'
   });
 };
+/**
+ * 获取二维码信息
+ * @param query
+ */
+export const codeInfo = (id) => {
+  const config: any = {
+    url: '/design/volumeFile/codeInfo?id=' + id,
+    method: 'get'
+  };
+  config.headers = {
+    Authorization: '1'
+  };
+  return request(config);
+};

src/api/materials/purchaseDoc/index.ts

@@ -124,7 +124,7 @@ export const logisticsDetial = (id) => {
 
 export const getDetailBASE = (id) => {
   return request({
-    url: '/cailiaoshebei/purchaseDoc/pic/' + id,
+    url: '/cailiaoshebei/purchaseDoc/pdf/' + id,
     method: 'get'
   });
 };

src/api/patch/index.ts

@@ -94,7 +94,7 @@ export const editProgress = (data) => {
 // 删除进度
 export const deleteProgress = (id) => {
   return request({
-    url: `/removeProgress/{id}`,
+    url: `/patch/removeProgress/${id}`,
     method: 'delete'
   });
 };

src/assets/styles/index.scss

@@ -8,6 +8,15 @@
 @import 'animate.css';
 @import 'element-plus/dist/index.css';
 
+
+
+@font-face {
+  font-family: 'AlimamaShuHeiTi';
+  src: url('@/assets/fonts/庞门正道标题体2.0增强版.ttf') format('truetype');
+  // font-weight: normal;
+  // font-style: normal;
+}
+
 body {
   height: 100%;
   margin: 0;
@@ -212,4 +221,4 @@ aside {
     vertical-align: middle;
     margin-bottom: 10px;
   }
-}
+}

src/components/FileList/index.vue

@@ -0,0 +1,56 @@
+<template>
+    <el-dialog v-model="dialogVisible" title="附件列表" width="45%">
+        <el-table :data="fileList" style="width: 100%">
+            <el-table-column prop="fileName" label="文件名" />
+            <el-table-column prop="type" label="操作">
+                <template #default="scope">
+                    <el-button link type="success" @click="viewFile(scope.row)" icon="View">查看文件</el-button>
+                    <el-button link type="primary" @click="downloadFile(scope.row)" icon="download">下载文件</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>
+    <el-dialog width="80%" v-model="viewFileVisible" title="查看文件" append-to-body>
+        <iframe :src="fileUrl" frameborder="0" width="100%" height="800"></iframe>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="viewFileVisible = false" type="primary">关闭</el-button>
+            </div>
+        </template>
+    </el-dialog>
+
+
+</template>
+<script setup>
+const { proxy } = getCurrentInstance();
+const dialogVisible = defineModel();
+const props = defineProps(['fileList'])
+const viewFileVisible = ref(false)
+const fileUrl = ref('')
+const downloadFile = async (data) => {
+    // 这里可以添加下载文件的逻辑
+    await proxy?.download(data.fileUrl, {}, data.fileName);
+    proxy?.$message({
+        message: '下载成功',
+        type: 'success'
+    });
+};
+const viewFile = (data) => {
+    // 这里可以添加查看文件的逻辑
+    fileUrl.value = data.fileUrl;
+    viewFileVisible.value = true;
+}
+const adjustIframe = () => {
+    const iframe = document.querySelector('iframe');
+    if (iframe) {
+        iframe.style.height = `${iframe.contentWindow.document.body.scrollHeight}px`;
+    }
+};
+</script>

src/components/FileUpload/index.vue

@@ -1,28 +1,11 @@
 <template>
   <div class="upload-file">
-    <el-upload
+    <el-upload ref="fileUploadRef" multiple :action="realUploadUrl" :before-upload="handleBeforeUpload"
-      ref="fileUploadRef"
+      :file-list="fileList" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed"
-      multiple
+      :on-success="handleUploadSuccess" :show-file-list="showFileList" :headers="headers" class="upload-file-uploader"
-      :action="realUploadUrl"
+      :list-type="isConstruction ? 'picture-card' : 'text'" :accept="accept" :drag="isDarg" :data="data"
-      :before-upload="handleBeforeUpload"
+      :auto-upload="autoUpload" :on-change="handleChange" :on-remove="handleRemove" :method="method"
-      :file-list="fileList"
+      :http-request="customUpload">
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :on-success="handleUploadSuccess"
-      :show-file-list="showFileList"
-      :headers="headers"
-      class="upload-file-uploader"
-      :list-type="isConstruction ? 'picture-card' : 'text'"
-      :accept="accept"
-      :drag="isDarg"
-      :data="data"
-      :auto-upload="autoUpload"
-      :on-change="handleChange"
-      :on-remove="handleRemove"
-      :method="method"
-      :http-request="customUpload"
-    >
       <slot>
         <div>
           <!-- 上传按钮 -->
@@ -41,14 +24,10 @@
             的文件
           </div>
           <!-- 文件列表 -->
-          <transition-group
+          <transition-group v-if="!isConstruction && !isImportInfo"
-            v-if="!isConstruction && !isImportInfo"
+            class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul" @click.stop>
-            class="upload-file-list el-upload-list el-upload-list--text"
+            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid"
-            name="el-fade-in-linear"
+              class="el-upload-list__item ele-upload-list__item-content">
-            tag="ul"
-            @click.stop
-          >
-            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
                 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
               </el-link>
@@ -60,7 +39,9 @@
         </div>
       </slot>
 
-      <el-icon v-if="isConstruction"><Plus /></el-icon>
+      <el-icon v-if="isConstruction">
+        <Plus />
+      </el-icon>
       <template #file="{ file }">
         <div class="pdf" v-if="isConstruction">
           <img src="@/assets/icons/svg/pdf.png" alt="" />
@@ -69,10 +50,14 @@
           </el-text>
           <div class="Shadow">
             <a :href="file.url" target="_blank">
-              <el-icon class="mr"><View /></el-icon>
+              <el-icon class="mr">
+                <View />
+              </el-icon>
             </a>
             <a href="#">
-              <el-icon @click="handleDelete((file as any).ossId, 'ossId')"><Delete /></el-icon>
+              <el-icon @click="handleDelete((file as any).ossId, 'ossId')">
+                <Delete />
+              </el-icon>
             </a>
           </div>
         </div>
@@ -96,7 +81,8 @@ const props = defineProps({
   // 大小限制(MB)
   fileSize: propTypes.number.def(5),
   // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg', 'zip']),
+  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'png', 'jpg', 'jpeg', 'zip']),
+  fileType: propTypes.array.def(['pdf']),
   // 是否显示提示
   isShowTip: propTypes.bool.def(true),
   //是否为施工人员上传
@@ -111,6 +97,11 @@ const props = defineProps({
   autoUpload: propTypes.bool.def(true),
   // 是否显示文件列表
   showFileList: propTypes.bool.def(false),
+  // 默认显示的文件列表
+  defaultFileList: {
+    type: Array as any,
+    default: () => []
+  },
   // 其他参数
   data: propTypes.object.def({}),
   // 成功回调
@@ -154,7 +145,6 @@ const fileUploadRef = ref<ElUploadInstance>();
 const accept = computed(() => {
   return props.fileType.map((value) => `.${value}`).join(',');
 });
-
 watch(
   () => props.modelValue,
   async (val) => {
@@ -168,6 +158,8 @@ watch(
       } else {
         const res = await listByIds(val as any);
         list = res.data.map((oss) => {
+          console.log(oss);
+
           return {
             name: oss.originalName,
             url: oss.url,
@@ -188,7 +180,13 @@ 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 });
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
   // 校检文件类型
@@ -415,21 +413,25 @@ defineExpose({ submitUpload });
   border-radius: 6px;
   position: relative;
   width: 100%;
+
   img {
     width: 40%;
   }
+
   &:hover {
     .Shadow {
       opacity: 1;
     }
   }
-  > span {
+
+  >span {
     width: 100%;
   }
 }
 
 .upload-file-list {
   margin: 0;
+
   .el-upload-list__item {
     border: 1px solid #e4e7ed;
     line-height: 2;
@@ -444,6 +446,7 @@ defineExpose({ submitUpload });
   align-items: center;
   color: inherit;
 }
+
 .Shadow {
   align-items: center;
   background-color: rgba(0, 0, 0, 0.5);
@@ -465,6 +468,7 @@ defineExpose({ submitUpload });
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }
+
 .el-icon.avatar-uploader-icon {
   border: 1px dashed #cdd0d6;
   border-radius: 6px;

src/components/Process/approvalRecord.vue

@@ -31,6 +31,7 @@
                 label="运行时长"
                 width="140"
                 :show-overflow-tooltip="true"
+                :sort-method="sortTime"
                 sortable
                 align="center"
               ></el-table-column>
@@ -114,6 +115,25 @@ const handleDownload = (ossId: string) => {
   proxy?.$download.oss(ossId);
 };
 
+// 解析时间字符串，返回秒数
+function parseTimeStr(str: string): number {
+  let total = 0;
+  const minMatch = str.match(/(\d+)分钟/);
+  const secMatch = str.match(/(\d+)秒/);
+
+  if (minMatch) total += parseInt(minMatch[1]) * 60;
+  if (secMatch) total += parseInt(secMatch[1]);
+  return total;
+}
+
+// 排序函数，根据时间字符串解析后的秒数排序
+function sortTime(a: any, b: any) {
+  console.log(a, b);
+  return a.runDurationNum - b.runDurationNum;
+
+  // return parseTimeStr(a.runDuration) - parseTimeStr(b.runDuration);
+}
+
 /**
  * 对外暴露子组件方法
  */

src/components/Process/submitVerify.vue

@@ -4,8 +4,8 @@
       <el-form-item label="消息提醒">
         <el-checkbox-group v-model="form.messageType">
           <el-checkbox value="1" name="type" disabled>站内信</el-checkbox>
-          <el-checkbox value="2" name="type">邮件</el-checkbox>
+          <el-checkbox value="2" name="type" disabled>邮件</el-checkbox>
-          <el-checkbox value="3" name="type">短信</el-checkbox>
+          <el-checkbox value="3" name="type" disabled>短信</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="附件">

src/permission.ts

@@ -18,7 +18,7 @@ const isWhiteList = (path: string) => {
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
-  if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode') {
+  if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode' || to.path == '/codeDetail') {
     next();
   } else if (getToken()) {
     to.meta.title && useSettingsStore().setTitle(to.meta.title);

src/plugins/index.ts

@@ -10,6 +10,7 @@ import { download as dl } from '@/utils/request';
 import { useDict } from '@/utils/dict';
 import { getConfigKey, updateConfigByKey } from '@/api/system/config';
 import { parseTime, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi';
+import { downloadFile } from '@/utils/useFileDownload';
 
 import { App } from 'vue';
 
@@ -40,4 +41,5 @@ export default function installPlugin(app: App) {
   app.config.globalProperties.selectDictLabel = selectDictLabel;
   app.config.globalProperties.selectDictLabels = selectDictLabels;
   app.config.globalProperties.animate = animate;
+  app.config.globalProperties.downloadFile = downloadFile;
 }

src/router/index.ts

@@ -99,11 +99,21 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/gisHome/index.vue'),
     hidden: true
   },
+  {
+    path: '/largeScreen',
+    component: () => import('@/views/largeScreen/index.vue'),
+    hidden: true
+  },
   {
     path: '/indexEquipment',
     component: () => import('@/views/materials/orderEquipment/indexEquipment.vue'),
     hidden: true
   },
+  {
+    path: '/codeDetail',
+    component: () => import('@/views/design/volumeCatalog/codeDetail.vue'),
+    hidden: true
+  },
   {
     path: '/drone',
     component: () => import('@/views/drone/index.vue'),

src/utils/useFileDownload.js

@@ -0,0 +1,63 @@
+import { ElMessage } from 'element-plus';
+
+/**
+ * 下载文件下载工具函数
+ * @param {string} fileUrl - 文件地址
+ * @param {string} [fileName] - 可选，指定文件名
+ * @param {Object} [headers] - 可选，请求头（如携带token）
+ */
+export const downloadFile = async (fileUrl, fileName, headers = {}) => {
+  try {
+    // 发起请求获取文件数据
+    const response = await fetch(fileUrl, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/octet-stream',
+        ...headers
+      },
+      credentials: 'include' // 允许携带cookie
+    });
+
+    if (!response.ok) {
+      throw new Error(`下载失败: ${response.statusText}`);
+    }
+
+    // 将响应转换为blob对象
+    const blob = await response.blob();
+
+    // 创建临时URL
+    const url = URL.createObjectURL(blob);
+
+    // 处理文件名
+    let downloadName = fileName;
+    if (!downloadName) {
+      // 从响应头获取文件名
+      const contentDisposition = response.headers.get('content-disposition');
+      if (contentDisposition) {
+        const match = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/);
+        if (match && match[1]) {
+          downloadName = decodeURIComponent(match[1].replace(/['"]/g, ''));
+        }
+      } else {
+        // 从URL提取文件名
+        downloadName = fileUrl.split('/').pop()?.split('?')[0] || 'download_file';
+      }
+    }
+
+    // 创建a标签并触发下载
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = downloadName;
+    link.style.display = 'none'; // 隐藏a标签
+    document.body.appendChild(link);
+    link.click();
+
+    // 清理资源
+    setTimeout(() => {
+      document.body.removeChild(link);
+      URL.revokeObjectURL(url); // 释放临时URL
+    }, 100);
+  } catch (error) {
+    ElMessage.error(`文件下载失败: ${error.message}`);
+  }
+};

src/views/biddingManagemen/appointment/index.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="p-6 bg-gray-50 main">
+    <div class="appWidth2 mx-auto mt-38 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+      <!-- 表单标题区域 -->
+      <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
+        <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
+        <p class="text-blue-100 mt-2 opacity-90">请配置投标管理人员信息</p>
+        <!-- ，带 <span class="text-red-300">*</span> 为必填项 -->
+        <el-button
+          @click="isDisabled = false"
+          class="px-8 py-2.5 transition-all duration-300 font-medium"
+          v-if="isDisabled"
+          v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
+        >
+          点击编辑
+        </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"
+              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-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
+            type="primary"
+            @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']"
+          >
+            确认提交
+          </el-button>
+          <el-button @click="resetForm" icon="Refresh" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
+            重置
+          </el-button>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<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,
+  projectId: currentProject.value?.id,
+  userId: null // 设计负责人
+});
+
+// 表单验证规则
+const rules = reactive({
+  userId: [{ required: true, message: '请选择招投标专员', trigger: 'change' }]
+});
+
+// 用户列表
+const userList = ref([]);
+
+// 表单引用
+const leaveFormRef = ref();
+
+/** 查询当前部门的所有用户 */
+const getDeptAllUser = async (deptId: any) => {
+  const res = await biddingGetUser({});
+  userList.value = res.data;
+};
+
+/** 查询当前表单数据并回显 */
+const getBiddingUser = async () => {
+  if (!currentProject.value?.id) return;
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载配置数据中...',
+    background: 'rgba(255, 255, 255, 0.7)'
+  });
+  try {
+    const res = await biddingUserList(currentProject.value?.id);
+    if (res.code == 200) {
+      if (!res.data) {
+        resetForm();
+        form.id = null;
+        isDisabled.value = false;
+        return;
+      }
+      Object.assign(form, res.data);
+      isDisabled.value = true;
+    }
+  } catch (error) {
+    // 添加默认空项
+  } finally {
+    loading.close();
+  }
+};
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (!leaveFormRef.value) return;
+  try {
+    // 表单验证
+    await leaveFormRef.value.validate();
+    let userName = userList.value.find((item) => item.userId === form.userId)?.userName;
+    const data = {
+      projectId: currentProject.value?.id,
+      userId: form.userId,
+      userName,
+      id: form.id
+    };
+    // 提交到后端
+    const res = await AddbiddingUser(data);
+    if (res.code === 200) {
+      ElMessage.success('提交成功');
+      isDisabled.value = true;
+    } else {
+      ElMessage.error(res.msg || '提交失败');
+    }
+  } catch (error) {
+    ElMessage.error('请完善表单信息后再提交');
+  } finally {
+    // 关闭加载状态
+    ElLoading.service().close();
+  }
+};
+
+/** 重置表单 */
+const resetForm = () => {
+  if (leaveFormRef.value) {
+    leaveFormRef.value.resetFields();
+  }
+};
+
+// 页面挂载时初始化数据
+onMounted(() => {
+  // 先获取用户列表，再加载表单数据
+  getDeptAllUser(userStore.deptId).then(() => {
+    getBiddingUser();
+  });
+});
+
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    getDeptAllUser(userStore.deptId).then(() => {
+      getBiddingUser();
+    });
+  }
+);
+
+onUnmounted(() => {
+  listeningProject();
+});
+</script>
+
+<style lang="scss">
+.main {
+  height: calc(100vh - 90px);
+}
+.appWidth2 {
+  width: 50vw;
+  max-width: 1200px;
+  .el-select__wrapper {
+    width: 16vw !important;
+  }
+  .el-button--small {
+    margin-bottom: 10px;
+  }
+  .fonts {
+    .el-form-item--default .el-form-item__label {
+      font-size: 18px !important;
+    }
+  }
+}
+
+// 自定义动画
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.animate-fadeIn {
+  animation: fadeIn 0.3s ease-out forwards;
+}
+
+// 表单样式优化
+::v-deep .el-form {
+  --el-form-item-margin-bottom: 0;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 0;
+
+  &__label {
+    font-weight: 500;
+    color: #4e5969;
+    padding: 0 0 8px 0;
+  }
+
+  &__content {
+    padding: 0;
+  }
+}
+
+::v-deep .el-select {
+  width: 100%;
+
+  .el-input__inner {
+    border-radius: 6px;
+    transition: all 0.3s ease;
+  }
+
+  &:hover .el-input__inner {
+    border-color: #66b1ff;
+  }
+
+  &.el-select-focus .el-input__inner {
+    border-color: #409eff;
+    box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+  }
+}
+
+::v-deep .el-button {
+  border-radius: 6px;
+  padding: 8px 16px;
+
+  &--primary {
+    background-color: #409eff;
+    border-color: #409eff;
+
+    &:hover {
+      background-color: #66b1ff;
+      border-color: #66b1ff;
+    }
+  }
+
+  &--danger {
+    background-color: #f56c6c;
+    border-color: #f56c6c;
+
+    &:hover {
+      background-color: #f78989;
+      border-color: #f78989;
+    }
+
+    &:disabled {
+      background-color: #ffcccc;
+      border-color: #ffbbbb;
+      cursor: not-allowed;
+    }
+  }
+}
+
+// 响应式网格布局
+.grid {
+  display: grid;
+}
+
+.grid-cols-1 {
+  grid-template-columns: repeat(1, minmax(0, 1fr));
+}
+
+.md\:grid-cols-2 {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.gap-4 {
+  gap: 1rem;
+}
+
+// 适配小屏幕
+@media (max-width: 768px) {
+  .appWidth2 {
+    width: 95vw;
+  }
+
+  ::v-deep .el-form {
+    padding: 4px;
+  }
+
+  ::v-deep .el-form-item__label {
+    width: 100px;
+  }
+}
+</style>

src/views/biddingManagemen/biddingLimit/index.vue

@@ -0,0 +1,239 @@
+<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="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>
+      </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="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"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleSave(scope.row)"
+              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 { obtainAllVersionNumbers } from '@/api/contract/index';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+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 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) {
+        queryForm.value.versions = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
+//选择版本号
+const changeVersions = () => {
+  getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+  getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+  try {
+    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();
+    }
+  } catch (error) {}
+};
+//获取表格
+const getTableData = async () => {
+  loading.value = true;
+  console.log(212121);
+  
+  const params = {
+    projectId: currentProject.value?.id,
+    sheet: queryForm.value.sheet
+  };
+  const res = await getTreeLimit(params);
+  loading.value = false;
+  if (res.code == 200) {
+    tableData.value = [res.data[0]];
+  }
+  console.log(loading.value);
+};
+//修改单价
+const handleSave = (row: any) => {
+  try {
+    if (!row.unitPrice) {
+      ElMessage({
+        message: '请输入单价',
+        type: 'warning'
+      });
+      return;
+    }
+    loading.value = true;
+    biddingLimitListUpdate(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getTableData();
+      }
+    });
+  } catch (error) {
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+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();
+  }
+);
+const handleExport = () => {
+  proxy?.download(
+    '/bidding/biddingLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getSheetName();
+});
+</script>
+
+<style scoped></style>

src/views/biddingManagemen/listOfWinningBids/index.vue

@@ -0,0 +1,344 @@
+<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>

src/views/contract/division/index.vue

@@ -0,0 +1,480 @@
+<template>
+  <div class="p-2">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="item.index" :label="item.label" :name="item.value">
+        <el-card shadow="always">
+          <el-form :model="queryForm" :inline="true" ref="queryFormRef">
+            <el-form-item label="名称" prop="versions">
+              <el-input v-model="queryForm.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="内容" prop="sheet">
+              <el-input v-model="queryForm.content" 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-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:segmentedIndicatorPlanning:add']">新增</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+        <el-table :data="tableData" row-key="id" border v-loading="loading">
+          <el-table-column label="序号" width="80" align="center">
+            <template #default="scope">
+              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="名称" />
+          <el-table-column prop="content" label="内容" />
+          <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
+            <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
+              >
+              <el-button type="primary" size="small" @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
+              >
+            </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-tab-pane>
+    </el-tabs>
+    <el-dialog title="新增" v-model="dialogVisible" width="75%" draggable>
+      <el-row>
+        <el-col :span="11">
+          <el-form :model="form" :rules="rules" ref="formRef" label-width="80px">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" clearable />
+            </el-form-item>
+            <el-form-item label="内容" prop="content">
+              <el-input v-model="form.content" placeholder="请输入内容" type="textarea" clearable :rows="4" />
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 20px">
+        <el-col :span="24">
+          <el-card shadow="never">
+            <el-form :model="treeForm" :inline="true">
+              <el-form-item label="表名" prop="sheet">
+                <el-select v-model="treeForm.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(true)">一键展开</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+          <el-table
+            :data="treeData"
+            ref="treeTableRef"
+            v-loading="treeLoading"
+            row-key="id"
+            border
+            lazy
+            default-expand-all
+            @selection-change="handleSelection"
+          >
+            <el-table-column type="selection" width="55" />
+            <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="selectNum" label="选择数量" align="center">
+              <template #default="scope">
+                <el-input-number
+                  :model-value="scope.row.selectNum"
+                  @change="
+                    (val) => {
+                      scope.row.selectNum = val;
+                      handleNumberChange(scope.row);
+                    }
+                  "
+                  :precision="2"
+                  :step="1"
+                  :controls="false"
+                  :max="Math.floor(scope.row.quantity)"
+                  v-if="scope.row.quantity && scope.row.quantity != 0"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center" />
+            <!-- <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price }}
+              </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>
+      </template>
+    </el-dialog>
+    <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
+      <el-table :data="detailData" v-loading="detailLoading" 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="unitPrice" label="单价" align="center" />
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useUserStoreHook } from '@/store/modules/user';
+import { getDicts } from '@/api/system/dict/data';
+import { Plus } from '@element-plus/icons-vue';
+import { FormInstance } from 'element-plus';
+import { treeList, sheetList, segmentedIndicatorPlanning, getPlanningList, updatePlanning, delPlanning, getDetailsList } from '@/api/contract/index';
+
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const tabList = ref<any[]>([]);
+const tableData = ref<any[]>([]);
+const queryFormRef = ref();
+const formRef = ref();
+const activeTab = ref();
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10
+});
+const total = ref(0);
+const queryForm = ref({
+  name: '',
+  content: ''
+});
+const dialogVisible = ref(false);
+const form = ref({
+  name: '',
+  content: ''
+});
+
+const rules = ref({
+  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+  content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
+});
+const loading = ref(false);
+
+//字典获取数据
+const getTabsList = async () => {
+  const res = await getDicts('subcontracting_type');
+  if (res.code == 200) {
+    activeTab.value = res.data[0].dictValue;
+    tabList.value = res.data.map((item: any) => {
+      return {
+        label: item.dictLabel,
+        value: item.dictValue
+      };
+    });
+    getList();
+  }
+};
+//获取表格数据
+const getList = async () => {
+  try {
+    loading.value = true;
+    const params = {
+      projectId: currentProject.value?.id,
+      ...queryParams.value,
+      ...queryForm.value,
+      dictName: activeTab.value
+    };
+    const res = await getPlanningList(params);
+    if (res.code == 200) {
+      tableData.value = res.rows;
+      total.value = res.total;
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取数据失败',
+      type: 'error'
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+const handleTabChange = (tabs: any) => {
+  activeTab.value = tabs;
+  getList();
+};
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryForm.value.content = '';
+  queryForm.value.name = '';
+  handleQuery();
+};
+
+const openDialog = () => {
+  dialogVisible.value = true;
+  getSheetName();
+};
+const closeDialog = () => {
+  dialogVisible.value = false;
+  form.value = {
+    name: '',
+    content: ''
+  };
+  formRef.value?.resetFields();
+};
+const treeData = ref<any[]>([]);
+const treeForm = ref({
+  sheet: ''
+});
+const sheets = ref<any[]>([]);
+const treeTableRef = ref();
+const isExpandAll = ref(false);
+const treeLoading = ref(false);
+const selectionData = ref<any>([]);
+//获取表名
+const getSheetName = async () => {
+  try {
+    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) {
+        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) => {
+  selectionData.value = selection;
+};
+const handleNumberChange = (row: any) => {
+  const selectedIds = selectionData.value.map((item) => item.id);
+  nextTick(() => {
+    treeTableRef.value.toggleRowSelection(row, true);
+  });
+  restoreSelections(treeData.value, selectedIds);
+};
+
+//寻找节点选择
+const restoreSelections = (data, selectedIds) => {
+  const traverse = (nodes) => {
+    nodes.forEach((node) => {
+      if (selectedIds.includes(node.id)) {
+        nextTick(() => {
+          treeTableRef.value.toggleRowSelection(node, true);
+        });
+      }
+      if (node.children && node.children.length > 0) {
+        traverse(node.children);
+      }
+    });
+  };
+  traverse(data);
+};
+watch(
+  () => selectionData.value,
+  (newVal, oldVal) => {
+    console.log(newVal, 55555555555555555);
+  }
+);
+
+//选择表名
+const changeSheet = () => {
+  getTreeList();
+};
+
+const toggleExpandAll = (isExpand: boolean) => {
+  treeData.value.forEach((row) => {
+    treeTableRef.value.toggleRowExpansion(row, isExpand);
+  });
+  isExpandAll.value = isExpand;
+};
+//打开获取表数据
+const getTreeList = async () => {
+  try {
+    treeLoading.value = true;
+    const params = {
+      projectId: currentProject.value?.id,
+      sheet: treeForm.value.sheet
+    };
+    const res = await treeList(params);
+    if (res.code == 200) {
+      res.data.forEach((item: any) => {
+        item.selectNum = '';
+      });
+      treeData.value = res.data;
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取表格失败',
+      type: 'error'
+    });
+  } finally {
+    treeLoading.value = false;
+  }
+};
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      try {
+        if (selectionData.value.length == 0) {
+          ElMessage({
+            message: '请选择项目材料',
+            type: 'warning'
+          });
+          return;
+        }
+        const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
+        if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
+          ElMessage.error('存在未填写数量的工程或费用名称，请检查');
+          return;
+        }
+        const limitListBos = newSelectionData.map((item: any) => {
+          return {
+            limitListId: item.id,
+            num: item.selectNum
+          };
+        });
+        const params = {
+          projectId: currentProject.value?.id,
+          ...form.value,
+          dictName: activeTab.value,
+          limitListBos
+        };
+        const res = await segmentedIndicatorPlanning(params);
+        if (res.code == 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success'
+          });
+          closeDialog();
+          getList();
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    } else {
+      console.log('error submit!', fields);
+    }
+  });
+};
+//确定修改
+const handleSave = (row: any) => {
+  try {
+    if (!row.plannedBiddingTime) {
+      ElMessage({
+        message: '请输入计划招标时间',
+        type: 'warning'
+      });
+      return;
+    }
+    updatePlanning(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getList();
+      }
+    });
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+//删除
+const delHandle = (row: any) => {
+  try {
+    const params = { ids: row.id };
+    delPlanning(params).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success'
+        });
+        getList();
+      }
+    });
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '删除失败',
+      type: 'error'
+    });
+  }
+};
+const detailDialog = ref();
+const detailData = ref([]);
+const detailLoading = ref(false);
+
+//详情
+const handleDetail = (row: any) => {
+  detailDialog.value = true;
+  getDetails(row);
+};
+const getDetails = (row: any) => {
+  getDetailsList({ id: row.id }).then((res) => {
+    if (res.code == 200) {
+      detailData.value = res.data;
+    }
+  });
+};
+
+onMounted(() => {
+  getTabsList();
+});
+</script>
+
+<style scoped lang="scss">
+.Region {
+  width: 100%;
+  height: 100%;
+  border: 1px solid #ccc;
+  border-radius: 10px;
+  padding: 10px;
+}
+</style>

src/views/contract/limitPrice/index.vue

@@ -0,0 +1,276 @@
+<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" :label="item" :value="item" />
+            </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(true)">一键展开</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-upload
+              ref="uploadRef"
+              class="upload-demo"
+              :http-request="importExcel"
+              :show-file-list="false"
+              v-hasPermi="['tender:billofquantitiesLimitList: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="['tender:billofquantitiesLimitList:export']">导出excel</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="单位" />
+        <el-table-column prop="quantity" label="数量" />
+        <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"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleSave(scope.row)"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+              v-hasPermi="['tender:billofquantitiesLimitList:edit']"
+              >确定</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<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 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(false);
+
+//获取版本号
+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) {
+        queryForm.value.versions = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+        ElMessage({
+          message: '获取版本号失败',
+          type: 'warning'
+        });
+      }
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取版本号失败',
+      type: 'warning'
+    });
+  }
+};
+//选择版本号
+const changeVersions = () => {
+  getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+  getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+  try {
+    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 = '';
+        ElMessage({
+          message: '获取表名失败',
+          type: 'warning'
+        });
+      }
+      getTableData();
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取表名失败',
+      type: 'warning'
+    });
+  }
+};
+//获取表格
+const getTableData = async () => {
+  try {
+    loading.value = true;
+    const params = {
+      projectId: currentProject.value?.id,
+      versions: queryForm.value.versions,
+      sheet: queryForm.value.sheet
+    };
+    const res = await listBillofquantitiesLimitList(params);
+    if (res.code == 200) {
+      tableData.value = [res.data[0]];
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取表格失败',
+      type: 'error'
+    });
+    tableData.value = [];
+    loading.value = false;
+  } finally {
+    loading.value = false;
+  }
+};
+//修改单价
+const handleSave = (row: any) => {
+  try {
+    if (!row.unitPrice) {
+      ElMessage({
+        message: '请输入单价',
+        type: 'warning'
+      });
+      return;
+    }
+    loading.value = true;
+    updatePrice(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getTableData();
+      }
+    });
+  } catch (error) {
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+const tableRef = ref<any>();
+
+const toggleExpandAll = (isExpand: boolean) => {
+  tableData.value.forEach((row) => {
+    tableRef.value.toggleRowExpansion(row, isExpand);
+  });
+  isExpandAll.value = isExpand;
+};
+//导入
+const importExcel = (options: any): any => {
+  let formData = new FormData();
+  formData.append('file', options.file);
+  loading.value = true;
+  importExcelFile({ projectId: currentProject.value?.id }, formData)
+    .then((res) => {
+      const { code } = res;
+      if (code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getTableData();
+      } else {
+        proxy.$modal.msgError(res.msg || '导入失败');
+      }
+    })
+    .catch((err) => {
+      proxy.$modal.msgError(err.msg || '导入失败');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    getVersionNums();
+  }
+);
+const handleExport = () => {
+  proxy?.download(
+    '/tender/billofquantitiesLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  // getVersionNums();
+  getSheetName();
+});
+</script>
+
+<style scoped></style>

src/views/ctr/expensesContract/index.vue

@@ -0,0 +1,291 @@
+<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">
+            <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-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="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="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>
+          </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="500px" append-to-body>
+      <el-form ref="expensesContractFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目ID" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目ID" />
+        </el-form-item>
+        <el-form-item label="合同编号" prop="contractCode">
+          <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+        </el-form-item>
+        <el-form-item label="供应商" prop="contractSupplier">
+          <el-input v-model="form.contractSupplier" 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="请输入合同金额" />
+        </el-form-item>
+        <el-form-item label="招标Id" prop="tenderId">
+          <el-input v-model="form.tenderId" placeholder="请输入招标Id" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </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>
+    <FileList v-model="fileListVisible" :fileList="fileList" />
+
+  </div>
+</template>
+
+<script setup name="ExpensesContract" lang="ts">
+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';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const expensesContractList = ref<ExpensesContractVO[]>([]);
+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 fileListVisible = ref(false); // 控制附件列表对话框的显示
+const fileList = ref<Array<any>>([]); // 文件列表
+
+const queryFormRef = ref<ElFormInstance>();
+const expensesContractFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ExpensesContractForm = {
+  id: undefined,
+  projectId: undefined,
+  contractCode: undefined,
+  contractType: undefined,
+  contractSupplier: undefined,
+  contractedContent: undefined,
+  amount: undefined,
+  tenderId: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ExpensesContractForm, ExpensesContractQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: undefined,
+    contractCode: undefined,
+    contractType: undefined,
+    contractSupplier: undefined,
+    contractedContent: undefined,
+    amount: undefined,
+    tenderId: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键ID不能为空", trigger: "blur" }
+    ],
+    projectId: [
+      { required: true, message: "项目ID不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询支出合同列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listExpensesContract(queryParams.value);
+  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);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加支出合同";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ExpensesContractVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getExpensesContract(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改支出合同";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  expensesContractFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateExpensesContract(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addExpensesContract(form.value).finally(() => buttonLoading.value = false);
+      }
+      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 delExpensesContract(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  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("获取文件列表失败");
+  });
+
+}
+onMounted(() => {
+  getList();
+});
+</script>

src/views/ctr/incomeContract/index.vue

@@ -0,0 +1,280 @@
+<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">
+            <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-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" />
+        <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">
+          <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>
+          </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="500px" append-to-body>
+      <el-form ref="incomeContractFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目ID" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目ID" />
+        </el-form-item>
+        <el-form-item label="合同编号" prop="contractCode">
+          <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+        </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="请输入合同金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </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>
+    <FileList v-model="fileListVisible" :fileList="fileList" />
+  </div>
+</template>
+
+<script setup name="IncomeContract" lang="ts">
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
+import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
+import FileList from '@/components/FileList/index.vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const incomeContractList = ref<IncomeContractVO[]>([]);
+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 fileListVisible = ref(false); // 控制附件列表对话框的显示
+const queryFormRef = ref<ElFormInstance>();
+const incomeContractFormRef = ref<ElFormInstance>();
+const fileList = ref<Array<any>>([]); // 文件列表
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: IncomeContractForm = {
+  id: undefined,
+  projectId: undefined,
+  contractCode: undefined,
+  contractType: undefined,
+  contractOwner: undefined,
+  contractedContent: undefined,
+  amount: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<IncomeContractForm, IncomeContractQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: undefined,
+    contractCode: undefined,
+    contractType: undefined,
+    contractOwner: undefined,
+    contractedContent: undefined,
+    amount: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键ID不能为空", trigger: "blur" }
+    ],
+    projectId: [
+      { required: true, message: "项目ID不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询收入合同列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listIncomeContract(queryParams.value);
+  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);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加收入合同";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: IncomeContractVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getIncomeContract(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改收入合同";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  incomeContractFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateIncomeContract(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addIncomeContract(form.value).finally(() => buttonLoading.value = false);
+      }
+      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 delIncomeContract(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  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("获取文件列表失败");
+  });
+
+}
+onMounted(() => {
+  getList();
+});
+</script>

src/views/ctr/index.vue

@@ -0,0 +1,347 @@
+<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="项目名称">
+                            <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-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="contractSupplier">
+                            <el-input v-model="form.contractSupplier" 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
+                                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+                                v-model="form.amount" placeholder="请输入合同金额" />
+                        </el-form-item>
+                        <el-form-item label="招标Id" prop="tenderId">
+                            <el-input v-model="form.tenderId" placeholder="请输入招标Id" />
+                        </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="120" 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>
+        </div>
+
+    </div>
+</template>
+<script setup>
+import FileUpload from '@/components/FileUpload';
+import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract } from '@/api/ctr/expensesContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+
+const active = ref(0);
+const contract_type = ref("")
+const form = ref({ payType: 1 })
+const fileList = ref([])
+const tempFileList = ref([])
+const { proxy } = getCurrentInstance();
+
+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' }],
+};
+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: false, message: '请输入招标Id', 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' }],
+};
+
+const project = computed(() => {
+    return JSON.parse(localStorage.getItem("selectedProject"))
+});
+
+const checkContractType = (type) => {
+    contract_type.value = type;
+    form.value.contract_type = type;
+    active.value = 1;
+    form.value.step = active.value;
+};
+const onUploadSuccess = (data) => {
+    fileList.value = data
+}
+const back = async (reset) => {
+    if (reset) {
+        await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }).then(() => {
+            resetForm();
+            active.value--;
+        }).catch(() => {
+            return;
+        });
+    } else {
+        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);
+
+    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 = '';
+    active.value = 0;
+    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('请填写完整的支出合同信息');
+    //         }
+    //     });
+    // }
+}
+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;
+
+        }).catch(() => {
+            localStorage.removeItem("tempContractForm");
+        });
+
+    }
+});
+</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>

src/views/design/Professional/index.vue

@@ -35,46 +35,33 @@
             <dict-tag :options="wf_business_status" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-row :gutter="10" class="mb8">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:extract:query']">审核</el-button>
-              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+            <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['design:extract:export']">导出</el-button
-                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:extract:query']">审核</el-button>
+            ><el-button
-              </el-col>
+              link
-              <el-col :span="1.5" v-if="scope.row.status === 'finish'">
+              type="warning"
-                <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['design:extract:export']"
+              icon="View"
-                  >导出</el-button
+              v-if="scope.row.status != 'draft'"
-                >
+              v-hasPermi="['design:extract:query']"
-              </el-col>
+              @click="handleViewInfo(scope.row)"
-              <el-col :span="1.5">
+              >查看流程</el-button
-                <el-button
+            ><el-button
-                  link
+              link
-                  type="warning"
+              type="warning"
-                  icon="View"
+              icon="View"
-                  v-if="scope.row.status != 'draft'"
+              v-if="scope.row.status != 'draft'"
-                  v-hasPermi="['design:extract:query']"
+              v-hasPermi="['design:extract:query']"
-                  @click="handleViewInfo(scope.row)"
+              @click="handleFile(scope.row)"
-                  >查看流程</el-button
+              >查看文件</el-button
-                >
+            >
-              </el-col>
-              <el-col :span="1.5">
-                <el-button
-                  link
-                  type="warning"
-                  icon="View"
-                  v-if="scope.row.status != 'draft'"
-                  v-hasPermi="['design:extract:query']"
-                  @click="handleFile(scope.row)"
-                  >查看文件</el-button
-                >
-              </el-col>
-            </el-row>
           </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="提取文件列表" v-model="viewVisible" width="500px">
+    <el-dialog title="文件列表" v-model="viewVisible" width="800px">
       <el-table :loading="loadingFlie" :data="fileList" style="width: 100%" border>
         <el-table-column prop="fileName" label="文件名称" align="center">
           <template #default="scope">
@@ -89,19 +76,17 @@
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column label="是否变更" align="center" width="120">
+        <el-table-column label="版本号" align="center" width="120" prop="version"> </el-table-column>
+        <el-table-column label="文件类型" width="120" align="center">
           <template #default="scope">
-            <el-tag :type="scope.row.type == 1 ? 'success' : 'info'">{{ scope.row.type == 1 ? '否' : '是' }}</el-tag>
+            <el-tag type="success" v-if="scope.row.type == 1">过程图纸</el-tag>
-          </template>
+            <el-tag type="primary" v-if="scope.row.type == 3">蓝图</el-tag>
-        </el-table-column>
+            <el-tag type="danger" v-if="scope.row.type == 4">作废图纸</el-tag>
-        <el-table-column label="状态" width="120" align="center">
-          <template #default="scope">
-            <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">{{ scope.row.status == 1 ? '使用中' : '已作废' }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="170" align="center">
           <template #default="scope">
-            <el-button type="success" link icon="View" @click="handleViewFile(scope.row)"> 查看 </el-button>
+            <el-button type="success" v-if="viewFlie == 'finish'" link icon="View" @click="handleViewFile(scope.row)"> 查看 </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -131,6 +116,7 @@ const showSearch = ref(true);
 const loading = ref(false);
 const loadingFlie = ref(false);
 const viewVisible = ref(false); //文件列表展示
+const viewFlie = ref('');
 const fileList = ref([]);
 const data = reactive({
   queryParams: {
@@ -205,10 +191,11 @@ const handleDownload = (row) => {
   );
 };
 const handleViewFile = (row) => {
-  window.open(row.docUrl, '_blank');
+  window.open(row.fileUrl, '_blank');
 };
 const handleFile = async (row) => {
   // 查看文件
+  viewFlie.value = row.status;
   viewVisible.value = true;
   loadingFlie.value = true;
   let res = await getFileList(row.id);

src/views/design/billofQuantities/index.vue

@@ -44,7 +44,11 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button v-if="Object.keys(state.versionsData).length === 0 || state.versionsData.status == 'cancel'" type="primary">导入excel</el-button>
+              <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false" style="margin-right: 10px;">
+                <template #trigger>
+                  <el-button type="primary">导入excel</el-button>
+                </template>
+              </el-upload>
               <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit"
                 @click="clickApprovalSheet()">审核</el-button>
               <el-button v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
@@ -129,6 +133,7 @@ const handleTabChange = (tab) => {
   state.queryForm.sheet = '';
   state.queryForm.versions = '';
   state.work_order_type = tab;
+  state.versionsData = {};
   if (tab <= 2) {
     getVersionNums();
   } else {
@@ -158,6 +163,7 @@ async function getVersionNums(isSheet = true) {
         state.queryForm.versions = state.options[0].versions;
         // if (state.work_order_type == 3) {
         state.versionsData = state.options[0] || [];
+        console.log('state.versionsData', state.versionsData);
           // console.log('state.versionsData', state.versionsData);
         // }
         // 等待表名加载完成

src/views/design/condition/comm/filePage.vue

@@ -25,7 +25,7 @@
         </el-table-column>
         <el-table-column label="操作">
           <template #default="scope">
-            <el-button link type="primary" icon="Download" @click="onExport(scope.row.fileUrl)">下载</el-button>
+            <el-button link type="primary" icon="Download" @click="onExport(scope.row)">下载</el-button>
             <el-button type="success" link icon="edit" v-show="scope.row.status == 'draft'" @click="onUpdate(scope.row)">审核</el-button>
             <el-button link type="warning" v-show="scope.row.status != 'draft'" icon="View" @click="onView(scope.row)">查看流程</el-button>
           </template>
@@ -117,28 +117,12 @@ const onView = (row) => {
     }
   });
 };
-const onExport = (fileUrl) => {
+const onExport = (row) => {
-  if (!fileUrl) {
+  if (!row.fileUrl) {
     proxy.$modal.error('文件地址不存在，无法下载');
     return;
   }
-  try {
+  proxy.downloadFile(row.fileUrl, row.fileName);
-    // 创建一个隐藏的a标签
-    const link = document.createElement('a');
-    // 设置下载地址
-    link.href = fileUrl;
-    // 从URL中提取文件名作为下载文件名
-    const fileName = fileUrl.split('/').pop();
-    link.download = fileName || 'download file';
-    // 触发点击事件
-    link.click();
-    // 下载后移除a标签
-    document.body.removeChild(link);
-    // 显示下载成功提示
-    proxy.$modal.success('文件开始下载');
-  } catch (error) {
-    // proxy.$modal.error('下载失败，请稍后重试');
-  }
 };
 // 页面挂载时初始化数据
 onMounted(() => {

src/views/design/designChange/index.vue

@@ -65,8 +65,9 @@
           </template>
         </el-table-column>
         <el-table-column label="变更内容" align="center" prop="changeContent" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
-        <el-table-column label="操作" fixed="right" width="300">
+        <el-table-column label="备注" align="center" prop="remark" width="200" />
+        <el-table-column label="操作" align="center" fixed="right" width="300">
           <template #default="scope">
             <el-button
               type="primary"

src/views/design/designChange/indexEdit.vue

@@ -242,7 +242,8 @@ const data = reactive({
   },
   rules: {
     // 卷册号
-    volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }]
+    volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }],
+    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }]
   }
 });
 

src/views/design/drawing/index.vue

@@ -56,14 +56,14 @@
           <el-table-column label="操作" align="center" prop="remark" width="300">
             <template #default="scope">
               <el-button link type="primary" icon="view" @click="handleViewHis(scope.row)">查阅记录</el-button>
-              <el-button type="danger" link icon="Download" @click="handleDownload(scope.row)"> 下载 </el-button>
+              <el-button type="warning" link icon="Download" @click="handleDownload(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" />
       </el-card>
     </div>
-    <el-dialog draggable title="查阅记录" v-model="viewVisible1" width="500px">
+    <el-dialog draggable title="查阅记录" v-model="viewVisible1" width="600px">
       <el-table :data="histroyList" style="width: 100%" border>
         <el-table-column type="index" label="序号" align="center" width="80"> </el-table-column>
         <el-table-column prop="userName" label="用户名称" align="center"> </el-table-column>
@@ -73,7 +73,7 @@
             <el-tag type="success" v-else>查看</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="查阅时间" align="center"> </el-table-column>
+        <el-table-column prop="createTime" label="查阅时间" align="center" width="200"> </el-table-column>
       </el-table>
       <template #footer>
         <span>

src/views/design/drawingreview/detailForm.vue

@@ -68,6 +68,7 @@
             <el-input v-model="formData.designer" placeholder="请输入设计人" />
           </el-form-item>
         </el-col>
+        <el-col :span="12"></el-col>
         <el-col :span="12">
           <el-form-item label="校审人员" prop="proofreading">
             <el-input v-model="formData.proofreading" placeholder="请输入校审人员" />

src/views/design/volumeCatalog/codeDetail.vue

@@ -0,0 +1,468 @@
+<template>
+  <div
+    class="min-h-screen bg-gradient-to-b from-gray-50 to-gray-100 dark:from-gray-900 dark:to-gray-850 text-gray-800 dark:text-gray-200 transition-colors duration-300"
+  >
+    <!-- 页面头部 -->
+    <header class="bg-white/90 dark:bg-gray-800/90 backdrop-blur-sm shadow-sm sticky top-0 z-10 border-b border-gray-100 dark:border-gray-700/50">
+      <div class="container mx-auto px-4 py-3 flex justify-between items-center">
+        <div class="flex items-center gap-2">
+          <el-icon style="margin-right: 10px" :size="32" color="#409EFF">
+            <Document />
+          </el-icon>
+          <h1 class="text-xl font-bold text-primary">资料详情</h1>
+        </div>
+        <button
+          v-if="info.fileUrl"
+          @click="handleDownload"
+          class="flex items-center gap-2 bg-primary hover:bg-primary/90 text-white px-3.5 py-1.5 rounded-lg transition-all duration-200 shadow-sm hover:shadow hover:-translate-y-0.5 active:translate-y-0 text-sm"
+        >
+          <i class="fa fa-download"></i>
+          <span>下载资料</span>
+        </button>
+      </div>
+    </header>
+
+    <!-- 加载状态 -->
+    <div v-if="loading" class="container mx-auto px-4 py-12 flex justify-center items-center min-h-[40vh]">
+      <div class="flex flex-col items-center bg-white dark:bg-gray-800 p-6 rounded-xl shadow-sm">
+        <div class="w-12 h-12 border-4 border-primary border-t-transparent rounded-full animate-spin mb-3"></div>
+        <p class="text-gray-600 dark:text-gray-400 text-base">加载资料信息中...</p>
+        <p class="text-gray-500 dark:text-gray-500 text-xs mt-1">请稍候，正在获取最新数据</p>
+      </div>
+    </div>
+
+    <!-- 错误状态 -->
+    <div v-if="error" class="container mx-auto px-4 py-12">
+      <div class="bg-white dark:bg-gray-800 rounded-xl p-6 shadow-sm border border-red-100 dark:border-red-900/30">
+        <div class="flex flex-col items-center text-center">
+          <div class="w-12 h-12 rounded-full bg-red-100 dark:bg-red-900/20 flex items-center justify-center text-red-500 mb-3">
+            <i class="fa fa-exclamation-circle text-xl"></i>
+          </div>
+          <h3 class="font-semibold text-red-800 dark:text-red-400 text-lg mb-2">加载失败</h3>
+          <p class="mt-1 text-red-700 dark:text-red-300 max-w-md mb-4 text-sm">无法获取资料信息，可能是网络问题或数据不存在，请稍后重试</p>
+          <button
+            @click="retryLoad"
+            class="px-5 py-2 bg-primary hover:bg-primary/90 text-white rounded-lg transition-all duration-200 shadow-sm hover:shadow flex items-center gap-2 text-sm"
+          >
+            <i class="fa fa-refresh"></i>
+            <span>重试加载</span>
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 信息卡片 -->
+    <main v-if="!loading && !error && Object.keys(info).length" class="container mx-auto px-4 py-5 md:py-6">
+      <div
+        class="bg-white dark:bg-gray-800 rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md transform hover:-translate-y-0.5"
+      >
+        <!-- 卡片头部 - 降低背景深度，增强标题对比度 -->
+        <div
+          class="bg-gradient-to-r from-primary/1 to-primary/3 dark:from-primary/3 dark:to-primary/6 p-4 md:p-5 border-b border-gray-100 dark:border-gray-700/50"
+        >
+          <div class="flex flex-wrap justify-between items-center gap-2">
+            <h2 style="color: #fff" class="text-lg md:text-xl font-bold text-primary flex items-center">
+              <i class="fa fa-file-text-o mr-2 text-lg"></i>
+              <span>{{ info.documentName || '资料详情' }}</span>
+            </h2>
+            <span :class="typeClass" class="inline-flex items-center px-2.5 py-0.75 rounded-full text-xs font-medium">
+              <i class="fa fa-tag mr-1"></i>
+              {{ typeText }}
+            </span>
+          </div>
+          <!-- 副标题放大，增强可读性 -->
+          <p class="mt-1.5 text-gray-700 dark:text-gray-300 text-base md:text-lg" style="color: #e5e5e5; font-weight: 600">
+            资料名称: {{ info.projectName || '未定义' }} | 卷册号: {{ info.volumeNumber || '未定义' }}
+          </p>
+        </div>
+
+        <!-- 基本信息区域 - 缩小间隔，增强label与内容区分 -->
+        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
+          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
+            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
+              <Document />
+            </el-icon>
+
+            基本信息
+          </h3>
+
+          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-2 md:gap-3">
+            <InfoItem label="项目名称" value="projectName" :data="info" />
+            <InfoItem label="资料名称" value="documentName" :data="info" />
+            <InfoItem label="卷册号" value="volumeNumber" :data="info" />
+            <InfoItem label="设计子项名称" value="designSubitem" :data="info" />
+            <InfoItem label="专业名称" value="specialtyName" :data="info" />
+            <InfoItem label="文件格式" value="fileType" :data="info" />
+          </div>
+        </div>
+
+        <!-- 人员信息区域 -->
+        <div class="p-3 md:p-4 border-b border-gray-100 dark:border-gray-700/50">
+          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
+            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
+              <Document />
+            </el-icon>
+            人员信息
+          </h3>
+
+          <div class="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-3">
+            <InfoItem label="负责人" value="principal" :data="info" />
+            <InfoItem label="设计人员" value="principalName" :data="info" />
+            <InfoItem label="审核人员" value="reviewerName" :data="info" />
+            <InfoItem label="创建时间" value="createTime" :data="info" />
+          </div>
+        </div>
+
+        <!-- 状态信息区域 -->
+        <div class="p-3 md:p-4">
+          <h3 class="text-base md:text-lg font-semibold mb-2 flex items-center text-gray-800 dark:text-gray-200">
+            <el-icon style="margin-right: 10px" :size="24" color="#409EFF">
+              <Document />
+            </el-icon>
+            状态信息
+          </h3>
+
+          <div class="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-3">
+            <div class="info-item">
+              <span class="info-label">图纸类型</span>
+              <div class="info-value mt-0.5">
+                <span :class="typeClass" class="inline-flex items-center px-2.5 py-0.75 rounded-full text-xs font-medium">
+                  <i class="fa fa-file-image-o mr-1"></i>
+                  {{ typeText }}
+                </span>
+              </div>
+            </div>
+
+            <div class="info-item">
+              <span class="info-label">是否最新版本</span>
+              <div class="info-value mt-0.5">
+                <span
+                  :class="
+                    isLatest
+                      ? 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400'
+                      : 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300'
+                  "
+                  class="inline-flex items-center px-2.5 py-0.75 rounded-full text-xs font-medium"
+                >
+                  <i :class="isLatest ? 'fa fa-check-circle' : 'fa fa-clock-o'" class="mr-1"></i>
+                  {{ isLatest ? '是 (最新版)' : '否' }}
+                </span>
+              </div>
+            </div>
+
+            <div class="info-item">
+              <span class="info-label">文件大小</span>
+              <div class="info-value mt-0.5 flex items-center">
+                <i class="fa fa-hdd-o text-gray-400 dark:text-gray-500 mr-1.5"></i>
+                {{ info.fileSize || '未知' }}
+              </div>
+            </div>
+
+            <div class="info-item">
+              <span class="info-label">更新时间</span>
+              <div class="info-value mt-0.5 flex items-center">
+                <i class="fa fa-calendar-o text-gray-400 dark:text-gray-500 mr-1.5"></i>
+                {{ info.updateTime || '未更新' }}
+              </div>
+            </div>
+          </div>
+
+          <!-- 文件信息补充 - 缩小内边距 -->
+          <div v-if="info.fileUrl" class="mt-3 p-2.5 bg-gray-50 dark:bg-gray-700/30 rounded-lg border border-gray-100 dark:border-gray-700">
+            <div class="flex flex-wrap items-center justify-between gap-3">
+              <div class="flex items-center">
+                <el-icon style="margin-right: 10px" :size="30" color="#409EFF">
+                  <Notebook />
+                </el-icon>
+                <div>
+                  <h4 class="font-medium text-gray-800 dark:text-white text-sm">文件下载</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400">点击按钮下载完整资料文件</p>
+                </div>
+              </div>
+              <button
+                @click="handleDownload"
+                class="flex items-center gap-2 bg-primary hover:bg-primary/90 text-white px-4 py-1.5 rounded-lg transition-all duration-200 shadow-sm hover:shadow text-sm"
+              >
+                <i class="fa fa-cloud-download"></i>
+                <span>立即下载</span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+
+    <!-- 空状态 -->
+    <div
+      v-if="!loading && !error && !Object.keys(info).length"
+      class="container mx-auto px-4 py-12 flex flex-col items-center justify-center min-h-[40vh]"
+    >
+      <div class="bg-white dark:bg-gray-800 p-6 rounded-xl shadow-sm text-center max-w-md w-full">
+        <div class="w-16 h-16 rounded-full bg-gray-100 dark:bg-gray-700/50 flex items-center justify-center mb-4">
+          <i class="fa fa-file-text-o text-3xl text-gray-400 dark:text-gray-500"></i>
+        </div>
+        <h3 class="text-base font-medium text-gray-700 dark:text-gray-300 mb-2">暂无资料信息</h3>
+        <p class="text-gray-500 dark:text-gray-400 mb-4 text-sm">未找到相关资料的详细信息，请检查访问参数是否正确，或联系管理员获取帮助</p>
+        <button
+          @click="goBack"
+          class="px-5 py-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-700 dark:hover:bg-gray-600 text-gray-700 dark:text-gray-300 rounded-lg transition-all duration-200 text-sm"
+        >
+          <i class="fa fa-arrow-left mr-1.5"></i>
+          返回上一页
+        </button>
+      </div>
+    </div>
+    <footer class="bg-white/80 dark:bg-gray-800/80 backdrop-blur-sm border-t border-gray-100 dark:border-gray-700/50 py-2.5 mt-6">
+      <div class="container mx-auto px-4 text-center text-gray-500 dark:text-gray-400 text-xs">
+        <p>© 2025 煤科建管平台</p>
+      </div>
+    </footer>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, defineComponent, h } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { codeInfo } from '@/api/design/volumeCatalog';
+
+// 使用渲染函数定义InfoItem组件，避免运行时模板编译
+const InfoItem = defineComponent({
+  props: {
+    label: {
+      type: String,
+      required: true
+    },
+    value: {
+      type: String,
+      required: true
+    },
+    data: {
+      type: Object,
+      required: true,
+      default: () => ({})
+    }
+  },
+  // 使用渲染函数h()替代template
+  render() {
+    const displayValue = this.data[this.value] !== undefined && this.data[this.value] !== null ? this.data[this.value] : '-';
+
+    return h('div', { class: 'info-item' }, [
+      h('span', { class: 'info-label' }, this.label),
+      h('div', { class: 'info-value mt-0.5 flex items-center' }, [h('span', { class: 'block' }, displayValue)])
+    ]);
+  }
+});
+
+const route = useRoute();
+const router = useRouter();
+const info = ref<Record<string, any>>({});
+const loading = ref(true);
+const error = ref(false);
+
+// 获取用户信息
+const getcodeInfo = async (id: string) => {
+  try {
+    loading.value = true;
+    error.value = false;
+    let res = await codeInfo(id);
+    if (res && res.data) {
+      info.value = res.data;
+      // 补充文件类型和大小信息（模拟数据，实际应从接口获取）
+      if (info.value.fileUrl) {
+        const urlParts = info.value.fileUrl.split('.');
+        info.value.fileType = urlParts.length > 1 ? urlParts.pop()?.toUpperCase() : 'UNKNOWN';
+        info.value.fileSize = info.value.fileSize || `${(Math.random() * 20 + 1).toFixed(1)} MB`;
+        info.value.createTime = info.value.createTime || new Date(Date.now() - Math.random() * 30 * 24 * 60 * 60 * 1000).toLocaleString();
+        info.value.updateTime = info.value.updateTime || new Date(Date.now() - Math.random() * 10 * 24 * 60 * 60 * 1000).toLocaleString();
+        info.value.reviewerName = info.value.reviewerName || '张审核';
+      }
+    } else {
+      info.value = {};
+    }
+  } catch (err) {
+    console.error('获取信息失败:', err);
+    error.value = true;
+    info.value = {};
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 重试加载
+const retryLoad = () => {
+  const data = route.query;
+  if (data.id && typeof data.id === 'string') {
+    getcodeInfo(data.id);
+  }
+};
+
+// 返回上一页
+const goBack = () => {
+  router.go(-1);
+};
+
+// 处理下载
+const handleDownload = () => {
+  if (info.value.fileUrl) {
+    const link = document.createElement('a');
+    link.href = info.value.fileUrl;
+    link.download = info.value.documentName || '资料文件';
+    // 添加下载动画反馈
+    const downloadBtn = document.querySelector('.bg-primary:has(.fa-download), .bg-primary:has(.fa-cloud-download)');
+    if (downloadBtn) {
+      downloadBtn.classList.add('animate-pulse');
+    }
+
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+
+    // 移除动画反馈
+    setTimeout(() => {
+      if (downloadBtn) {
+        downloadBtn.classList.remove('animate-pulse');
+      }
+    }, 1000);
+  }
+};
+
+// 计算图纸类型文本
+const typeText = computed(() => {
+  const type = typeof info.value.type === 'string' ? parseInt(info.value.type, 10) : info.value.type;
+
+  switch (type) {
+    case 1:
+      return '过程图纸';
+    case 3:
+      return '蓝图';
+    case 4:
+      return '作废图纸';
+    default:
+      // 显示实际收到的值，帮助调试
+      return `未知类型 (值: ${type})`;
+  }
+});
+
+// 计算图纸类型样式
+const typeClass = computed(() => {
+  switch (info.value.type) {
+    case 1:
+      return 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-400';
+    case 3:
+      return 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-400';
+    case 4:
+      return 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400';
+    default:
+      return 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300';
+  }
+});
+
+// 计算是否最新
+const isLatest = computed(() => {
+  return info.value.isLatest === true;
+});
+
+onMounted(() => {
+  const data = route.query;
+  if (data.id && typeof data.id === 'string') {
+    getcodeInfo(data.id);
+  } else {
+    loading.value = false;
+    error.value = true;
+  }
+});
+</script>
+
+<style scoped>
+/* 主色调定义 */
+:root {
+  --primary-color: #165dff;
+  --shadow-sm: 0 2px 4px rgba(0, 0, 0, 0.05);
+  --shadow: 0 4px 6px rgba(0, 0, 0, 0.08);
+}
+
+/* 信息项样式优化 - 增强label与内容颜色区分，缩小间距 */
+.info-item {
+  @apply py-1.5 rounded-lg hover:bg-gray-50/70 dark:hover:bg-gray-700/15 p-2 transition-colors duration-200;
+}
+
+/* Label颜色加深，与内容形成明显对比 */
+.info-label {
+  @apply text-xs text-gray-500 dark:text-gray-400 font-medium flex items-center;
+  display: block;
+}
+
+/* 内容颜色增强可读性 */
+.info-value {
+  @apply text-sm text-gray-900 dark:text-white;
+  word-break: break-word;
+}
+
+/* 动画效果 */
+.animate-pulse {
+  animation: pulse 1.5s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+}
+
+@keyframes pulse {
+  0%,
+  100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.7;
+  }
+}
+
+/* 自定义滚动条 */
+::-webkit-scrollbar {
+  @apply w-2 h-2;
+}
+
+::-webkit-scrollbar-track {
+  @apply bg-gray-100 dark:bg-gray-800 rounded-full;
+}
+
+::-webkit-scrollbar-thumb {
+  @apply bg-gray-300 dark:bg-gray-600 rounded-full hover:bg-gray-400 dark:hover:bg-gray-500 transition-colors;
+}
+</style>
+
+<style>
+/* 全局样式 */
+.text-primary {
+  color: #165dff;
+}
+
+.bg-primary {
+  background-color: #165dff;
+}
+
+/* 平滑滚动 - 增强丝滑感 */
+html {
+  scroll-behavior: smooth;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .container {
+    padding-left: 0.75rem !important;
+    padding-right: 0.75rem !important;
+  }
+}
+
+/* 暗色模式优化 */
+.dark {
+  color-scheme: dark;
+}
+
+/* 卡片悬停效果增强柔和度 */
+.bg-white.dark\:bg-gray-800 {
+  transition: all 0.3s ease-in-out;
+}
+
+/* 按钮基础样式 - 增强点击反馈 */
+button {
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+</style>

src/views/design/volumeCatalog/comm/histroy.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="volume-catalog-container">
-    <div class="history-selector">
+    <!-- <div class="history-selector">
       <span>选择历史退回记录：</span>
       <el-select v-model="hisId" placeholder="请选择" style="width: 240px" @change="handleShowInfo">
         <el-option v-for="item in hisList" :key="item.id" :label="item.createTime" :value="item.id" />
       </el-select>
-    </div>
+    </div> -->
 
-    <div class="volumeCatalog_box" style="margin-top: 20px">
+    <div class="volumeCatalog_box">
       <!-- <span style="color: #0d9df5">查看excel文件</span> -->
-      <div class="table-content" id="table-content" style="margin-top: 20px">
+      <div class="table-content" id="table-content">
         <el-row class="mb20" style="display: flex; justify-content: center">
           <h2>设计验证表</h2>
         </el-row>
@@ -165,24 +165,18 @@ const handleShowInfo = async (value: string | number) => {
 // 日期格式化方法
 const dateFormat = (date: string | Date | null): string => {
   if (!date) return '';
-
   // 处理字符串类型的日期
   if (typeof date === 'string') {
     date = new Date(date);
   }
-
   // 检查日期是否有效
   if (isNaN(date.getTime())) {
     return '';
   }
-
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0');
   const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
+  return `${year}年${month}月${day}日`;
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-
-  return `${year}-${month}-${day} ${hours}:${minutes}`;
 };
 
 // 获取详情

src/views/design/volumeCatalog/index.vue

@@ -47,6 +47,8 @@
       </template>
       <el-table v-loading="loading" :data="volumeCatalogList">
         <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="卷册号" align="center" prop="volumeNumber" />
+        <el-table-column label="资料名称" align="center" prop="documentName" />
         <el-table-column label="子项名称" align="center" prop="designSubitem" />
         <el-table-column label="设计状态" align="center" prop="designState">
           <template #default="scope">
@@ -55,8 +57,6 @@
         </el-table-column>
         <el-table-column label="专业" align="center" prop="specialtyName"> </el-table-column>
         <el-table-column label="设计人员" align="center" prop="principalName" />
-        <el-table-column label="卷册号" align="center" prop="volumeNumber" />
-        <el-table-column label="资料名称" align="center" prop="documentName" />
         <el-table-column label="计划出图时间" align="center" prop="plannedCompletion" width="200" />
         <el-table-column label="图纸文件" align="center" prop="remark" width="150">
           <template #default="scope">
@@ -68,6 +68,7 @@
             <el-link v-if="scope.row.opinion" :href="scope.row.opinion" target="_blank" type="primary"> 查看文件 </el-link>
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" />
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template #default="scope">
@@ -100,7 +101,7 @@
         </el-form-item>
         <el-form-item label="设计人员" prop="principal">
           <el-select v-model="form.principal" placeholder="请选择设计人员" class="transition-all duration-300 border-gray-300">
-            <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId" />
+            <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="设计状态" prop="designState">
@@ -183,7 +184,9 @@
               <el-button link type="primary" icon="edit" @click="handleAudit(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'"
                 >审核</el-button
               >
-              <el-button link type="primary" icon="View" v-if="row.status != 'draft'" @click="handleAuditView(row)">查看流程</el-button>
+              <el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'" @click="handleAuditView(row)"
+                >查看流程</el-button
+              >
               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
               <el-button
                 type="warning"

src/views/largeScreen/components/centerPage.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="centerPage">
+    <div class="centerPage_map">
+      <div ref="mapRef" class="map-container" style="width: 100%; height: 100%" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// import { getPowerStationOverview } from '@/api/large';
+import * as echarts from 'echarts';
+import china from '@/assets/china.json';
+const data = ref<any>({});
+
+// 地图容器引用
+const mapRef = ref<HTMLDivElement | null>(null);
+// ECharts实例
+let myChart: any = null;
+
+// 响应窗口大小变化
+const handleResize = () => {
+  if (myChart) {
+    myChart.resize();
+  }
+};
+
+// 初始化地图
+const initEcharts = () => {
+  if (!mapRef.value) {
+    console.error('未找到地图容器元素');
+    return;
+  }
+
+  // 注册地图
+  echarts.registerMap('china', china as any);
+
+  // 地图数据
+  const mapData: any = [{ name: '田东县', value: 1, itemStyle: { color: '#fff' } }];
+
+  // 散点数据
+  // 散点数据 - 使用图片标记并调整名称位置
+  const scatterData: any[] = [
+    {
+      name: '田东光伏智慧生态工地开发项目',
+      value: [107.15, 23.63],
+      // 使用图片作为标记（注意：需替换为你的图片实际路径）
+      symbol: 'diamond',
+      // 标记颜色
+      itemStyle: {
+        color: '#0166d6'
+      },
+      // 图片标记大小（宽, 高）
+      symbolSize: [20, 20],
+      // 名称样式设置
+      label: {
+        show: true,
+        formatter: '{b}', // 显示名称
+        position: 'top', // 名称在图片上方
+        color: '#fff',
+        fontSize: 12,
+        // 可选：添加文字背景以增强可读性
+        backgroundColor: 'rgba(3, 26, 52, 0.7)',
+        padding: [3, 6],
+        borderRadius: 3
+      }
+    }
+  ];
+  // 初始化新实例，强制清除缓存
+  myChart = echarts.init(mapRef.value, null, {
+    renderer: 'canvas', // 明确指定渲染器
+    useDirtyRect: false // 禁用脏矩形渲染，避免样式缓存
+  });
+  // 配置项
+  const option: any = {
+    roam: true, // 关键配置：允许鼠标滚轮缩放和拖拽平移
+    geo: {
+      type: 'map',
+      map: 'china',
+      zoom: 5,
+      center: [107.15, 23.63],
+      label: {
+        show: false,
+        color: '#fff'
+      },
+      itemStyle: {
+        areaColor: '#031a34', // 地图区域底色
+        borderColor: '#1e3a6e', // 区域边框颜色
+        borderWidth: 1
+      }
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: function (params: any) {
+        return params.name + (params.value ? `：${params.value}` : '');
+      }
+    },
+    series: [
+      {
+        type: 'map',
+        map: 'china',
+        geoIndex: 0,
+        // 关键：在series级别定义emphasis，优先级最高
+        emphasis: {
+          areaColor: '#fff', // 强制设置hover颜色
+          label: {
+            show: true,
+            color: '#fff'
+          },
+          itemStyle: {
+            areaColor: '#02417e' // 重复设置确保生效
+          }
+        },
+        // 确保没有使用默认样式
+        select: {
+          itemStyle: {
+            areaColor: '#02417e'
+          }
+        },
+        data: mapData
+      },
+      {
+        type: 'scatter',
+        coordinateSystem: 'geo',
+        data: scatterData
+      }
+    ]
+  };
+
+  // 设置配置项
+  myChart.setOption(option);
+};
+
+// 组件挂载时初始化
+onMounted(() => {
+  // 确保DOM渲染完成
+  nextTick(() => {
+    initEcharts();
+    window.addEventListener('resize', handleResize);
+  });
+});
+
+// 组件卸载时清理
+onUnmounted(() => {
+  window.removeEventListener('resize', handleResize);
+  if (myChart) {
+    myChart.dispose();
+    myChart = null;
+  }
+});
+// const getDataList = () => {
+//   getPowerStationOverview().then((res) => {
+//     console.log(res);
+//     if (res.code == 200) {
+//       data.value = res.data;
+//     }
+//   });
+// };
+// getDataList();
+</script>
+
+<style scoped lang="scss">
+.centerPage {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 0 10px 10px 10px;
+
+  box-sizing: border-box;
+  .centerPage_map {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>

src/views/largeScreen/components/header.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="header">
+    <div class="header_left">
+      <div class="header_left_img">
+        <img src="@/assets/large/secure.png" style="width: 100%; height: 100%" />
+      </div>
+      <div style="font-size: 12px; padding-left: 10px">安全生产天数：</div>
+      <div class="header_left_text">
+        1,235
+        <span style="font-size: 12px">天</span>
+      </div>
+    </div>
+    <div class="title">
+      <div class="title_text">资金管理看板</div>
+      <div>Fund Management Dashboard</div>
+    </div>
+    <div class="right">
+      <div class="top-bar">
+        <!-- 左侧：天气图标 + 日期文字 -->
+        <div class="left-section">
+          <img src="@/assets/large/weather.png" alt="天气图标" />
+
+          <span>
+            <span>多云 9°/18°</span>
+            <span style="padding-left: 20px"> {{ week[date.week] }} ({{ date.ymd }})</span>
+          </span>
+        </div>
+        <!-- 分割线 -->
+        <div class="divider">
+          <div class="top-block"></div>
+          <div class="bottom-block"></div>
+        </div>
+        <!-- 右侧：管理系统图标 + 文字 -->
+        <div class="right-section">
+          <img src="@/assets/large/setting.png" alt="设置图标" />
+          <span>管理系统</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+const week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+const date = ref({
+  ymd: '',
+  hms: '',
+  week: 0
+});
+const setTime = () => {
+  let date1 = new Date();
+  let year: any = date1.getFullYear();
+  let month: any = date1.getMonth() + 1;
+  let day: any = date1.getDate();
+  let hours: any = date1.getHours();
+  if (hours < 10) {
+    hours = '0' + hours;
+  }
+  let minutes: any = date1.getMinutes();
+  if (minutes < 10) {
+    minutes = '0' + minutes;
+  }
+  let seconds: any = date1.getSeconds();
+  if (seconds < 10) {
+    seconds = '0' + seconds;
+  }
+  date.value.ymd = year + '-' + month + '-' + day;
+  date.value.hms = hours + ':' + minutes + ':' + seconds;
+  date.value.week = date1.getDay();
+};
+// 添加定时器，每秒更新一次时间
+const timer = setInterval(setTime, 1000);
+// 组件卸载时清除定时器
+onUnmounted(() => {
+  clearInterval(timer);
+});
+</script>
+
+<style scoped lang="scss">
+.header {
+  width: 100%;
+  height: 80px;
+  box-sizing: border-box;
+  padding: 10px;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  color: #fff;
+}
+.header_left {
+  display: flex;
+  align-items: center;
+  .header_left_img {
+    width: 48px;
+    height: 48px;
+    box-sizing: border-box;
+    // padding-right: 10px;
+  }
+  .header_left_text {
+    font-weight: 500;
+    text-shadow: 0px 1.24px 6.21px rgba(25, 179, 250, 1);
+  }
+}
+.title {
+  color: #fff;
+  font-family: 'AlimamaShuHeiTi', sans-serif;
+  text-align: center;
+}
+.title > div:first-child {
+  /* 第一个子元素的样式 */
+  font-size: 38px;
+  //   font-weight: 300;
+}
+
+.title > div:last-child {
+  /* 最后一个子元素的样式 */
+  font-size: 14px;
+  letter-spacing: 0.3em; /* 调整这个值来控制间距大小 */
+}
+.right {
+  width: 100%;
+  height: 100%;
+  display: flex;
+}
+/* 顶部栏容器：Flex 水平布局 + 垂直居中 */
+.top-bar {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  //   background-color: #1e2128;
+  color: #fff;
+  padding: 8px 16px;
+  font-size: 14px;
+}
+/* 左侧区域（天气 + 日期）：自身也用 Flex 水平排列，确保元素在一行 */
+.left-section {
+  display: flex;
+  align-items: center;
+  //   margin-right: auto; /* 让右侧元素（管理系统）居右 */
+}
+.left-section img {
+  width: 32px;
+  height: 32px;
+  margin-right: 8px; /* 图标与文字间距 */
+}
+/* 分割线（视觉分隔，可根据需求调整样式） */
+.divider {
+  display: grid;
+  grid-template-rows: 1fr 1fr;
+  height: 100%; /* 根据需要调整高度 */
+  padding: 14px 10px;
+}
+
+.divider .top-block {
+  width: 2px;
+  height: 7px;
+  background: #19b5fb;
+  align-self: start;
+}
+
+.divider .bottom-block {
+  width: 2px;
+  height: 7px;
+  background: #19b5fb;
+  align-self: end;
+}
+/* 右侧区域（管理系统）：图标 + 文字水平排列 */
+.right-section {
+  display: flex;
+  align-items: center;
+  font-family: 'AlimamaShuHeiTi', sans-serif;
+  font-size: 20px;
+}
+.right-section img {
+  width: 20px;
+  height: 20px;
+  margin-right: 6px; /* 图标与文字间距 */
+}
+</style>

src/views/largeScreen/components/leftPage.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="leftPage">左边</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.leftPage {
+  width: 100%;
+  height: 100%;
+  background: #0c1e35;
+}
+</style>

src/views/largeScreen/components/optionList.ts

@@ -0,0 +1,735 @@
+import * as echarts from 'echarts/core';
+// import { PictorialBarChart } from 'echarts/charts'
+// 客流量图
+export const getOption = (xData: any, yData: any) => {
+  const data = {
+    xData,
+    yData
+  };
+  const maxData = Math.ceil(Math.max(...data.yData));
+  const barData = data.yData.map((item) => {
+    return maxData;
+  });
+  const option = {
+    grid: {
+      top: '10%',
+      left: '8%',
+      right: '5%',
+      bottom: '20%'
+      // containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      data: data.xData,
+      axisLine: {
+        show: false
+      },
+      axisTick: {
+        show: true
+      },
+      axisLabel: {
+        textStyle: {
+          color: '#fff'
+        }
+      }
+    },
+    yAxis: {
+      show: true,
+      type: 'value',
+      max: maxData,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'solid',
+          color: 'rgba(73, 169, 191, 0.2)'
+        }
+      }
+    },
+    tooltip: {
+      trigger: 'axis',
+      backgroundColor: '',
+      textStyle: {
+        color: '#fff'
+      }
+    },
+    dataZoom: [
+      {
+        // show: true,
+        start: 0,
+        end: 30,
+        bottom: 2, // 下滑块距离x轴底部的距离
+        height: 23
+      },
+      {
+        type: 'inside'
+      }
+    ],
+    series: [
+      {
+        name: '柱图',
+        type: 'bar',
+        // barWidth: '10%',
+        data: barData,
+        tooltip: {
+          show: false
+        },
+        barGap: '-50%',
+        itemStyle: {
+          normal: {
+            color: 'rgba(73, 169, 191, 0.2)'
+          }
+        }
+      },
+      {
+        name: '客单价',
+        type: 'line',
+        showAllSymbol: true,
+        symbol: 'circle',
+        symbolSize: 8,
+        lineStyle: {
+          normal: {
+            color: 'rgba(217, 231, 255, 0.3)',
+            shadowColor: 'rgba(0, 0, 0, .3)',
+            shadowBlur: 0
+            // shadowOffsetY: 5,
+            // shadowOffsetX: 5,
+          }
+        },
+        itemStyle: {
+          color: 'rgba(224, 194, 22, 1)',
+          borderWidth: 0,
+          shadowBlur: 0
+        },
+        label: {
+          show: false, // 显示数据标签
+          color: 'rgba(255, 208, 59, 1)'
+        },
+        data: data.yData
+      }
+    ]
+  };
+  return option;
+};
+
+// 上菜分析图
+export const getOption2 = (data: any) => {
+  const maxData = Math.max(...data.yData);
+  const option = {
+    // backgroundColor: "#38445E",
+    grid: {
+      left: '10%',
+      top: '13%',
+      bottom: '16%',
+      right: '10%'
+    },
+    xAxis: {
+      data: data.xData,
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        lineStyle: {
+          color: 'rgba(255, 129, 109, 0.1)',
+          width: 1 //这里是为了突出显示加上的
+        }
+      },
+      axisLabel: {
+        textStyle: {
+          color: '#999',
+          fontSize: 12
+        }
+      }
+    },
+    yAxis: [
+      {
+        splitNumber: 2,
+        axisTick: {
+          show: false
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(255, 129, 109, 0.1)',
+            width: 1 //这里是为了突出显示加上的
+          }
+        },
+        axisLabel: {
+          textStyle: {
+            color: '#999'
+          }
+        },
+        splitArea: {
+          areaStyle: {
+            color: 'rgba(255,255,255,.5)'
+          }
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: 'rgba(255,255,255,.5)',
+            width: 0.5,
+            type: 'dashed'
+          }
+        }
+      }
+    ],
+    dataZoom: [
+      {
+        // show: true,
+
+        start: 0,
+        end: 30,
+        bottom: 2, // 下滑块距离x轴底部的距离
+        height: 23
+      },
+      {
+        type: 'inside'
+      }
+    ],
+    tooltip: {
+      trigger: 'axis', // 设置为 'item'，表示鼠标悬浮在图形上时显示 tooltip
+      // formatter: function (params) {
+      //   return `订单数: ${params.data}` // 显示鼠标悬浮项的数量
+      // },
+      backgroundColor: '', // 设置提示框的背景颜色
+      textStyle: {
+        color: '#fff' // 设置文字颜色
+        // fontSize: 14 // 设置文字大小
+      }
+    },
+    series: [
+      {
+        name: '订单数',
+        type: 'pictorialBar',
+        barCategoryGap: '0%',
+        symbol: 'path://M0,10 L10,10 C5.5,10 5.5,5 5,0 C4.5,5 4.5,10 0,10 z',
+        label: {
+          show: false,
+          position: 'top',
+          distance: 15,
+          color: 'rgba(255, 235, 59, 1)',
+          // fontWeight: "bolder",
+          fontSize: 16
+        },
+        itemStyle: {
+          normal: {
+            // color: {
+            //   type: "linear",
+            //   x: 0,
+            //   y: 0,
+            //   x2: 0,
+            //   y2: 1,
+            //   colorStops: [
+            //     {
+            //       offset: 0,
+            //       color: "rgba(232, 94, 106, .8)", //  0%  处的颜色
+            //     },
+            //     {
+            //       offset: 1,
+            //       color: "rgba(232, 94, 106, .1)", //  100%  处的颜色
+            //     },
+            //   ],
+            //   global: false, //  缺省为  false
+            // },
+            color: function (params: any) {
+              if (params.data === maxData) {
+                return 'rgba(255, 219, 103, 0.6)';
+              } else {
+                return 'rgba(239, 244, 255, 0.45)';
+              }
+            }
+          },
+          emphasis: {
+            opacity: 1
+          }
+        },
+        data: data.yData,
+        z: 10
+      }
+    ]
+  };
+  return option;
+};
+//食堂周报图
+export const getLineOption = (lineData: any) => {
+  const maxData = Math.ceil(Math.max(...lineData.line1));
+  const option = {
+    backgroundColor: '',
+    tooltip: {
+      trigger: 'axis',
+      backgroundColor: 'transparent',
+      color: '#7ec7ff',
+      textStyle: {
+        color: '#fff'
+      },
+      borderColor: '#7ec7ff'
+    },
+    // legend: {
+    //   align: 'left',
+    //   right: '5%',
+    //   top: '1%',
+    //   type: 'plain',
+    //   textStyle: {
+    //     color: '#fff',
+    //     fontSize: 12
+    //   },
+    //   // icon:'rect',
+    //   itemGap: 15,
+    //   itemWidth: 18,
+    //   data: [
+    //     {
+    //       name: '上周销售量'
+    //     },
+    //     {
+    //       name: '本周销售量'
+    //     }
+    //   ]
+    // },
+    grid: {
+      top: '12%',
+      left: '1%',
+      right: '3%',
+      bottom: '12%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      data: lineData.xLabel,
+      axisLine: {
+        show: false
+      },
+      axisTick: {
+        show: true
+      },
+      axisLabel: {
+        textStyle: {
+          color: '#fff'
+        }
+      }
+    },
+    yAxis: {
+      show: true,
+      type: 'value',
+      max: maxData,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'solid',
+          color: 'rgba(73, 169, 191, 0.2)'
+        }
+      }
+    },
+    dataZoom: [
+      {
+        // show: true,
+        start: 0,
+        end: 30,
+        bottom: 2, // 下滑块距离x轴底部的距离
+        height: 23
+      },
+      {
+        type: 'inside'
+      }
+    ],
+    series: [
+      {
+        name: '逆变器功率',
+        type: 'line',
+        symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+        showAllSymbol: false,
+        symbolSize: 0,
+        smooth: true,
+        lineStyle: {
+          width: 1,
+          color: 'rgba(80, 164, 225, 1)', // 线条颜色
+          borderColor: 'rgba(0,0,0,.4)'
+        },
+        itemStyle: {
+          color: 'rgba(80, 164, 225, 1)',
+          borderWidth: 2,
+          show: false
+        },
+        tooltip: {
+          show: true
+        },
+        areaStyle: {
+          //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(80, 164, 225, 0.4)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(80, 164, 225, 0)'
+              }
+            ],
+            false
+          ),
+          shadowColor: 'rgba(25,163,223, 0.5)', //阴影颜色
+          shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+        },
+        data: lineData.line1
+      }
+    ]
+  };
+  return option;
+};
+//#endregion
+
+// 菜品销售图
+export const getDishesOption = (data?: any) => {
+  const res = data;
+  const dataIndex = 1;
+  const option = {
+    xAxis: {
+      type: 'value',
+      axisTick: {
+        show: false
+      },
+      splitLine: {
+        show: false
+      },
+      axisLabel: {
+        show: false
+      }
+    },
+    yAxis: {
+      type: 'category',
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        margin: 10 // 增大标签与轴线间距
+      },
+      width: 60, // 增大Y轴宽度
+      data: res.name,
+      axisLine: {
+        lineStyle: {
+          color: '#93C9C3'
+        }
+      }
+    },
+    grid: {
+      top: '5%', // 设置网格区域与容器之间的边距
+      bottom: '5%', // 同理
+      left: '5%',
+      containLabel: true
+    },
+    series: [
+      {
+        type: 'bar',
+        data: res.ratio,
+        barMaxWidth: 25,
+        itemStyle: {
+          barBorderRadius: 3,
+          color: 'rgba(12, 242, 216, 0.2)'
+        },
+        label: {
+          show: false
+        }
+      },
+      {
+        type: 'bar',
+        data: res.data,
+        barGap: '-100%',
+        barMaxWidth: 25,
+        itemStyle: {
+          barBorderRadius: 3,
+          color: function (params: any) {
+            if (params.data <= 300) {
+              return new echarts.graphic.LinearGradient(1, 0, 0, 0, [
+                { color: 'rgba(252, 105, 0, 1)', offset: 0 },
+                { color: 'rgba(250, 42, 42, 1)', offset: 1 }
+              ]);
+            } else {
+              return new echarts.graphic.LinearGradient(1, 0, 0, 0, [
+                { color: 'rgba(73, 169, 191, 1)', offset: 0 },
+                { color: 'rgba(108, 248, 236, 1)', offset: 1 }
+              ]);
+            }
+          }
+        },
+        label: {
+          show: true,
+          position: [200, -15],
+          formatter: function (params: any) {
+            if (params.data <= 300) {
+              return `{a| ${params.value}g/${res.ratio[params.dataIndex]}g}`;
+            } else {
+              return `{b| ${params.value}g/${res.ratio[params.dataIndex]}g}`;
+            }
+          },
+          rich: {
+            a: {
+              color: 'rgba(255, 78, 51, 1)'
+            },
+            b: {
+              color: 'rgba(255, 235, 59, 1)'
+            }
+          }
+        }
+      }
+    ]
+  };
+  return option;
+};
+// 菜品库存图
+export const getInventoryOption = () => {
+  const res = {
+      data: [2800, 300, 3900, 3000, 2450, 2670, 3320],
+      name: ['麻辣牛肉', '水煮肉片', '酸菜鱼', '辣子鸡丁', '烧白', '冬瓜排骨汤', '清炒油麦菜'],
+      ratio: [4000, 4000, 4000, 4000, 4000, 4000, 4000]
+    },
+    dataIndex = 1;
+  const option = {
+    xAxis: {
+      type: 'value',
+      axisTick: {
+        show: false
+      },
+      splitLine: {
+        show: false
+      },
+      axisLabel: {
+        show: false
+      }
+    },
+    yAxis: {
+      type: 'category',
+      show: false,
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        margin: 10 // 增大标签与轴线间距
+      },
+      width: 20, // 增大Y轴宽度
+      data: res.name,
+      axisLine: {
+        show: false,
+        lineStyle: {
+          color: '#93C9C3'
+        }
+      }
+    },
+    grid: {
+      top: '5%', // 设置网格区域与容器之间的边距
+      bottom: '5%', // 同理
+      left: '5%',
+      containLabel: true
+    },
+    series: [
+      {
+        type: 'bar',
+        data: res.ratio,
+        barMaxWidth: 6,
+        itemStyle: {
+          barBorderRadius: 3,
+          color: 'rgba(12, 242, 216, 0.2)'
+        },
+        label: {
+          show: true,
+          position: [0, -15],
+          fontSize: 14,
+          color: '#fff',
+          formatter: function (params: any) {
+            return params.name;
+          }
+          // rich: {
+          //   a: {
+          //     color: "rgba(255, 78, 51, 1)",
+          //   },
+          //   b: {
+          //     color: "rgba(255, 235, 59, 1)",
+          //   },
+          // },
+        }
+      },
+      {
+        type: 'bar',
+        data: res.data,
+        barGap: '-100%',
+        barMaxWidth: 6,
+        itemStyle: {
+          barBorderRadius: 0,
+          color: function (params: any) {
+            if (params.dataIndex === dataIndex) {
+              return new echarts.graphic.LinearGradient(1, 0, 0, 0, [
+                { color: 'rgba(255, 78, 51, 1)', offset: 0 },
+                { color: 'rgba(252, 105, 0, 0)', offset: 1 }
+              ]);
+            } else {
+              return new echarts.graphic.LinearGradient(1, 0, 0, 0, [
+                { color: 'rgba(242, 224, 27, 1)', offset: 0 },
+                { color: 'rgba(236, 227, 127, 0.55)', offset: 0.5 },
+                { color: 'rgba(230, 229, 227, 0.1)', offset: 1 }
+              ]);
+            }
+          }
+        },
+        label: {
+          show: true,
+          position: [200, -15],
+          formatter: function (params: any) {
+            if (params.dataIndex === dataIndex) {
+              return `{a| ${params.value}g}`;
+            } else {
+              return `{b| ${params.value}g}`;
+            }
+          },
+          rich: {
+            a: {
+              color: 'rgba(255, 78, 51, 1)'
+            },
+            b: {
+              color: 'rgba(255, 235, 59, 1)'
+            }
+          }
+        }
+      }
+    ]
+  };
+  return option;
+};
+export const getBarOptions = (data: any) => {
+  const option = {
+    backgroundColor: '',
+    grid: {
+      left: '7%',
+      top: '4%',
+      bottom: '25%',
+      right: '2%'
+    },
+    tooltip: {
+      show: true,
+      backgroundColor: '',
+      trigger: 'axis',
+      formatter: '{b0}：{c0}元',
+      textStyle: {
+        color: '#fff'
+      }
+      // borderColor: 'rgba(252, 217, 18, 1)'
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.name,
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(108, 128, 151, 0.3)'
+          }
+        },
+        axisLabel: {
+          textStyle: {
+            color: '#999',
+            fontSize: 12
+          }
+        },
+        axisTick: {
+          // show: true,
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: 'rgba(108, 128, 151, 0.3)',
+            type: 'dashed'
+          }
+        }
+      }
+    ],
+    yAxis: [
+      {
+        axisLabel: {
+          formatter: function (value) {
+            if (value >= 1000) {
+              value = (value / 1000).toFixed(1) + 'k'; // 大于等于1000的数字显示为1k、2.5k等
+            }
+            return value;
+          },
+          color: 'rgba(255, 255, 255, 0.8)'
+        },
+        axisTick: {
+          show: false
+        },
+        axisLine: {
+          lineStyle: {
+            color: 'rgba(108, 128, 151, 0.3)'
+          }
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: 'rgba(108, 128, 151, 0.3)',
+            type: 'dashed'
+          }
+        }
+      }
+    ],
+    dataZoom: [
+      {
+        // show: true,
+        start: 0,
+        end: 30,
+        bottom: 2, // 下滑块距离x轴底部的距离
+        height: 23
+      },
+      {
+        type: 'inside'
+      }
+    ],
+    series: [
+      {
+        type: 'bar',
+        data: data.value,
+        stack: '合并',
+        barWidth: '15',
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(0, 111, 255, 0)' // 0% 处的颜色
+              },
+              {
+                offset: 0.7,
+                color: 'rgba(0, 111, 255, 0.5)' // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: 'rgba(0, 111, 255, 1)' // 100% 处的颜色
+              }
+            ],
+            false
+          )
+        },
+        label: {
+          show: true,
+          formatter: '{c}',
+          position: 'top',
+          color: '#fff',
+          fontSize: 10
+          // padding: 5
+        }
+      }
+      // {
+      //   type: 'bar',
+      //   stack: '合并',
+      //   data: topData,
+      //   barWidth: '15',
+      //   itemStyle: {
+      //     color: 'rgba(252, 217, 18, 1)'
+      //   }
+      // }
+    ]
+  };
+  return option;
+};

src/views/largeScreen/components/rightPage.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="rightPage">右边</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.rightPage {
+  width: 100%;
+  height: 100%;
+  background: #0c1e35;
+}
+</style>

src/views/largeScreen/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="large-screen">
+    <Header />
+    <div class="nav">
+      <div class="nav_left">
+        <leftPage />
+      </div>
+      <div class="nav_center">
+        <centerPage />
+      </div>
+      <div class="nav_right">
+        <rightPage />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Header from './components/header.vue';
+import leftPage from './components/leftPage.vue';
+import centerPage from './components/centerPage.vue';
+import rightPage from './components/rightPage.vue';
+// import '@/assets/styles/element.scss';
+</script>
+
+<style scoped lang="scss">
+.large-screen {
+  width: 100vw;
+  height: 100vh;
+  background: url('@/assets/large/bg.png') no-repeat;
+  background-size: 100% 100%;
+  background-color: rgba(4, 7, 17, 1);
+}
+.nav {
+  width: 100%;
+  height: calc(100vh - 80px);
+  box-sizing: border-box;
+  //   padding: 10px;
+  display: grid;
+  grid-template-columns: 1fr 2fr 1fr;
+  color: #fff;
+}
+</style>

src/views/login.vue

@@ -73,7 +73,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2024 疯狂的狮子Li All Rights Reserved.</span>
+      <!-- <span></span> -->
     </div>
   </div>
 </template>
@@ -95,8 +95,8 @@ const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
-  username: 'admin',
+  username: '',
-  password: 'admin123',
+  password: '',
   rememberMe: false,
   code: '',
   uuid: ''

src/views/materials/appointment/index.vue

@@ -10,7 +10,7 @@
           @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="['ailiaoshebei:purchaseUser:byProject']"
         >
           点击编辑
         </el-button>
@@ -38,11 +38,16 @@
             @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="['ailiaoshebei:purchaseUser:byProject']"
           >
             确认提交
           </el-button>
-          <el-button @click="resetForm" icon="Refresh" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
+          <el-button
+            @click="resetForm"
+            v-hasPermi="['ailiaoshebei:purchaseUser:byProject']"
+            icon="Refresh"
+            class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium"
+          >
             重置
           </el-button>
         </div>

src/views/materials/batchPlan/index.vue

@@ -21,7 +21,7 @@
                 ><el-button
                   type="danger"
                   size="default"
-                  v-hasPermi="['cailiaoshebei:batchPlan:remove']"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
                   @click="handleDeleteBatch"
                   icon="FolderDelete"
                   plain
@@ -65,10 +65,14 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:cailiaoshebei:add']">修改</el-button>
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
+                  >修改</el-button
+                >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
+                  >审核</el-button
+                >
               </el-col>
 
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -82,7 +86,7 @@
             <el-table-column label="质量标准" align="center" prop="qs" />
             <el-table-column label="规格型号" align="center" prop="specification" />
             <el-table-column label="计量单位" align="center" prop="unit" width="80" />
-            <el-table-column label="需求数量" align="center" prop="quantity" />
+            <el-table-column label="需求数量" align="center" prop="demandQuantity" />
             <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
             <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
@@ -139,9 +143,9 @@
               <el-input v-model="scope.row.unit" placeholder="请输入单位" disabled />
             </template>
           </el-table-column>
-          <el-table-column prop="quantity" align="center" label="数量" width="130">
+          <el-table-column prop="demandQuantity" align="center" label="数量" width="130">
             <template #default="scope">
-              <el-input v-model="scope.row.quantity" placeholder="请输入数量" type="number" min="0" disabled />
+              <el-input v-model="scope.row.demandQuantity" placeholder="请输入数量" type="number" min="0" disabled />
             </template>
           </el-table-column>
           <el-table-column prop="qs" align="center" label="质量标准" width="150">
@@ -232,7 +236,8 @@ const initFormData: any = {
       name: undefined,
       specification: undefined,
       unit: undefined,
-      quantity: undefined,
+      suppliespriceId: undefined,
+      demandQuantity: undefined,
       qs: undefined,
       arrivalTime: undefined,
       remark: undefined
@@ -289,7 +294,7 @@ const selectName = (val: any, row: any) => {
     row.specification = selected.specification;
     row.unit = selected.unit;
     row.qs = selected.qs;
-    row.quantity = selected.quantity;
+    row.demandQuantity = selected.quantity;
     row.remark = selected.remark;
     row.arrivalTime = selected.arrivalTime;
   }
@@ -328,7 +333,7 @@ const addRow = () => {
     name: undefined,
     specification: undefined,
     unit: undefined,
-    quantity: undefined,
+    demandQuantity: undefined,
     qs: undefined,
     arrivalTime: undefined,
     remark: undefined
@@ -352,7 +357,9 @@ const reset = () => {
       name: undefined,
       specification: undefined,
       unit: undefined,
-      quantity: undefined,
+      suppliespriceId: undefined,
+
+      demandQuantity: undefined,
       qs: undefined,
       arrivalTime: undefined,
       remark: undefined
@@ -398,7 +405,7 @@ const handleUpdata = () => {
       }, {});
     });
 
-    console.log(form.value);
+    console.log(form.value.planList);
   });
   dialog.visible = true;
   dialog.title = '修改物资-需求';

src/views/materials/cailiaoshebei/index.vue

@@ -58,10 +58,20 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" :offset="0"
-                ><el-button type="primary" size="default" @click="addBatch" icon="FolderAdd" plain>新增</el-button></el-col
+                ><el-button type="primary" size="default" v-hasPermi="['cailiaoshebei:cailiaoshebei:add']" @click="addBatch" icon="FolderAdd" plain
+                  >新增</el-button
+                ></el-col
               >
               <el-col :span="1.5" :offset="0"
-                ><el-button type="danger" size="default" @click="handleDeleteBatch" icon="FolderDelete" plain>删除</el-button></el-col
+                ><el-button
+                  type="danger"
+                  size="default"
+                  v-hasPermi="['cailiaoshebei:cailiaoshebei:remove']"
+                  @click="handleDeleteBatch"
+                  icon="FolderDelete"
+                  plain
+                  >删除</el-button
+                ></el-col
               >
             </el-row>
           </template>
@@ -125,7 +135,9 @@
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()">审核</el-button>
+                <el-button plain type="warning" v-hasPermi="['cailiaoshebei:cailiaoshebei:query']" icon="Finished" @click="handleAudit()"
+                  >审核</el-button
+                >
               </el-col>
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>

src/views/materials/materialsEquipment/materialIssue/index.vue

@@ -26,8 +26,8 @@
               <el-input v-model="queryParams.storageUnit" placeholder="请输入保管单位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialIssue:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialIssue:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>

src/views/materials/materialsEquipment/materialReceive/index.vue

@@ -23,8 +23,9 @@
               <el-input v-model="queryParams.supplierUnit" placeholder="请输入供货单位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+
+              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -62,7 +63,7 @@
         <el-table-column label="供货单位" align="center" prop="supplierUnit" />
         <el-table-column label="设备材料入库/移交" align="center" prop="storageType">
           <template #default="scope">
-            <dict-tag :options="storage_type" :value="scope.row.storageType ? scope.row.storageType.split(',') : []" />
+            <dict-tag :options="storage_type" :value="scope.row.storageType" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -183,7 +184,7 @@
                       :prop="`itemList.${index}.acceptedQuantity`"
                       :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
                     >
-                      <el-input  type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
+                      <el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -235,11 +236,16 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="设备材料入库/移交" prop="storageType">
-              <el-checkbox-group v-model="form.storageType">
+              <el-radio-group v-model="form.storageType">
+                <el-radio v-for="dict in storage_type" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+              <!-- <el-checkbox-group v-model="form.storageType">
                 <el-checkbox v-for="dict in storage_type" :key="dict.value" :label="dict.value">
                   {{ dict.label }}
                 </el-checkbox>
-              </el-checkbox-group>
+              </el-checkbox-group> -->
             </el-form-item> </el-col
           ><el-col :span="24"
             ><el-form-item label="备注" prop="remark">
@@ -317,7 +323,7 @@ const getInitFormData = () => {
     techDocCountFileId: undefined,
     licenseCount: undefined,
     licenseCountFileId: undefined,
-    storageType: [],
+    storageType: '',
     remark: undefined,
     docId: undefined,
     docCode: undefined,
@@ -425,12 +431,6 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
   const _id = row?.id || ids.value[0];
   const res = await getMaterialReceive(_id);
   Object.assign(form.value, res.data);
-  if (form.value.storageType && form.value.storageType.length) {
-    form.value.storageType = form.value.storageType.split(',');
-  } else {
-    form.value.storageType = [];
-  }
-
   // 为每个条目添加监听
   form.value.itemList.forEach((_, index) => {
     watchItemChanges(index);
@@ -445,11 +445,10 @@ const submitForm = () => {
   materialReceiveFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.storageType = form.value.storageType.join(',');
       if (form.value.id) {
-        await updateMaterialReceive(form.value).finally(() => (buttonLoading.value = false));
+        await updateMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
       } else {
-        await addMaterialReceive(form.value).finally(() => (buttonLoading.value = false));
+        await addMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;

src/views/materials/materialsEquipment/materialReceive/word/index.vue

@@ -82,9 +82,9 @@
                   <span>是否附带以下随机资料</span>
                   <div class="file_detail">
                     <span>(1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份</span>
-                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFileId.length : 0 }} 份</span>
+                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFile.length : 0 }} 份</span>
-                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFileId.length : 0 }} 份</span>
+                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFile.length : 0 }} 份</span>
-                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFileId.length : 0 }} 份</span>
+                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFile.length : 0 }} 份</span>
                   </div>
                 </td>
               </tr>

src/views/materials/materialsInventory/index.vue

@@ -8,8 +8,9 @@
               <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialsInventory:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+
+              <el-button icon="Refresh" v-hasPermi="['materials:materialsInventory:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>

src/views/materials/orderEquipment/index.vue

@@ -47,13 +47,15 @@
                   plain
                   icon="Check"
                   @click="submitForm"
-                  v-hasPermi="['cailiaoshebei:cailiaoshebei:delete']"
+                  v-hasPermi="['cailiaoshebei:materialsorder:modifyTheOrderForm']"
                   >保存</el-button
                 >
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialsorder:list']"
+                  >审核</el-button
+                >
               </el-col>
               <el-col :span="1.5" v-if="form.approvalOrder == 'draft'">
-                <el-button type="success" plain icon="Share" @click="onShare" v-hasPermi="['cailiaoshebei:cailiaoshebei:delete']">分享</el-button>
+                <el-button type="success" plain icon="Share" @click="onShare" v-hasPermi="['cailiaoshebei:materialsorder:list']">分享</el-button>
               </el-col>
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>

src/views/materials/orderMaterials/index.vue

@@ -65,7 +65,12 @@
             <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" width="150" fixed="right">
               <template #default="scope">
-                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['cailiaoshebei:cailiaoshebei:edit']"
+                <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['cailiaoshebei:materialsorder:changeTheStatusOfTheMaterials']"
                   >修改</el-button
                 >
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['cailiaoshebei:cailiaoshebei:remove']"

src/views/materials/overallPlanMaterialSupply/index.vue

@@ -6,10 +6,10 @@
         <el-row :gutter="10" class="mb8">
           <el-form :inline="true">
             <el-form-item v-if="state.masterData.status == 'draft'">
-              <el-button type="primary" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
+              <el-button type="primary" v-hasPermi="['design:totalsupplyplan:queryList']" icon="edit" @click="clickApprovalSheet1()">审批</el-button>
             </el-form-item>
             <el-form-item v-if="state.masterData.status == 'waiting' || state.masterData.status == 'finish'">
-              <el-button icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+              <el-button icon="view" v-hasPermi="['design:totalsupplyplan:queryList']" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
             </el-form-item>
           </el-form>
           <right-toolbar @queryTable="getMasterDataList"></right-toolbar>
@@ -46,6 +46,7 @@
           <el-button
             :disabled="state.masterData.status == 'waiting' || state.masterData.status == 'finish'"
             type="primary"
+            v-hasPermi="['design:totalsupplyplan:edit']"
             @click="editApprovalSheet(row)"
             >修改</el-button
           >

src/views/materials/purchaseDoc/index.vue

@@ -14,8 +14,9 @@
               <el-date-picker clearable v-model="queryParams.arrivalDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择到货日期" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['cailiaoshebei:purchaseDoc:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+
+              <el-button icon="Refresh" v-hasPermi="['cailiaoshebei:purchaseDoc:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -49,7 +50,7 @@
         <el-table-column label="联系人" align="center" prop="contacts" />
         <el-table-column label="物流单号" align="center" prop="remark" width="150">
           <template #default="scope">
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['out:monthPlan:remove']">查看物流单</el-button>
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['cailiaoshebei:ltn:list']">查看物流单</el-button>
           </template>
         </el-table-column>
         <el-table-column label="采购经办人" align="center" prop="purchasingAgent" width="90" />
@@ -76,7 +77,7 @@
               v-if="scope.row.status == 'draft' || scope.row.status == 'back'"
               icon="Finished"
               @click="handleAudit(scope.row)"
-              v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
+              v-hasPermi="['cailiaoshebei:purchaseDoc:query']"
             >
               审核</el-button
             >
@@ -86,7 +87,7 @@
               v-if="scope.row.status != 'draft'"
               icon="view"
               @click="handleViewDetail(scope.row)"
-              v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
+              v-hasPermi="['cailiaoshebei:purchaseDoc:query']"
             >
               查看</el-button
             >
@@ -108,15 +109,19 @@
               v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
               >修改</el-button
             >
+
             <el-button
               link
               type="primary"
               v-if="scope.row.status == 'finish' && scope.row.feedbackUrl"
               icon="Share"
               @click="handleShare(scope.row)"
-              v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
+              v-hasPermi="['cailiaoshebei:purchaseDoc:list']"
               >物流单分享</el-button
             >
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
+              >详情</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -238,19 +243,31 @@
         </span>
       </template>
     </el-dialog>
+    <el-dialog title="详情" v-model="detailBASEVisble" width="1000">
+      <div class="text-center">
+        <img :src="detailBASE" class="w200" />
+      </div>
+    </el-dialog>
     <logisticsDetail ref="logisticsDetailRef"></logisticsDetail>
   </div>
 </template>
 
 <script setup name="PurchaseDoc" lang="ts">
 import { getBatch, listBatch } from '@/api/materials/batchPlan';
-import { listPurchaseDoc, getPurchaseDoc, listLink, addPurchaseDoc, updatePurchaseDoc, logisticsDetial } from '@/api/materials/purchaseDoc';
+import {
+  listPurchaseDoc,
+  getPurchaseDoc,
+  listLink,
+  addPurchaseDoc,
+  updatePurchaseDoc,
+  logisticsDetial,
+  getDetailBASE
+} from '@/api/materials/purchaseDoc';
 import { PurchaseDocVO, PurchaseDocQuery, PurchaseDocForm } from '@/api/materials/purchaseDoc/types';
 import { listContractor } from '@/api/project/contractor';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
 import logisticsDetail from './comm/logisticsDetail.vue';
-import type { DrawerProps } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@@ -280,7 +297,8 @@ const dialog = reactive<DialogOption>({
 });
 const batchOptions = ref([]);
 const supplierOptions = ref([]);
-
+const detailBASEVisble = ref(false);
+const detailBASE = ref<any>({});
 const planList = ref([]);
 const initFormData: any = {
   id: undefined,
@@ -333,6 +351,9 @@ const data = reactive({
   },
   rules: {
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }],
+    planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }],
+    mrpBaseId: [{ required: true, message: '需求批次号不能为空', trigger: 'blur' }],
     // 电话号码验证
     technicalDirectorTel: [
       { required: true, message: '请输入电话', trigger: 'blur' },
@@ -362,6 +383,22 @@ const cancel = () => {
   dialog.visible = false;
 };
 
+const handleDetail = async (row?: PurchaseDocVO) => {
+  proxy?.$modal.loading('加载中');
+  try {
+    const res = await getDetailBASE(row.id);
+    if (res.data) {
+      window.open(res.data);
+    } else {
+      proxy?.$modal.msgError('查看失败');
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('查看失败');
+  } finally {
+    proxy?.$modal.closeLoading();
+  }
+};
+
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };

src/views/materials/purchaseDoc/indexEdit.vue

@@ -296,7 +296,7 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  submitVerifyRef.value.openDialog(routeParams.value.taskId, false, routeParams.value.businessId);
   // submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 // 图纸上传成功之后 开始提交

src/views/materials/repertory/index.vue

@@ -8,8 +8,9 @@
               <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['system:repertoryDetails:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+
+              <el-button icon="Refresh" v-hasPermi="['system:repertoryDetails:list']" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>

src/views/materials/repertoryDetails/index.vue

@@ -8,56 +8,34 @@
               <el-input v-model="queryParams.name" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['cailiaoshebei:repertory:list']" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+
+              <el-button icon="Refresh" v-hasPermi="['cailiaoshebei:repertory:list']" @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="['system:repertory:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:repertory:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:repertory:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:repertory:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template> -->
-
       <el-table v-loading="loading" :data="repertoryList">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="设备材料名称" align="center" prop="name" />
         <el-table-column label="规格型号" align="center" prop="specification" />
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)" v-hasPermi="['system:repertory:edit']">详情</el-button>
+            <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)" v-hasPermi="['cailiaoshebei:repertoryDetails:list']"
+              >详情</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>
   </div>
 </template>
 
 <script setup name="Repertory" lang="ts">
-import { listRepertory, getRepertory, delRepertory, addRepertory, updateRepertory } from '@/api/materials/repertory';
+import { listRepertory } from '@/api/materials/repertory';
 import { RepertoryVO, RepertoryQuery, RepertoryForm } from '@/api/materials/repertory/types';
 import { useUserStoreHook } from '@/store/modules/user';
 

src/views/materials/suppliesprice/index.vue

@@ -4,17 +4,6 @@
       <!-- 流程分类树 -->
       <el-col style="" :span="5">
         <el-card shadow="hover">
-          <!-- <template #header>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0"
-                ><el-button type="primary" size="default" @click="addBatch" icon="FolderAdd" plain>新增</el-button></el-col
-              >
-              <el-col :span="1.5" :offset="0"
-                ><el-button type="danger" size="default" @click="handleDeleteBatch" icon="FolderDelete" plain>删除</el-button></el-col
-              >
-            </el-row>
-          </template> -->
-
           <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
           <el-tree
             ref="batchTreeRef"

src/views/materials/usageMaterials/material/index.vue

@@ -2,17 +2,27 @@
   <div class="p-5">
     <!-- 主要内容区 -->
     <el-card class="mb-5">
-      <el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md">
+      <el-button
+        icon="Refresh"
+        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
+        @click="refreshData"
+        class="transition-all duration-200 hover:shadow-md"
+      >
         刷新
       </el-button>
     </el-card>
 
     <!-- 数据表格 -->
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-      <el-table v-loading="loading" :data="tableData" border stripe
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        border
+        stripe
         :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
         style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
-        :row-class-name="tableRowClassName">
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
         <el-table-column prop="name" label="材料名称" min-width="150"></el-table-column>
         <el-table-column prop="specification" label="规格" min-width="120"></el-table-column>
@@ -39,12 +49,27 @@
           <template #default="scope">
             <!-- <el-button size="small" icon="Plus" @click="handleAddSon(scope.row)"
                 class="text-blue-600 hover:text-blue-800 transition-colors"></el-button> -->
-            <el-button size="small" icon="Edit" @click="handleEdit(scope.row)"
+            <el-button
-              class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+              size="small"
-            <el-button size="small" icon="View" @click="jumpRouter(scope.row)"
+              v-hasPermi="['cailiaoshebei:physicalsupply:edit']"
-              class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+              icon="Edit"
-            <el-button size="small" icon="Delete" @click="handleDelete(scope.row)"
+              @click="handleEdit(scope.row)"
-              class="text-red-600 hover:text-red-800 transition-colors"></el-button>
+              class="text-blue-600 hover:text-blue-800 transition-colors"
+            ></el-button>
+            <el-button
+              size="small"
+              v-hasPermi="['cailiaoshebei:physicalsupplySon:list']"
+              icon="View"
+              @click="jumpRouter(scope.row)"
+              class="text-blue-600 hover:text-blue-800 transition-colors"
+            ></el-button>
+            <el-button
+              size="small"
+              v-hasPermi="['cailiaoshebei:physicalsupply:remove']"
+              icon="Delete"
+              @click="handleDelete(scope.row)"
+              class="text-red-600 hover:text-red-800 transition-colors"
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -52,18 +77,27 @@
       <!-- 分页 -->
       <div class="flex items-center justify-between p-4 border-t">
         <div class="text-gray-500 text-sm">
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage *
+          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-            pageSize, total)
-          }} 条
         </div>
-        <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 50, 100]"
+        <el-pagination
-          :total="total" layout="prev, pager, next, jumper, sizes" @size-change="handleSizeChange"
+          v-model:current-page="currentPage"
-          @current-change="handleCurrentChange"></el-pagination>
+          v-model:page-size="pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="total"
+          layout="prev, pager, next, jumper, sizes"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
       </div>
     </div>
     <!-- 新增/编辑对话框 -->
-    <el-dialog v-model="dialogVisible" :title="dialogType === 'add' ? '新增记录' : '编辑记录'" :width="dialogWidth"
+    <el-dialog
-      :fullscreen="isFullscreen" :before-close="handleDialogClose">
+      v-model="dialogVisible"
+      :title="dialogType === 'add' ? '新增记录' : '编辑记录'"
+      :width="dialogWidth"
+      :fullscreen="isFullscreen"
+      :before-close="handleDialogClose"
+    >
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -107,8 +141,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="合同签订时间" prop="contractSigning">
-              <el-date-picker v-model="formData.contractSigning" type="datetime" placeholder="选择合同签订时间"
+              <el-date-picker
-                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                v-model="formData.contractSigning"
+                type="datetime"
+                placeholder="选择合同签订时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -137,9 +175,7 @@
       <template #footer>
         <div class="flex justify-end gap-2">
           <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="handleSave" :loading="saveLoading">
+          <el-button type="primary" @click="handleSave" :loading="saveLoading"> 保存 </el-button>
-            保存
-          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -154,7 +190,7 @@ import { useRouter } from 'vue-router';
 const userStore = useUserStoreHook();
 const router = useRouter();
 const currentProject = computed(() => userStore.selectedProject);
-import { useMaterialsQueryList, newMaterialsAdd, materialsEdit, materialsDel, queryMaterialsInfo } from "@/api/materials/usageMaterials/index";
+import { useMaterialsQueryList, newMaterialsAdd, materialsEdit, materialsDel, queryMaterialsInfo } from '@/api/materials/usageMaterials/index';
 // 表格数据相关
 const tableData = ref([]);
 const total = ref(0);
@@ -208,25 +244,23 @@ const formRules = reactive({
     { required: true, message: '请输入供应商', trigger: 'blur' },
     { max: 100, message: '供应商名称不能超过100个字符', trigger: 'blur' }
   ],
-  findType: [
+  findType: [{ required: true, message: '请选择类型', trigger: 'change' }]
-    { required: true, message: '请选择类型', trigger: 'change' }
-  ]
 });
 
-
-
 // 格式化日期
 const formatDate = (dateString) => {
   if (!dateString) return '-';
   const date = new Date(dateString);
-  return date.toLocaleString('zh-CN', {
+  return date
-    year: 'numeric',
+    .toLocaleString('zh-CN', {
-    month: '2-digit',
+      year: 'numeric',
-    day: '2-digit',
+      month: '2-digit',
-    hour: '2-digit',
+      day: '2-digit',
-    minute: '2-digit',
+      hour: '2-digit',
-    second: '2-digit'
+      minute: '2-digit',
-  }).replace(',', ' ');
+      second: '2-digit'
+    })
+    .replace(',', ' ');
 };
 
 // 表格行样式
@@ -293,7 +327,7 @@ const handleEdit = (row) => {
   resetForm();
 
   // 填充表单数据
-  Object.keys(formData).forEach(key => {
+  Object.keys(formData).forEach((key) => {
     if (row.hasOwnProperty(key)) {
       formData[key] = row[key];
     }
@@ -302,55 +336,49 @@ const handleEdit = (row) => {
   dialogVisible.value = true;
 };
 const handleAddSon = (row) => {
-  ElMessageBox.confirm(
+  ElMessageBox.confirm('确认提交', 'Warning', {
-    '确认提交',
+    confirmButtonText: '确认',
-    'Warning',
+    cancelButtonText: '取消',
-    {
+    type: 'warning'
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  ).then(() => {
-    materialsEdit(formData).then(res => {
-      let { code } = res
-      if (code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '提交成功',
-        })
-      }
-    })
-  }).catch(() => {
-    ElMessage({
-      type: 'info',
-      message: '已取消提交',
-    })
   })
+    .then(() => {
+      materialsEdit(formData).then((res) => {
+        let { code } = res;
+        if (code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提交成功'
+          });
+        }
+      });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '已取消提交'
+      });
+    });
 };
 
-
 // 删除
 const handleDelete = (row) => {
   currentRow.value = row;
-  ElMessageBox.confirm(
+  ElMessageBox.confirm('确定要删除这条记录吗？此操作不可撤销，请谨慎操作', '提示', {
-    '确定要删除这条记录吗？此操作不可撤销，请谨慎操作',
+    confirmButtonText: '确认',
-    '提示',
+    cancelButtonText: '取消',
-    {
+    type: 'warning'
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  ).then(() => {
-    confirmDelete();
-  }).catch(() => {
-    ElMessage({
-      type: 'info',
-      message: '已取消删除',
-    })
   })
+    .then(() => {
+      confirmDelete();
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '已取消删除'
+      });
+    });
 };
 
-
 // 确认删除
 const confirmDelete = async () => {
   if (!currentRow.value) return;
@@ -358,7 +386,7 @@ const confirmDelete = async () => {
   deleteLoading.value = true;
   try {
     // 模拟API请求
-    const res = await materialsDel(currentRow.value.id)
+    const res = await materialsDel(currentRow.value.id);
     const { code } = res;
     if (code === 200) {
       ElMessage.success('删除成功');
@@ -374,9 +402,7 @@ const confirmDelete = async () => {
     deleteLoading.value = false;
   }
 };
-// 
+//
-
-
 
 // 保存
 const handleSave = async () => {
@@ -390,16 +416,16 @@ const handleSave = async () => {
     if (dialogType.value === 'add') {
       // 新增
       formData.projectId = currentProject.value?.id;
-      const res = await newMaterialsAdd(formData)
+      const res = await newMaterialsAdd(formData);
-      let { code } = res
+      let { code } = res;
       if (code === 200) {
         ElMessage.success('新增成功');
         fetchData();
       }
     } else {
       // 编辑
-      const res = await materialsEdit(formData)
+      const res = await materialsEdit(formData);
-      let { code } = res
+      let { code } = res;
       if (code === 200) {
         ElMessage.success('保存成功');
         fetchData();
@@ -422,7 +448,7 @@ const resetForm = () => {
   }
 
   // 重置表单数据
-  Object.keys(formData).forEach(key => {
+  Object.keys(formData).forEach((key) => {
     formData[key] = '';
   });
 
@@ -451,8 +477,6 @@ const jumpRouter = (row) => {
 onMounted(() => {
   fetchData();
 });
-
 </script>
 
-<style scoped>
+<style scoped></style>
-</style>

src/views/materials/usageMaterials/material/indexSon.vue

@@ -1,8 +1,24 @@
 <template>
   <div class="p-5">
     <el-card class="mb-5">
-      <el-button type="primary" icon="Plus" @click="handleAdd" class="transition-all duration-200 hover:shadow-md"> 新增 </el-button>
+      <el-button
-      <el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md"> 刷新 </el-button>
+        type="primary"
+        icon="Plus"
+        v-hasPermi="['cailiaoshebei:physicalsupplySon:add']"
+        @click="handleAdd"
+        class="transition-all duration-200 hover:shadow-md"
+      >
+        新增
+      </el-button>
+
+      <el-button
+        icon="Refresh"
+        v-hasPermi="['cailiaoshebei:physicalsupplySon:list']"
+        @click="refreshData"
+        class="transition-all duration-200 hover:shadow-md"
+      >
+        刷新
+      </el-button>
     </el-card>
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 数据表格 -->
@@ -138,10 +154,12 @@
               icon="Edit"
               @click="handleEdit2(scope.row)"
               class="text-blue-600 hover:text-blue-800 transition-colors"
+              v-hasPermi="['cailiaoshebei:physicalsupplySon:edit']"
             ></el-button>
             <el-button
               size="small"
               icon="Delete"
+              v-hasPermi="['cailiaoshebei:physicalsupplySon:remove']"
               @click="handleDelete2(scope.row)"
               class="text-red-600 hover:text-red-800 transition-colors"
             ></el-button>

src/views/materials/usageMaterials/purchase/index.vue

@@ -1,19 +1,36 @@
 <template>
-  <div style="padding: 20px;">
+  <div style="padding: 20px">
     <el-card class="mb-5">
-      <el-button type="primary" icon="Plus" @click="handleAdd" class="transition-all duration-200 hover:shadow-md">
+      <el-button
+        type="primary"
+        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
+        icon="Plus"
+        @click="handleAdd"
+        class="transition-all duration-200 hover:shadow-md"
+      >
         新增
       </el-button>
-      <el-button icon="Refresh" @click="refreshData" class="transition-all duration-200 hover:shadow-md"> 刷新
+      <el-button
+        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
+        icon="Refresh"
+        @click="refreshData"
+        class="transition-all duration-200 hover:shadow-md"
+      >
+        刷新
       </el-button>
     </el-card>
 
     <!-- 数据表格 -->
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-      <el-table v-loading="loading" :data="tableData" border stripe
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        border
+        stripe
         style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
         :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
-        :row-class-name="tableRowClassName">
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
         <el-table-column prop="name" label="材料名称" align="center"></el-table-column>
         <el-table-column prop="specification" label="规格" align="center"></el-table-column>
@@ -38,14 +55,34 @@
         </el-table-column>
         <el-table-column label="操作" width="240" align="center" fixed="right">
           <template #default="scope">
-            <el-button size="small" icon="Plus" @click="handleAddSon(scope.row)"
+            <el-button
-              class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+              v-hasPermi="['cailiaoshebei:physicalsupplySon:add']"
-            <el-button size="small" icon="Edit" @click="handleEdit(scope.row)"
+              size="small"
-              class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+              icon="Plus"
-            <el-button size="small" icon="View" @click="jumpRouter(scope.row)"
+              @click="handleAddSon(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+              class="text-blue-600 hover:text-blue-800 transition-colors"
-            <el-button size="small" icon="Delete" @click="handleDelete(scope.row)"
+            ></el-button>
-              class="text-red-600 hover:text-red-800 transition-colors"></el-button>
+            <el-button
+              v-hasPermi="['cailiaoshebei:physicalsupply:edit']"
+              size="small"
+              icon="Edit"
+              @click="handleEdit(scope.row)"
+              class="text-blue-600 hover:text-blue-800 transition-colors"
+            ></el-button>
+            <el-button
+              v-hasPermi="['cailiaoshebei:physicalsupplySon:list']"
+              size="small"
+              icon="View"
+              @click="jumpRouter(scope.row)"
+              class="text-blue-600 hover:text-blue-800 transition-colors"
+            ></el-button>
+            <el-button
+              v-hasPermi="['cailiaoshebei:physicalsupply:remove']"
+              size="small"
+              icon="Delete"
+              @click="handleDelete(scope.row)"
+              class="text-red-600 hover:text-red-800 transition-colors"
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -53,17 +90,27 @@
       <!-- 分页 -->
       <div class="flex items-center justify-between p-4 border-t">
         <div class="text-gray-500 text-sm">
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total)
+          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-          }} 条
         </div>
-        <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 50, 100]"
+        <el-pagination
-          :total="total" layout="prev, pager, next, jumper, sizes" @size-change="handleSizeChange"
+          v-model:current-page="currentPage"
-          @current-change="handleCurrentChange"></el-pagination>
+          v-model:page-size="pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="total"
+          layout="prev, pager, next, jumper, sizes"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
       </div>
     </div>
     <!-- 新增/编辑对话框 -->
-    <el-dialog v-model="dialogVisible" :title="dialogType === 'add' ? '新增记录' : '编辑记录'" :width="dialogWidth"
+    <el-dialog
-      :fullscreen="isFullscreen" :before-close="handleDialogClose">
+      v-model="dialogVisible"
+      :title="dialogType === 'add' ? '新增记录' : '编辑记录'"
+      :width="dialogWidth"
+      :fullscreen="isFullscreen"
+      :before-close="handleDialogClose"
+    >
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -107,8 +154,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="合同签订时间" prop="contractSigning">
-              <el-date-picker v-model="formData.contractSigning" type="datetime" placeholder="选择合同签订时间"
+              <el-date-picker
-                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                v-model="formData.contractSigning"
+                type="datetime"
+                placeholder="选择合同签订时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -121,8 +172,7 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="供货要求" prop="supplyRequirements">
-              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea"
+              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea" :rows="3"></el-input>
-                :rows="3"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -143,7 +193,6 @@
       </template>
     </el-dialog>
   </div>
-
 </template>
 
 <script setup>
@@ -154,7 +203,7 @@ import { useRouter } from 'vue-router';
 const userStore = useUserStoreHook();
 const router = useRouter();
 const currentProject = computed(() => userStore.selectedProject);
-import { useMaterialsQueryList, newMaterialsAdd, materialsEdit, materialsDel, queryMaterialsInfo } from '@/api/materials/usageMaterials/index';
+import { useMaterialsQueryList, newMaterialsAdd, materialsEdit, materialsDel } from '@/api/materials/usageMaterials/index';
 // 表格数据相关
 const tableData = ref([]);
 const total = ref(0);
@@ -251,7 +300,7 @@ const fetchData = async () => {
     ElMessage.error('获取数据失败：' + error.message);
     console.error(error);
   } finally {
-    loading.value = false;//
+    loading.value = false; //
   }
 };
 
@@ -332,22 +381,20 @@ const handleAddSon = (row) => {
 // 删除
 const handleDelete = (row) => {
   currentRow.value = row;
-  ElMessageBox.confirm(
+  ElMessageBox.confirm('确定要删除这条记录吗？此操作不可撤销，请谨慎操作', '提示', {
-    '确定要删除这条记录吗？此操作不可撤销，请谨慎操作',
+    confirmButtonText: '确认',
-    '提示',
+    cancelButtonText: '取消',
-    {
+    type: 'warning'
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  ).then(() => {
-    confirmDelete();
-  }).catch(() => {
-    ElMessage({
-      type: 'info',
-      message: '已取消删除',
-    })
   })
+    .then(() => {
+      confirmDelete();
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '已取消删除'
+      });
+    });
 };
 
 // 确认删除

src/views/out/constructionValue/index.vue

@@ -208,7 +208,20 @@ const data = reactive<PageData<ConstructionValueForm, ConstructionValueQuery>>({
     artificialNum: [{ required: true, message: '人工填报数量不能为空', trigger: 'blur' }],
     reportDateId: [{ required: true, message: '上报日期不能为空', trigger: 'blur' }],
     uavNum: [{ required: true, message: '无人机识别数量不能为空', trigger: 'blur' }],
-    confirmNum: [{ required: true, message: '确认数量不能为空', trigger: 'blur' }],
+    confirmNum: [
+      { required: true, message: '确认数量不能为空', trigger: 'blur' },
+      {
+        validator: (rule: any, value: any, callback: any) => {
+          // 判断是否整数
+          if (!/^\d+$/.test(value)) {
+            callback(new Error('请输入整数'));
+          } else {
+            callback();
+          }
+        },
+        trigger: 'blur'
+      }
+    ],
     outValue: [{ required: true, message: '产值不能为空', trigger: 'blur' }]
   }
 });

src/views/patch/index.vue

@@ -5,10 +5,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务描述" prop="describe">
+            <el-form-item label="任务名称" prop="taskName">
-              <el-input v-model="queryParams.describe" placeholder="请输入任务描述" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.taskName" 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>
@@ -17,7 +16,6 @@
         </el-card>
       </div>
     </transition>
-
     <!-- 任务列表卡片 -->
     <el-card shadow="never">
       <template #header>
@@ -25,21 +23,12 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['patch:patch:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['patch:patch:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['patch:patch:remove']"
-              >删除</el-button
-            >
-          </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['patch:patch:export']">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <!-- 任务列表表格 -->
       <el-table v-loading="loading" :data="masterList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" />
@@ -77,22 +66,20 @@
         <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-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['patch:patch:edit']"></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['patch:patch:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-
       <!-- 进度详情弹窗 -->
       <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px" destroy-on-close>
         <div class="mb-4">
-          <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()" v-hasPermi="['patch:progress:add']">
+          <!-- v-hasPermi="['patch:progress:add']" -->
-            新增进度
+          <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
-          </el-button>
         </div>
         <el-table v-loading="progressLoading" :data="progressList" border empty-text="暂无进度数据" style="width: 100%">
           <el-table-column prop="slaveName" label="执行人姓名" align="center" width="150" />
@@ -129,21 +116,12 @@
           </el-table-column>
         </el-table>
       </el-dialog>
-
       <!-- 新增/修改进度弹窗 -->
       <el-dialog :title="progressDialog.title" v-model="progressDialog.visible" width="500px" append-to-body destroy-on-close>
         <el-form ref="progressFormRef" :model="progressForm" :rules="progressRules" label-width="120px">
           <el-input v-model="progressForm.ordersId" placeholder="关联的任务ID" readonly style="color: #666; background: #f5f7fa" type="hidden" />
           <el-input v-model="progressForm.projectId" type="hidden" />
-          <!-- 修改执行人姓名选择框 -->
-          <el-form-item label="执行人姓名" prop="slaveName">
-            <el-select v-model="progressForm.slaveName" placeholder="请选择执行人姓名" clearable style="width: 100%" @change="handleSlaveChange">
-              <el-option v-for="item in slaveOptions" :key="item.id" :label="item.name" :value="item.name" :data-id="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-
           <el-input v-model="progressForm.slaveId" placeholder="请输入执行人ID" v-if="false" />
-
           <el-form-item label="进度" prop="progress">
             <el-input v-model="progressForm.progress" placeholder="请输入进度（0-100之间的数字）" type="number" @input="handleProgressInput" />
           </el-form-item>
@@ -173,6 +151,11 @@
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
+        <el-form-item label="执行人姓名" prop="userId">
+          <el-select v-model="form.userId" placeholder="请选择执行人姓名" clearable style="width: 100%">
+            <el-option v-for="item in slaveOptions" :key="item.id" :label="item.nickName" :value="item.userId"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="计划完成时间" prop="pcd">
           <el-date-picker clearable v-model="form.pcd" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择计划完成时间" />
         </el-form-item>
@@ -180,10 +163,10 @@
           <el-date-picker clearable v-model="form.act" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择实际完成时间" />
         </el-form-item>
         <el-form-item label="任务描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入任务描述" rows="3" />
+          <el-input v-model="form.describe" type="textarea" placeholder="请输入任务描述" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -224,37 +207,17 @@ const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const currentProjectId = computed(() => currentProject.value?.id);
 // 1. 调整类型定义，匹配接口返回的字段
-const slaveOptions = ref<Array<{ id: number; name: string }>>([]);
+const slaveOptions = ref([]);
-// 在脚本中添加选择变化的处理函数
+const userMap = new Map();
-const handleSlaveChange = (name) => {
-  // 找到选中的用户对象
-  const selectedUser = slaveOptions.value.find((item) => item.name === name);
-  if (selectedUser) {
-    // 自动填充userId到slaveId
-    progressForm.slaveId = selectedUser.id;
-  } else {
-    // 未选中时清空ID
-    progressForm.slaveId = '';
-  }
-};
-
 async function initSlaveOptions() {
   try {
     const response = await getUserName();
-    // 确保获取到正确的数组数据（接口返回在data字段中）
+    console.log(response);
-    const userDataList = Array.isArray(response?.data) ? response.data : [];
+    slaveOptions.value = response.data;
-
+    slaveOptions.value.forEach((item) => {
-    // 转换数据结构，只提取需要的字段（userId作为id，nickName作为name）
+      userMap.set(item.userId, item.nickName);
-    slaveOptions.value = userDataList
+    });
-      .filter((item) => item?.userId && item?.nickName) // 过滤有效数据
-      .map((item) => ({
-        id: item.userId, // 使用userId作为选项的id
-        name: item.nickName // 使用nickName作为显示名称
-      }));
-
-    console.log('slaveOptions 已更新:', slaveOptions.value);
   } catch (error) {
-    console.error('获取用户数据失败:', error);
     slaveOptions.value = []; // 错误时重置为空数组
   }
 }
@@ -327,7 +290,7 @@ const queryFormRef = ref<ElFormInstance>();
 const masterFormRef = ref<ElFormInstance>();
 const dialog = reactive<DialogOption>({ visible: false, title: '' });
 
-const initFormData: MasterForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProjectId.value,
   taskName: undefined,
@@ -336,7 +299,9 @@ const initFormData: MasterForm = {
   act: undefined,
   completionProgress: undefined,
   taskStatus: undefined,
-  remark: undefined
+  remark: undefined,
+  userId: '',
+  userName: ''
 };
 
 const data = reactive<PageData<MasterForm, MasterQuery>>({
@@ -355,6 +320,7 @@ const data = reactive<PageData<MasterForm, MasterQuery>>({
   },
   rules: {
     projectId: [{ required: true, message: '请输入项目ID', trigger: 'blur' }],
+    userId: [{ required: true, message: '请选择执行人', trigger: 'blur' }],
     taskName: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
     completionProgress: [{ required: true, message: '请输入完成进度', trigger: 'blur' }]
   }
@@ -593,6 +559,7 @@ const submitForm = () => {
   masterFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
     buttonLoading.value = true;
+    form.value.userName = userMap.get(form.value.userId);
     try {
       // 确保提交时使用当前项目ID
       if (!form.value.id && currentProjectId.value) {

src/views/progress/progressCategory/index.vue

@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <div v-if="scope.row.parentId">
+            <div>
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:progressCategory:edit']">
                 修改
               </el-button>
@@ -88,6 +88,21 @@
     <!-- 添加或修改分项工程单价对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="progressCategoryFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父类别" prop="parentId" v-if="!form.id">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="progressCategoryOptions"
+            :props="{ value: 'id', label: 'name', children: 'children' }"
+            value-key="id"
+            placeholder="请选择父类别"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="计量方式" prop="unitType" v-if="!form.id">
+          <el-select v-model="form.unitType" placeholder="请选择关联数据">
+            <el-option v-for="dict in progress_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="类别名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入类别名称" :disabled="form.id != null" />
         </el-form-item>
@@ -100,7 +115,14 @@
         <el-form-item label="综合单价" prop="unitPrice">
           <el-input v-model="form.unitPrice" placeholder="请输入综合单价" />
         </el-form-item>
-
+        <el-form-item label="关联数据" prop="workType" v-if="!form.id">
+          <el-select v-model="form.workType" placeholder="请选择关联数据">
+            <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" v-if="!form.id">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
         <!-- <el-form-item label="总数量/百分比" prop="total">
           <el-input v-model="form.total" placeholder="请输入总数量/百分比" />
         </el-form-item> -->
@@ -128,7 +150,7 @@ import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from
 import { useUserStoreHook } from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { progress_unit_type, progress_status } = toRefs<any>(proxy?.useDict('progress_unit_type', 'progress_status'));
+const { progress_unit_type, progress_work_type } = toRefs<any>(proxy?.useDict('progress_unit_type', 'progress_work_type'));
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -161,7 +183,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: ProgressCategoryForm = {
   id: undefined,
   parentId: undefined,
-  projectId: currentProject.value?.id,
+  projectId: '',
   matrixId: undefined,
   matrixName: undefined,
   name: undefined,
@@ -183,6 +205,7 @@ const data = reactive<PageData<ProgressCategoryForm, ProgressCategoryQuery>>({
   queryParams: {
     parentId: undefined,
     projectId: currentProject.value?.id,
+
     matrixId: undefined,
     matrixName: undefined,
     name: undefined,
@@ -229,7 +252,10 @@ const getList = async () => {
       });
       if (!matrixValue.value) matrixValue.value = matrixList[0].id;
       matrixOptions.value = matrixList;
+      console.log('🚀 ~ getList ~ matrixList:', matrixList);
       queryParams.value.matrixId = matrixList[0].children[0].matrixId;
+      form.value.projectId = matrixList[0].projectId;
+      form.value.matrixId = matrixList[0].children[0].matrixId;
     }
   }
   loading.value = true;
@@ -262,12 +288,19 @@ const cancel = () => {
 
 // 表单重置
 const reset = () => {
-  form.value = { ...initFormData };
+  const projectId = form.value.projectId;
+  const matrixId = form.value.matrixId;
+
+  form.value = { ...initFormData, projectId, matrixId };
+
   isDisabled.value = false;
   progressCategoryFormRef.value?.resetFields();
 };
 /** 级联选择器改变事件 */
 const handleChange = (value: number) => {
+  form.value.matrixId = value[1];
+  form.value.projectId = value[0];
+
   queryParams.value.matrixId = value[1];
 
   getList();