Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into fs

src/api/ctr/expensesContract/index.ts

@@ -0,0 +1,83 @@
+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
+  })
+}
+
+// 获取招标计划
+export const getTenderPlan = (data) => {
+  return request({
+    url: '/ctr/expensesContract/tender/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/Professional/index.ts

@@ -31,3 +31,11 @@ export const getFileList = (id) => {
     method: 'get'
   });
 };
+// 获取专业
+export const extractUserMajor = (params) => {
+  return request({
+    url: '/design/extract/userMajor',
+    method: 'get',
+    params
+  });
+};

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/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>
@@ -112,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({}),
   // 成功回调
@@ -155,7 +145,6 @@ const fileUploadRef = ref<ElUploadInstance>();
 const accept = computed(() => {
   return props.fileType.map((value) => `.${value}`).join(',');
 });
-
 watch(
   () => props.modelValue,
   async (val) => {
@@ -169,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,
@@ -189,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) => {
   // 校检文件类型
@@ -416,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;
@@ -445,6 +446,7 @@ defineExpose({ submitUpload });
   align-items: center;
   color: inherit;
 }
+
 .Shadow {
   align-items: center;
   background-color: rgba(0, 0, 0, 0.5);
@@ -466,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/views/biddingManagemen/biddingLimit/index.vue

@@ -27,6 +27,9 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Edit" @click="handleAudit" v-hasPermi="['desibiddinggn:biddingLimitList:query']">审核</el-button>
+          </el-form-item>
         </el-form>
       </el-card>
     </transition>
@@ -123,28 +126,24 @@ const changeSheet = () => {
 
 //获取表名
 const getSheetName = async () => {
-  try {
+  const params = {
-    const params = {
+    projectId: currentProject.value?.id
-      projectId: currentProject.value?.id
+    // versions: queryForm.value.versions
-      // versions: queryForm.value.versions
+  };
-    };
+  const res = await sheetList(params);
-    const res = await sheetList(params);
+  if (res.code == 200) {
-    if (res.code == 200) {
+    sheets.value = res.data;
-      sheets.value = res.data;
+    if (res.data.length > 0) {
-      if (res.data.length > 0) {
+      queryForm.value.sheet = res.data[0];
-        queryForm.value.sheet = res.data[0];
+    } else {
-      } else {
+      queryForm.value.sheet = '';
-        queryForm.value.sheet = '';
-      }
-      getTableData();
     }
-  } catch (error) {}
+    getTableData();
+  }
 };
 //获取表格
 const getTableData = async () => {
   loading.value = true;
-  console.log(212121);
-  
   const params = {
     projectId: currentProject.value?.id,
     sheet: queryForm.value.sheet
@@ -154,7 +153,6 @@ const getTableData = async () => {
   if (res.code == 200) {
     tableData.value = [res.data[0]];
   }
-  console.log(loading.value);
 };
 //修改单价
 const handleSave = (row: any) => {
@@ -228,6 +226,20 @@ const handleExport = () => {
     `限价一览表${queryForm.value.sheet}.xlsx`
   );
 };
+// 审核
+const handleAudit = (row: any) => {
+  console.log(11111);
+
+  // proxy.$tab.closePage(proxy.$route);
+  // proxy.$router.push({
+  //   path: `/approval/biddingLimit/indexEdit`,
+  //   query: {
+  //     id: row.id,
+  //     type: 'add'
+  //   }
+  // });
+};
+
 onUnmounted(() => {
   listeningProject();
 });

src/views/biddingManagemen/biddingLimit/indexEdit.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">成本核算清单</h3>
+        </div>
+        <div class="p-6">
+          <el-form
+            ref="leaveFormRef"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+              <el-form-item label="表格文件" prop="fileId" class="mb-2 md:col-span-2">
+                <input type="text" :value="form.fileId" class="w-full" readonly />
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { getDrawing } from '@/api/design/drawing';
+import { updateDesignChange, getDesignChange } from '@/api/design/designChange';
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_costAccounting',
+    label: '成本核算清单审批'
+  }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  versionNumber: undefined,
+  fileName: undefined,
+  fileUrl: undefined,
+  fileType: undefined,
+  fileSuffix: undefined,
+  originalName: undefined,
+  remark: undefined,
+  fileId: undefined
+};
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    fileName: undefined,
+    fileType: undefined,
+    fileSuffix: undefined,
+    fileStatus: undefined,
+    originalName: undefined,
+    newest: undefined,
+    params: {}
+  },
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getDesignChange(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  leaveFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      var res;
+      // if (form.value.id) {
+      res = await updateDesignChange({ ...form.value, id: routeParams.value.id }).finally(() => (buttonLoading.value = false));
+      // }
+      if (res.code == 200) {
+        dialog.visible = false;
+        submit(status.value, res.data);
+      }
+    }
+  });
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    console.log(data);
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>

src/views/biddingManagemen/listOfWinningBids/index copy.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/biddingManagemen/listOfWinningBids/index.vue

@@ -1,94 +1,40 @@
 <template>
-  <div class="p-2">
+  <div class="p-4 bg-gray-50 min-h-screen">
-    <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" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
-        <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">
+        <div class="bg-blue-50 px-6 py-4 rounded-t-xl mb-0">
-          <el-col :span="1.5">
+          <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息填写</h3>
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bidding:listOfWinningBids:add']">新增</el-button>
+          <span>{{ currentProject.name }}</span>
-          </el-col>
+        </div>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
       </template>
-
+      <el-form ref="listOfWinningBidsFormRef" :model="form" :rules="rules" label-width="150px" class="p-6 pt-4" style="background-color: #ffffff">
-      <el-table v-loading="loading" :data="listOfWinningBidsList" @selection-change="handleSelectionChange">
+        <el-row :gutter="32">
-        <!-- <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-form-item label="中标价(美元)" prop="winningBidOriginal" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <el-input v-model.number="form.winningBidOriginal" type="number" placeholder="请输入中标价" @input="calculateWinningBid" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="中标价" prop="winningBidOriginal">
+            <el-form-item label="汇率" prop="exchangeRate" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.winningBidOriginal" placeholder="请输入中标价" /> </el-form-item
+              <el-input v-model.number="form.exchangeRate" type="number" placeholder="请输入汇率" step="0.0001" @input="calculateWinningBid" />
-          ></el-col>
+            </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-form-item label="币种" prop="currency" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <el-input v-model="form.currency" 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-form-item label="中标价(人民币)" prop="winningBid" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <!-- 人民币输入框：添加readonly禁止手动修改 -->
+              <el-input v-model="form.winningBid" type="number" placeholder="根据美元中标价和汇率自动计算" readonly />
+            </el-form-item>
+          </el-col>
+          <!-- 其他表单项保持不变 -->
           <el-col :span="12">
-            <el-form-item label="所属主体" prop="subject"> <el-input v-model="form.subject" placeholder="请输入所属主体" /> </el-form-item
+            <el-form-item label="中标日期" prop="bidWinningDate" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></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"
@@ -96,32 +42,49 @@
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 placeholder="请选择中标日期"
-              >
+              />
-              </el-date-picker> </el-form-item
+            </el-form-item>
-          ></el-col>
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="投标保证金" prop="bidDeposit"> <el-input v-model="form.bidDeposit" placeholder="请输入投标保证金" /> </el-form-item
+            <el-form-item label="投标保证金(人民币)" prop="bidDeposit" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <el-input v-model="form.bidDeposit" type="number" placeholder="请输入投标保证金" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="是否退还" prop="whetherSendBack">
+            <el-form-item label="是否退还" prop="whetherSendBack" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.whetherSendBack" placeholder="请输入是否退还" /> </el-form-item
+              <el-radio-group v-model="form.whetherSendBack">
-          ></el-col>
+                <el-radio label="是" border>是</el-radio>
-          <el-col :span="12"
+                <el-radio label="否" border>否</el-radio>
-            ><el-form-item label="建设单位" prop="construction"> <el-input v-model="form.construction" placeholder="请输入建设单位" /> </el-form-item
+              </el-radio-group>
-          ></el-col>
+            </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-form-item label="所属主体" prop="subject" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <el-input v-model="form.subject" placeholder="请输入所属主体" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="立项申请人" prop="projectApplicant">
+            <el-form-item label="建设单位" prop="construction" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" /> </el-form-item
+              <el-input v-model="form.construction" placeholder="请输入建设单位" />
-          ></el-col>
+            </el-form-item>
-          <el-col :span="12"
+          </el-col>
-            ><el-form-item label="立项部门" prop="projectApplicantDept">
+          <el-col :span="12">
-              <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" /> </el-form-item
+            <el-form-item label="总造价" prop="totalCost" class="rounded-lg border border-gray-100 p-1 mb-5">
-          ></el-col>
+              <el-input v-model="form.totalCost" placeholder="请输入总造价" />
-          <el-col :span="12"
+            </el-form-item>
-            ><el-form-item label="立项申请日期" prop="projectApplicantTime">
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项申请人" prop="projectApplicant" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项部门" prop="projectApplicantDept" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项申请日期" prop="projectApplicantTime" class="rounded-lg border border-gray-100 p-1 mb-5">
               <el-date-picker
                 clearable
                 v-model="form.projectApplicantTime"
@@ -129,57 +92,60 @@
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 placeholder="请选择立项申请日期"
-              >
+              />
-              </el-date-picker> </el-form-item
+            </el-form-item>
-          ></el-col>
+          </el-col>
-          <el-col :span="12"
+          <el-col :span="12">
-            ><el-form-item label="项目编号" prop="projectNumbering">
+            <el-form-item label="项目编号" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" /> </el-form-item
+              <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" />
-          ></el-col>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目状态" prop="projectStatus" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectStatus" placeholder="请输入项目状态(如：进行中/已完成)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 操作按钮区域 -->
+        <el-row class="mt-8">
+          <el-col :span="24" class="text-center">
+            <el-button
+              :loading="buttonLoading"
+              type="primary"
+              @click="submitForm"
+              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+              class="rounded-full px-8"
+              size="large"
+            >
+              确认提交
+            </el-button>
+            <el-button type="default" @click="resetForm" class="ml-6 rounded-full px-8" size="large"> 重置 </el-button>
+          </el-col>
         </el-row>
       </el-form>
-      <template #footer>
+    </el-card>
-        <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">
+<script setup name="ListOfWinningBidsForm" lang="ts">
-import {
+import { ref, reactive, toRefs, watch, onMounted, onUnmounted, getCurrentInstance, ComponentInternalInstance, computed } from 'vue';
-  listListOfWinningBids,
+import { addListOfWinningBids, updateListOfWinningBids, getListOfWinningBids } from '@/api/bidding/listOfWinningBids';
-  getListOfWinningBids,
+import { ListOfWinningBidsVO, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
-  delListOfWinningBids,
-  addListOfWinningBids,
-  updateListOfWinningBids
-} from '@/api/bidding/listOfWinningBids';
-import { ListOfWinningBidsVO, ListOfWinningBidsQuery, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
 import { useUserStoreHook } from '@/store/modules/user';
+import { ElFormInstance, ElMessage } from 'element-plus';
+
+// 获取组件实例
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 获取用户 store
+// 用户状态管理
 const userStore = useUserStoreHook();
-// 从 store 中获取当前选中的项目
+// 当前选中项目（从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>({
+const buttonLoading = ref(false);
-  visible: false,
+// 表单初始数据
-  title: ''
-});
-
 const initFormData: ListOfWinningBidsForm = {
   id: undefined,
   projectId: currentProject.value?.id,
@@ -201,144 +167,169 @@ const initFormData: ListOfWinningBidsForm = {
   processStatus: undefined,
   projectNumbering: undefined
 };
-const data = reactive<PageData<ListOfWinningBidsForm, ListOfWinningBidsQuery>>({
+
-  form: { ...initFormData },
+// 表单数据与验证规则
-  queryParams: {
+const data = reactive({
-    pageNum: 1,
+  form: { ...initFormData } as ListOfWinningBidsForm,
-    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' }],
-    projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }]
+    projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-  }
+    winningBidOriginal: [{ required: true, message: '请输入原始中标价', trigger: 'blur' }],
+    exchangeRate: [
+      { required: true, message: '请输入汇率', trigger: 'blur' },
+      { type: 'number', min: 0.001, message: '汇率需大于0', trigger: 'blur' }
+    ],
+    currency: [{ required: true, message: '请输入币种', trigger: 'blur' }],
+    subject: [{ required: true, message: '请输入所属主体', trigger: 'blur' }],
+    winningBid: [{ required: true, message: '请输入中标价', trigger: 'blur' }],
+    bidWinningDate: [{ required: true, message: '请选择中标日期', trigger: 'blur' }],
+    projectNumbering: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+  } as Record<string, any>
 });
 
-const { queryParams, form, rules } = toRefs(data);
+// 解构响应式数据
+const { form, rules } = toRefs(data);
 
-/** 查询中标项目一览列表 */
+/**
-const getList = async () => {
+ * 计算人民币中标价
-  loading.value = true;
+ * 显式触发的计算函数，确保执行时机可靠
-  const res = await listListOfWinningBids(queryParams.value);
+ */
-  listOfWinningBidsList.value = res.rows;
+const calculateWinningBid = () => {
-  total.value = res.total;
+  // 确保数据类型正确
-  loading.value = false;
+  const dollarAmount = Number(form.value.winningBidOriginal);
+  const rate = Number(form.value.exchangeRate);
+
+  // 验证输入有效性
+  if (isNaN(dollarAmount) || isNaN(rate) || dollarAmount <= 0 || rate <= 0) {
+    form.value.winningBid = undefined;
+    return;
+  }
+
+  // 计算并保留2位小数
+  const result = dollarAmount * rate;
+  form.value.winningBid = Number(result.toFixed(2));
 };
 
-/** 取消按钮 */
+/**
-const cancel = () => {
+ * 页面初始化 - 获取已有数据（如存在）
-  reset();
+ */
-  dialog.visible = false;
+const initData = async () => {
+  try {
+    if (currentProject.value?.id) {
+      const res = await getListOfWinningBids(currentProject.value.id);
+      if (res.data && res.data.id) {
+        Object.assign(form.value, res.data);
+        // 初始化时手动触发一次计算
+        setTimeout(calculateWinningBid, 0);
+      }
+    }
+  } catch (error) {
+    console.error('初始化数据失败:', error);
+    ElMessage.error('初始化数据失败');
+  }
 };
 
-/** 表单重置 */
+/**
-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) {
+      try {
-        await updateListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
+        // 提交前确保计算正确
-      } else {
+        calculateWinningBid();
-        await addListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
+
+        form.value.projectId = currentProject.value?.id;
+        if (form.value.id) {
+          await updateListOfWinningBids(form.value);
+        } else {
+          await addListOfWinningBids(form.value);
+        }
+
+        ElMessage.success('提交成功');
+        resetForm();
+      } catch (error) {
+        ElMessage.error('提交失败，请重试');
+        console.error('提交表单失败:', error);
+      } 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));
+const resetForm = () => {
-  await delListOfWinningBids(_ids);
+  form.value = { ...initFormData, projectId: currentProject.value?.id };
-  proxy?.$modal.msgSuccess('删除成功');
+  listOfWinningBidsFormRef.value?.resetFields();
-  await getList();
 };
 
-/** 导出按钮操作 */
+/**
-const handleExport = () => {
+ * 监听项目ID变化 - 重新初始化数据
-  proxy?.download(
+ */
-    'bidding/listOfWinningBids/export',
+const projectIdWatcher = watch(
-    {
-      ...queryParams.value
-    },
-    `listOfWinningBids_${new Date().getTime()}.xlsx`
-  );
-};
-//监听项目id刷新数据
-const listeningProject = watch(
   () => currentProject.value?.id,
-  (nid, oid) => {
+  (newId) => {
-    getList();
+    if (newId) {
+      form.value.projectId = newId;
+      initData();
+    }
   }
 );
 
-onUnmounted(() => {
+// 页面挂载时初始化
-  listeningProject();
-});
 onMounted(() => {
-  getList();
+  initData();
+});
+
+// 页面卸载时清除监听
+onUnmounted(() => {
+  projectIdWatcher();
 });
 </script>
+
+<style scoped>
+/* 全局背景色：柔和灰色，区分页面与卡片 */
+.bg-gray-50 {
+  background-color: #f9fafb;
+}
+
+/* 表单项优化：hover效果+边框过渡，提升交互感 */
+.el-form-item {
+  transition: all 0.2s ease;
+}
+.el-form-item:hover {
+  border-color: #e6f7ff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* 输入框/选择器统一圆角 */
+.el-input__wrapper,
+.el-date-editor .el-input__wrapper {
+  border-radius: 6px !important;
+}
+
+/* 卡片头部文字对齐优化 */
+.el-card__header-title {
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+
+/* 按钮间距与过渡效果 */
+.el-button {
+  transition: all 0.2s ease;
+}
+.el-button:hover {
+  transform: translateY(-1px);
+}
+
+/* 只读输入框样式优化（区分可编辑状态） */
+.el-input--readonly .el-input__wrapper {
+  background-color: #f9fafb;
+  cursor: not-allowed;
+}
+</style>

src/views/ctr/expensesContract/index.vue

@@ -0,0 +1,314 @@
+<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="contractType">
+          <template #default="scope">
+            <dict-tag :options="expenses_contract_type" :value="scope.row.contractType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" align="center" prop="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';
+import useUserStore from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { expenses_contract_type, income_contract_type } = toRefs(
+  proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+const 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 userStore = useUserStore();
+const queryFormRef = ref<ElFormInstance>();
+const expensesContractFormRef = ref<ElFormInstance>();
+const currentProject = computed(() => userStore.selectedProject);
+
+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: currentProject.value?.id,
+    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();
+});
+// 监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    queryParams.value.projectId = nid;
+    form.value.projectId = nid;
+    getList();
+  }
+);
+
+onUnmounted(() => {
+  listeningProject();
+});
+</script>

src/views/ctr/incomeContract/index.vue

@@ -0,0 +1,303 @@
+<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">
+          <template #default="scope">
+            <dict-tag :options="income_contract_type" :value="scope.row.contractType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="业主单位" align="center" prop="contractOwner" />
+        <el-table-column label="承包内容" align="center" prop="contractedContent" />
+        <el-table-column label="合同金额" align="center" prop="amount" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <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';
+import useUserStore from '@/store/modules/user';
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const currentProject = computed(() => userStore.selectedProject);
+
+const { expenses_contract_type, income_contract_type } = toRefs(
+  proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+const incomeContractList = ref<IncomeContractVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+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: currentProject.value?.id,
+    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();
+});
+// 监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    queryParams.value.projectId = nid;
+    form.value.projectId = nid;
+    getList();
+  }
+);
+
+onUnmounted(() => {
+  listeningProject();
+});
+</script>

src/views/ctr/index.vue

@@ -0,0 +1,406 @@
+<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="tenderId">
+                            <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
+                            <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
+                            <el-button type="primary" @click="handleChoose">选择招标</el-button>
+                        </el-form-item>
+                        <el-form-item label="供应商" prop="contractSupplier">
+                            <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
+                        </el-form-item>
+                        <el-form-item label="分包内容">
+                            <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
+                            <el-input v-model="form.contractedContent" style="width: 300px"
+                                :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
+                        </el-form-item>
+                        <el-form-item label="合同金额" prop="amount">
+                            <el-input
+                                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+                                v-model="form.amount" placeholder="请输入合同金额" disabled />
+                        </el-form-item>
+
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="form.remark" placeholder="请输入备注" />
+                        </el-form-item>
+                        <el-form-item label="附件">
+                            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
+                                :ref="fileRef" :defaultFileList="tempFileList" />
+                        </el-form-item>
+                    </el-form>
+                </template>
+                <div>
+                    <el-button @click="back(true)">上一步</el-button>
+                    <el-button type="primary" @click="next">下一步</el-button>
+                </div>
+            </template>
+            <template v-else-if="active == 2">
+                <h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
+                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+                        <el-select v-model="form.payType">
+                            <el-option :value="1" label="月结算">月结算</el-option>
+                            <el-option :value="2" label="形象节点">形象节点</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+                        <el-input v-model="form.advancePayRatio" placeholder="请输入预付款比例"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+                        <el-input v-model="form.balancePayRatio" placeholder="请输入尾款比例"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio;">
+                        <el-input v-model="form.assuranceDepositRatio" placeholder="请输入质保金比例"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="付款比例（%）" prop="payRatio">
+                        <el-input v-model="form.payRatio" placeholder="请输入付款比例"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <div>
+                            <el-button @click="back(false)">上一步</el-button>
+                            <el-button type="success" @click="submitForm">提交</el-button>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </template>
+        </div>
+        <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
+            <el-table :data="planList">
+                <el-table-column type="index" width="50" label="序号" />
+                <el-table-column label="名称" align="center" prop="name" />
+                <el-table-column label="合同额" align="center" prop="contractPrice" />
+                <el-table-column label="分包内容" align="center" prop="content" />
+                <el-table-column label="中标单位" align="center" prop="winningBidder" />
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <template #default="scope">
+                        <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="dialogVisible = false">
+                        关闭
+                    </el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup>
+import FileUpload from '@/components/FileUpload';
+import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { useUserStore } from '@/store/modules/user';
+const active = ref(0);
+const contract_type = ref("")
+const form = ref({ payType: 1 })
+const fileList = ref([])
+const tempFileList = ref([])
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const planList = ref([]);
+const dialogVisible = ref(false);
+
+const { expenses_contract_type, income_contract_type } = toRefs(
+    proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+const fileRef = ref(null);
+const incomeContractFormRef = ref(null);
+const expensesContractFormRef = ref(null);
+const payMentRef = ref(null);
+const incomeContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const expensesContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+
+    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const payMentRules = {
+    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
+    payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }],
+};
+
+const project = computed(() => {
+    console.log(111);
+
+    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('请填写完整的支出合同信息');
+    //         }
+    //     });
+    // }
+}
+const handleChoose = async () => {
+    if (!form.value.contractType) {
+        ElMessage.error('请先选择合同类型');
+        return;
+    }
+    const formData = {
+        projectId: userStore.selectedProject.id,
+        dictName: form.value.contractType,
+        status: 1,
+    }
+    const { data } = await getTenderPlan(formData)
+    if (data.length === 0) {
+        ElMessage.warning('当前没有招标计划，请先创建招标计划');
+        return;
+    }
+    planList.value = data
+    dialogVisible.value = true;
+
+}
+const handleChooseData = (row) => {
+    form.value.tenderId = row.id;
+    form.value.name = row.name;
+    form.value.contractPrice = row.contractPrice;
+    form.value.content = row.content;
+    form.value.winningBidder = row.winningBidder;
+    dialogVisible.value = false;
+};
+watch(form, (val) => {
+    localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value }));
+}, { deep: true });
+watch(fileList, (val) => {
+    localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
+}, { deep: true });
+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/indexEdit.vue

@@ -31,7 +31,7 @@
                   </el-form-item>
                   <el-form-item label="专业" prop="user_major" class="mb-4">
                     <el-select v-model="form.user_major" placeholder="请选择专业" class="transition-all duration-300 border-gray-300">
-                      <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
+                      <el-option v-for="item in des_user_major" :key="item.userMajor" :label="item.userMajorName" :value="item.userMajor" />
                     </el-select>
                   </el-form-item>
                   <el-form-item label="电话" prop="phone" class="mb-4">
@@ -42,7 +42,6 @@
                   </el-form-item>
                 </div>
               </div>
-
               <!-- 资料文件区域：单独表单校验 -->
               <div class="mb-6">
                 <div class="flex items-center justify-between mb-4">
@@ -152,7 +151,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 import { ComponentInternalInstance, nextTick, ref, reactive, computed, toRefs, onMounted } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { systemUserList } from '@/api/design/appointment';
-import { extractBatch, extractDetail } from '@/api/design/Professional';
+import { extractBatch, extractDetail, extractUserMajor } from '@/api/design/Professional';
 import { listVolumeCatalog } from '@/api/design/volumeCatalog';
 import { catalogList } from '@/api/design/designChange';
 import { getUser } from '@/api/system/user';
@@ -197,7 +196,8 @@ const userInfo = ref({
   phonenumber: '',
   userId: ''
 });
-const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
+// const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
+const des_user_major = ref([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const disableAll = ref(false);
@@ -440,7 +440,14 @@ const getDeptAllUser = async (deptId: any) => {
     ElMessage.error('获取用户列表失败');
   }
 };
-
+// 获取专业
+const getMajor = async () => {
+  let res = await extractUserMajor({ userId: userId.value, projectId: currentProject.value?.id });
+  if (res.code == 200) {
+    des_user_major.value = res.data;
+    console.log(des_user_major.value);
+  }
+};
 /** 回显表单数据（编辑/查看/审批场景） */
 const byProjectIdAll = async () => {
   loading.value = true;
@@ -532,6 +539,7 @@ onMounted(() => {
 
     // 编辑/查看/审批场景：加载已有数据
     const { type } = routeParams.value;
+    await getMajor();
     if (type === 'update' || type === 'view' || type === 'approval') {
       await getDeptAllUser(userStore.deptId);
       await byProjectIdAll();

src/views/design/appointment/index.vue

@@ -220,23 +220,17 @@
         </div>
 
         <!-- 提交按钮区域 -->
-        <div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
+        <div v-if="!disabledForm" class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
           <el-button
             type="primary"
             size="large"
             v-hasPermi="['design:user:batch']"
             @click="submitForm"
             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"
-            :disabled="disabledForm"
           >
             <i class="el-icon-check mr-2"></i>确认提交
           </el-button>
-          <el-button
+          <el-button size="large" @click="resetForm" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
-            size="large"
-            @click="resetForm"
-            class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium"
-            :disabled="disabledForm"
-          >
             <i class="el-icon-refresh mr-2"></i>重置
           </el-button>
         </div>

src/views/materials/purchaseDoc/index.vue

@@ -268,7 +268,6 @@ 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();
@@ -385,12 +384,19 @@ const cancel = () => {
 };
 
 const handleDetail = async (row?: PurchaseDocVO) => {
-  detailBASEVisble.value = true;
+  proxy?.$modal.loading('加载中');
-
+  try {
-  const res = await getDetailBASE(row.id);
+    const res = await getDetailBASE(row.id);
-  detailBASE.value = res.data;
+    if (res.data) {
-
+      window.open(res.data);
-  console.log('🚀 ~ handleDetail ~ res:', res);
+    } else {
+      proxy?.$modal.msgError('查看失败');
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('查看失败');
+  } finally {
+    proxy?.$modal.closeLoading();
+  }
 };
 
 /** 表单重置 */

src/views/patch/index.vue

@@ -144,12 +144,10 @@
     <!-- 新增/修改任务弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body destroy-on-close>
       <el-form ref="masterFormRef" :model="form" :rules="rules" label-width="100px">
-        <<<<<<< HEAD =======
         <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
         <template #help>
           <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
         </template>
-        >>>>>>> 4511145f52e1caf07eea31e374583c6602fdfcfc
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>

src/views/project/projectUser/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <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">
@@ -40,59 +41,43 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              type="danger"
+              v-hasPermi="['contractor:constructionUser:remove']">
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['contractor:constructionUser:remove']"
-            >
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
+            <el-button type="warning" plain icon="Download" @click="handleExport"
-              >导出
+              v-hasPermi="['contractor:constructionUser:export']">导出
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
+            <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-switch
+            <el-switch v-model="playCardStatus" class="ml-2" inline-prompt
-              v-model="playCardStatus"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" :loading="playCardLoding"
-              class="ml-2"
+              @change="handlePlayCardStatus" inactive-text="一键关闭打卡" active-text="一键开启打卡" />
-              inline-prompt
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
-              :loading="playCardLoding"
-              @change="handlePlayCardStatus"
-              inactive-text="一键关闭打卡"
-              active-text="一键开启打卡"
-            />
           </el-col>
           <el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
             <el-col :span="1.5">
               <el-button type="success" plain>员工资料 </el-button>
             </el-col>
             <el-col :span="1.5" v-show="informationStatus">
-              <el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
+              <el-button type="primary" plain icon="Edit" @click="downloadTemplate"
-                >下载资料模板
+                v-hasPermi="['contractor:constructionUserFile:download']">下载资料模板
               </el-button>
             </el-col>
             <el-col :span="1.5" v-show="informationStatus">
-              <file-upload
+              <file-upload v-model="filePath" isImportInfo :isShowTip="false"
-                v-model="filePath"
+                uploadUrl="/project/constructionUserFile/upload/zip" :limit="1" :file-size="50">
-                isImportInfo
+                <el-button type="warning" plain icon="Edit"
-                :isShowTip="false"
+                  v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
-                uploadUrl="/project/constructionUserFile/upload/zip"
-                :limit="1"
-                :file-size="50"
-              >
-                <el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
               </file-upload>
             </el-col>
           </el-row>
@@ -130,18 +115,9 @@
         </el-table-column>
         <el-table-column label="打卡状态" align="center" prop="clock">
           <template #default="scope">
-            <el-switch
+            <el-switch v-model="scope.row.clock" class="ml-2" inline-prompt
-              v-model="scope.row.clock"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="开启" inactive-text="禁用"
-              class="ml-2"
+              :loading="playCardLoding" active-value="0" inactive-value="1" @change="handleClockStatus(scope.row)" />
-              inline-prompt
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
-              active-text="开启"
-              inactive-text="禁用"
-              :loading="playCardLoding"
-              active-value="0"
-              inactive-value="1"
-              @change="handleClockStatus(scope.row)"
-            />
           </template>
         </el-table-column>
         <el-table-column label="薪水" align="center" min-width="180">
@@ -150,7 +126,8 @@
               {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
               (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
             </span>
-            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? '取消变更' : '变更' }}</div>
+            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ?
+              '取消变更' : '变更' }}</div>
           </template>
         </el-table-column>
         <el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
@@ -164,30 +141,29 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
           <template #default="scope">
             <el-space wrap>
-              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
+                v-hasPermi="['contractor:constructionUser:query']">
                 详情
               </el-button>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
+              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['contractor:constructionUser:edit']">
                 修改
               </el-button>
               <el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
-              <el-button
+              <el-button link type="danger" icon="Avatar" @click="handleJoinBlacklist(scope.row)"
-                link
+                v-hasPermi="['contractor:constructionBlacklist:add']">
-                type="danger"
-                icon="Avatar"
-                @click="handleJoinBlacklist(scope.row)"
-                v-hasPermi="['contractor:constructionBlacklist:add']"
-              >
                 黑名单
               </el-button>
               <!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
               <el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
               <el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['contractor:constructionUser:remove']">
                 删除
               </el-button>
               <el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark">
-                <el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
+                <el-badge :is-dot="scope.row.fileUploadStatus != '1'"
+                  :type="uploadStatusColor(scope.row.fileUploadStatus)">
                   <el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
                 </el-badge>
               </el-tooltip>
@@ -196,7 +172,8 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改施工人员对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
@@ -248,12 +225,14 @@
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证有效开始期" prop="sfzStart">
-                <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
+                <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD"
+                  placeholder="请输入身份证有效开始期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证有效结束期" prop="sfzEnd">
-                <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
+                <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD"
+                  placeholder="请输入身份证有效结束期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -263,7 +242,8 @@
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证出生日期" prop="sfzBirth">
-                <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
+                <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD"
+                  placeholder="请输入身份证出生日期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -316,14 +296,16 @@
             <div class="el-col el-col-12">
               <el-form-item label="打卡" prop="clock">
                 <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
-                  <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
+                  <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label"
+                    :value="item.value" />
                 </el-select>
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="结算方式" prop="wageMeasureUnit">
                 <el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
-                  <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
+                  <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label"
+                    :value="item.value" />
                 </el-select>
               </el-form-item>
             </div>
@@ -352,7 +334,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="分包单位" label-width="130px">
-        <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
+        <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位"
+          style="width: 240px">
           <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -367,7 +350,8 @@
       <div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
         <div class="title">{{ item.label }}</div>
         <div class="file_upload_all" v-if="item.value != 7">
-          <file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
+          <file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']"
+            :file-size="50" />
         </div>
       </div>
       <template #footer>
@@ -386,8 +370,7 @@
         </el-form>
       </div>
       <template #footer>
-        <span
+        <span><el-button type="primary" @click="submitForm">保存</el-button>
-          ><el-button type="primary" @click="submitForm">保存</el-button>
           <el-button @click="showFaceDrawer = false">取消</el-button>
         </span>
       </template>
@@ -399,8 +382,7 @@
         </el-select>
       </el-form-item>
       <template #footer>
-        <span
+        <span><el-button type="primary" @click="handleEdit">保存</el-button>
-          ><el-button type="primary" @click="handleEdit">保存</el-button>
           <el-button @click="statusDialog = false">取消</el-button>
         </span>
       </template>
@@ -424,8 +406,8 @@
           <el-timeline-item color="rgb(255, 73, 73)">
             <div class="mb">{{ '退场时间：' + item.entryDate }}</div>
             <div class="pl-xl">
-              <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
+              <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm"
-              ><br />
+                  width="100px" class="mr" /></span><br />
               <p class="mt text-coolgray">
                 备注：<span class="text-blue">{{ item.remark }}</span>
               </p>
@@ -453,11 +435,8 @@
           <el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
         </template>
         <template #date-cell="{ data }">
-          <div
+          <div class="w100% h100% position-relative m-0 monthDay" :class="data.isSelected ? 'is-selected' : ''"
-            class="w100% h100% position-relative m-0 monthDay"
+            @click="handleViewPlayCard(playCardIdx(data), data)">
-            :class="data.isSelected ? 'is-selected' : ''"
-            @click="handleViewPlayCard(playCardIdx(data), data)"
-          >
             {{ data.day.split('-').slice(1).join('-') }}
             <div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
           </div>
@@ -507,6 +486,7 @@ import {
   ConstructionUserFileForm,
   ConstructionUserFileQuery
 } from '@/api/project/constructionUserFile/types';
+
 import { ElLoadingService } from 'element-plus';
 import type { CalendarDateType, CalendarInstance } from 'element-plus';
 import { AttendanceMonthVO } from '@/api/project/attendance/types';
@@ -909,7 +889,7 @@ const downloadTemplate = async () => {
 };
 
 //导入资料
-const importInformation = async () => {};
+const importInformation = async () => { };
 
 /** 人员迁移 */
 const handleChange = async (row: ConstructionUserVO) => {
@@ -1087,10 +1067,12 @@ onMounted(() => {
   margin: 0 15px;
   position: relative;
   font-size: 12px;
-  > div {
+
+  >div {
     margin: 0 15px;
     position: relative;
     font-size: 12px;
+
     &::before {
       position: absolute;
       content: '';
@@ -1102,30 +1084,36 @@ onMounted(() => {
       border-radius: 50%;
     }
   }
+
   .red {
     &::before {
       background-color: red;
     }
   }
+
   .gray {
     &::before {
       background-color: gray;
     }
   }
+
   .orange {
     &::before {
       background-color: orange;
     }
   }
+
   .green {
     &::before {
       background-color: green;
     }
   }
 }
+
 .monthDay {
   padding: 8px;
-  > div {
+
+  >div {
     position: absolute;
     width: 20px;
     height: 20px;
@@ -1135,13 +1123,16 @@ onMounted(() => {
     right: 0;
     margin: auto;
   }
+
   .type2 {
     background: rgb(255, 0, 0);
   }
+
   .type3 {
     background: rgb(0, 128, 0);
   }
 }
+
 .block_box {
   border: 1px solid #9eccfa;
   border-radius: 6px;
@@ -1155,10 +1146,12 @@ onMounted(() => {
   font-size: 14px;
   margin-bottom: 10px;
 }
+
 .image_upload {
   border-bottom: 1px solid #e3e3d7;
   padding-bottom: 4px;
 }
+
 .title {
   font-size: 18px;
   font-weight: 700;
@@ -1167,12 +1160,15 @@ onMounted(() => {
   width: 100%;
   font-family: cursive;
 }
+
 .information {
   display: none;
 }
+
 .informationStatus:hover .information {
   display: block;
 }
+
 ::v-deep(.el-calendar) {
   .el-calendar-day {
     padding: 0;

src/views/tender/plan/index.vue

@@ -1,27 +1,581 @@
 <template>
   <div class="p-2">
-    <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <el-tab-pane label="招采工程量" name="first">
+      <div v-show="showSearch" class="mb-[10px]">
-        <planPage type="1" ref="planPageRef" />
+        <el-card shadow="hover">
-      </el-tab-pane>
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
-      <el-tab-pane type="2" label="物资设备清单" name="second"> <planPage /> </el-tab-pane>
+            <el-form-item label="分包类型名称" prop="dictName">
-    </el-tabs>
+              <el-input v-model="queryParams.dictName" placeholder="请输入分包类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计划招标时间" prop="plannedBiddingTime">
+              <el-date-picker
+                clearable
+                v-model="queryParams.plannedBiddingTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择计划招标时间"
+              />
+            </el-form-item>
+            <el-form-item label="招标方式" prop="plannedBiddingMethod">
+              <el-select v-model="queryParams.plannedBiddingMethod" placeholder="请选择招标方式" clearable @change="handleQuery">
+                <el-option label="公招" value="公招"></el-option>
+                <el-option label="邀标" value="邀标"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="总价" prop="price">
+              <el-input v-model="queryParams.price" placeholder="请输入总价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="限价" prop="limitPrice">
+              <el-input v-model="queryParams.limitPrice" placeholder="请输入限价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="合同额" prop="contractPrice">
+              <el-input v-model="queryParams.contractPrice" 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="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['plan:plan:edit']">修改</el-button>
+          </el-col>
+          <!-- 多文件上传按钮 -->
+          <el-col :span="2">
+            <el-button type="primary" plain icon="Upload" @click="openFileUploadDialog()" v-hasPermi="['plan:plan:upload']"> 上传文件 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['plan:plan:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
+        <el-table-column label="项目Id" align="center" prop="projectId" v-if="false" />
+        <el-table-column label="分包类型名称" align="center" prop="dictName" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="计划招标时间" align="center" prop="plannedBiddingTime" width="180" v-if="false">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.plannedBiddingTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="招标方式" align="center" prop="plannedBiddingMethod">
+          <template #default="scope">
+            {{
+              ['1', 1].includes(scope.row.plannedBiddingMethod)
+                ? '公招'
+                : ['2', 2].includes(scope.row.plannedBiddingMethod)
+                ? '邀标'
+                : scope.row.plannedBiddingMethod || '-'
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center" prop="price" v-if="false" />
+        <el-table-column label="限价" align="center" prop="limitPrice" />
+        <el-table-column label="合同额" align="center" prop="contractPrice" />
+        <el-table-column label="分包内容" align="center" prop="content" />
+        <el-table-column label="中标通知书" align="center" prop="bidFile">
+          <template #default="scope">
+            <el-link @click="handleView(scope.row, 'bidFile')" type="primary" v-if="scope.row.bidFile">查看</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column label="招标通知书" align="center" prop="tenderFile">
+          <template #default="scope">
+            <el-link @click="handleView(scope.row, 'tenderFile')" type="primary" v-if="scope.row.tenderFile">查看</el-link>
+          </template>
+        </el-table-column>
+        <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="['plan:plan:edit']"></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="fileUploadDialog.title" v-model="fileUploadDialog.visible" width="600px" append-to-body>
+      <div class="upload-container">
+        <el-upload
+          class="upload-demo"
+          drag
+          action=""
+          :http-request="handleFileUpload"
+          :multiple="true"
+          :on-preview="handleFilePreview"
+          :on-remove="handleFileRemove"
+          :file-list="fileList"
+          :auto-upload="false"
+        >
+          <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+          <div class="el-upload__text">点击或拖拽文件到此处上传</div>
+          <template #tip>
+            <div class="el-upload__tip text-sm text-gray-500">支持上传多个文件，格式不限，单个文件大小不超过10MB</div>
+          </template>
+        </el-upload>
+
+        <div class="mt-4 flex justify-end">
+          <el-button @click="cancelFileUpload">取消</el-button>
+          <el-button type="primary" @click="submitFileUpload" class="ml-2"> 确认上传 </el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改招标计划对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="planFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- 调整项目ID表单项：与目标代码一致，自动关联当前项目并显示提示 -->
+        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
+        <template #help>
+          <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
+        </template>
+        <el-input v-model="form.id" placeholder="ID" readonly v-if="false" />
+        <el-form-item label="分包类型名称" prop="dictName" v-if="false">
+          <el-input v-model="form.dictName" placeholder="请输入分包类型名称" />
+        </el-form-item>
+
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+
+        <el-form-item label="计划招标时间" prop="plannedBiddingTime" v-if="false">
+          <el-date-picker clearable v-model="form.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划招标时间" />
+        </el-form-item>
+
+        <!-- 核心修改：招标方式改为下拉框，根据限价自动赋值 -->
+        <el-form-item label="招标方式" prop="plannedBiddingMethod">
+          <el-select v-model="form.plannedBiddingMethod" placeholder="自动生成/选择" :disabled="!!form.limitPrice">
+            <el-option label="公招" value="公招"></el-option>
+            <el-option label="邀标" value="邀标"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="总价" prop="price" v-if="false">
+          <el-input v-model="form.price" placeholder="请输入总价" />
+        </el-form-item>
+
+        <!-- 限价输入：添加@input事件，实时触发招标方式判断 -->
+        <el-form-item label="限价(单位万元)" prop="limitPrice">
+          <el-input v-model.number="form.limitPrice" placeholder="请输入限价(单位万元)" type="number" @input="autoSetBiddingMethod" />
+        </el-form-item>
+
+        <el-form-item label="合同额" prop="contractPrice">
+          <el-input v-model="form.contractPrice" placeholder="请输入合同额" />
+        </el-form-item>
+
+        <el-form-item label="分包内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入分包内容" rows="3" />
+        </el-form-item>
+
+        <el-form-item label="中标通知书" prop="bidFile">
+          <file-upload v-model="form.bidFile" :limit="1" />
+        </el-form-item>
+        <el-form-item label="招标通知书" prop="files">
+          <file-upload v-model="form.tenderFile" :limit="100" />
+        </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>
+    <el-dialog title="文件列表" v-model="viewVisible" width="45%">
+      <el-table :data="viewFileList" style="width: 100%" border>
+        <el-table-column prop="fileName" label="文件" align="center">
+          <template #default="scope">
+            <el-link :key="scope.row.ossId" :href="scope.row.url" target="_blank" type="primary" :underline="false">
+              {{ scope.row.originalName || '查看文件' }}
+            </el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span>
+          <el-button type="primary" @click="viewVisible = false">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup name="Plan" lang="ts">
+import { listPlan, getPlan, addPlan, updatePlan, getSegmentedIndicatorPlanning } from '@/api/plan/plan/index';
+import { PlanVO, PlanQuery, PlanForm } from '@/api/plan/plan/types';
+import { getCurrentInstance, onMounted, ref, reactive, toRefs, computed, watch } from 'vue';
+import type { ElFormInstance } from 'element-plus';
 import { useUserStoreHook } from '@/store/modules/user';
-import { obtainAllVersionNumbers } from '@/api/contract/index';
+import { UploadFilled } from '@element-plus/icons-vue';
-import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
+import type { UploadFile, UploadRawFile } from 'element-plus';
+import { listByIds } from '@/api/system/oss';
+
+// 从用户Store获取当前选中项目及ID
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const currentProjectId = computed(() => currentProject.value?.id);
+const viewVisible = ref(false);
+// 类型定义
+interface DialogOption {
+  visible: boolean;
+  title: string;
+}
+
+interface PageData<F, Q> {
+  form: F;
+  queryParams: Q;
+  rules: Record<string, any[]>;
+}
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-import planPage from './comm/planPage.vue';
 
-import type { TabsPaneContext } from 'element-plus';
+const planList = ref<PlanVO[]>([]);
-const activeName = ref('first');
+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 handleClick = (tab: TabsPaneContext, event: Event) => {
+const queryFormRef = ref<ElFormInstance>();
-  console.log(tab, event);
+const planFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 文件上传相关状态
+const fileUploadDialog = reactive({
+  visible: false,
+  title: '上传文件'
+});
+const fileList = ref<UploadFile[]>([]);
+const viewFileList = ref([]);
+const uploadLoading = ref(false);
+const selectedPlanId = ref<string | number>('');
+
+// 初始化表单数据
+const initFormData: PlanForm & { dictName?: string; content?: string } = {
+  id: '1958116259107012609',
+  projectId: currentProjectId.value,
+  file: [],
+  plannedBiddingMethod: undefined,
+  files: undefined,
+  price: undefined,
+  limitPrice: undefined,
+  contractPrice: undefined,
+  bidFile: undefined,
+  dictName: '1',
+  name: 'test1',
+  content: 'trhbhbt'
 };
+
+// 页面数据
+const data = reactive<PageData<typeof initFormData, PlanQuery & { dictName?: string; content?: string }>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProjectId.value,
+    dictName: undefined,
+    name: undefined,
+    plannedBiddingTime: undefined,
+    plannedBiddingMethod: undefined,
+    price: undefined,
+    limitPrice: undefined,
+    contractPrice: undefined,
+    content: undefined,
+    bidFile: undefined,
+    params: {}
+  },
+  rules: {
+    projectId: [{ required: true, message: '请输入项目ID', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    plannedBiddingMethod: [{ required: true, message: '请选择或输入限价生成招标方式', trigger: 'blur' }],
+    limitPrice: [{ required: true, message: '请输入限价', trigger: 'blur' }],
+    contractPrice: [{ required: true, message: '请输入合同额', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入分包内容', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+// 监听当前项目ID变化
+watch(currentProjectId, (newVal) => {
+  queryParams.value.projectId = newVal;
+  if (!form.value.id) {
+    form.value.projectId = newVal;
+  }
+  getList();
+});
+
+/** 查询招标计划列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listPlan(queryParams.value);
+    planList.value = res.rows || [];
+    total.value = res.total || 0;
+  } catch (error) {
+    console.error('获取招标计划列表失败', error);
+    proxy?.$modal.msgError('获取招标计划列表失败');
+  } finally {
+    loading.value = false;
+  }
+};
+
+// const handleSuccess = (list, res, fileType) => {
+//   console.log(list);
+//   const arr = list.map((item) => {
+//     return { fileId: item.ossId, fileUrl: item.url, fileType };
+//   });
+//   console.log(arr);
+//   if (!form.value.file) form.value.file = [];
+//   form.value.file = [...form.value.file, ...arr];
+//   console.log(form.value.file);
+// };
+
+const handleView = async (row, type) => {
+  const res = await listByIds(row[type]);
+  if (type == 'tenderFile') {
+    viewVisible.value = true;
+    viewFileList.value = res.data;
+  } else {
+    window.open(res.data[0].url);
+  }
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData, projectId: currentProjectId.value };
+  planFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.value.projectId = currentProjectId.value;
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: PlanVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: PlanVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  if (!_id) {
+    proxy?.$modal.msgWarning('请选择需要修改的招标计划');
+    return;
+  }
+  try {
+    // const res = await getPlan(_id);
+    const res = await getSegmentedIndicatorPlanning(_id);
+
+    Object.assign(form.value, res.data, {
+      id: res.data.id || initFormData.id,
+      dictName: res.data.dictName || initFormData.dictName,
+      content: res.data.content || initFormData.content,
+      projectId: res.data.projectId || currentProjectId.value
+    });
+    console.log(form.value);
+
+    // 回显时根据限价同步招标方式（避免数据不一致）
+    autoSetBiddingMethod();
+    dialog.visible = true;
+    dialog.title = '修改招标计划';
+  } catch (error) {
+    console.error('获取招标计划详情失败', error);
+    proxy?.$modal.msgError('获取招标计划详情失败');
+  }
+};
+
+/** 核心：根据限价自动设置招标方式 */
+const autoSetBiddingMethod = () => {
+  const limit = form.value.limitPrice;
+  // 逻辑：限价>1000万→公招，否则→邀标，为空则清空
+  form.value.plannedBiddingMethod = limit ? (limit > 1000 ? '公招' : '邀标') : '';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  planFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        if (!form.value.id && currentProjectId.value) {
+          form.value.projectId = currentProjectId.value;
+        }
+        if (form.value.id) {
+          await updatePlan(form.value);
+        } else {
+          await addPlan(form.value);
+        }
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('操作失败', error);
+        proxy?.$modal.msgError('操作失败，请重试');
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作（原代码存在但模板未引用，保留逻辑） */
+const handleDelete = async (row?: PlanVO) => {
+  const _ids = row?.id || ids.value;
+  if (!_ids || (_ids instanceof Array && _ids.length === 0)) {
+    proxy?.$modal.msgWarning('请选择需要删除的招标计划');
+    return;
+  }
+  try {
+    await proxy?.$modal.confirm('是否确认删除选中的招标计划？');
+    await delPlan(_ids);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (error) {
+    console.error('删除失败', error);
+    if (error !== 'cancel') {
+      proxy?.$modal.msgError('删除失败，请重试');
+    }
+  }
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'plan/plan/export',
+    {
+      ...queryParams.value
+    },
+    `plan_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 打开文件上传对话框 */
+const openFileUploadDialog = () => {
+  if (ids.value.length !== 1) {
+    proxy?.$modal.msgWarning('请选择单个招标计划进行文件上传');
+    return;
+  }
+  selectedPlanId.value = ids.value[0];
+  fileList.value = [];
+  fileUploadDialog.visible = true;
+};
+
+/** 处理文件上传 */
+const handleFileUpload = async (params: { file: UploadRawFile }) => {
+  const formData = new FormData();
+  formData.append('file', params.file);
+  formData.append('planId', selectedPlanId.value as string);
+
+  try {
+    const response = await uploadFile(formData);
+    return response;
+  } catch (error) {
+    console.error('文件上传失败', error);
+    throw error;
+  }
+};
+
+/** 提交文件上传 */
+const submitFileUpload = async () => {
+  if (fileList.value.length === 0) {
+    proxy?.$modal.msgWarning('请选择需要上传的文件');
+    return;
+  }
+
+  uploadLoading.value = true;
+  try {
+    for (const file of fileList.value) {
+      if (file.raw) {
+        await handleFileUpload({ file: file.raw });
+      }
+    }
+
+    proxy?.$modal.msgSuccess('文件上传成功');
+    fileUploadDialog.visible = false;
+  } catch (error) {
+    proxy?.$modal.msgError('文件上传失败');
+  } finally {
+    uploadLoading.value = false;
+  }
+};
+
+/** 取消文件上传 */
+const cancelFileUpload = () => {
+  fileList.value = [];
+  fileUploadDialog.visible = false;
+};
+
+/** 文件预览 */
+const handleFilePreview = (file: UploadFile) => {
+  console.log('预览文件:', file);
+  // 可扩展：通过文件URL打开预览
+  // if (file.url) window.open(file.url);
+};
+
+/** 移除文件 */
+const handleFileRemove = (file: UploadFile) => {
+  console.log('移除文件:', file);
+};
+
+onMounted(() => {
+  getList();
+});
 </script>
 
-<style scoped></style>
+<style scoped lang="scss">
+.mb-4 {
+  margin-bottom: 16px;
+}
+.el-table .small-padding .cell {
+  padding: 0 5px;
+}
+.el-table .fixed-width {
+  width: 120px !important;
+}
+.el-table-column .el-button--text + .el-button--text {
+  margin-left: 10px;
+}
+.upload-container {
+  padding: 10px 0;
+}
+</style>

src/views/tender/supplierInput/index.vue

@@ -5,7 +5,7 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="企业登记注册类型" prop="supplierType">
+            <el-form-item label="企业登记注册类型" prop="supplierType" label-width="140px">
               <el-select v-model="queryParams.supplierType" placeholder="请选择类型" clearable>
                 <el-option label="劳务" value="劳务"></el-option>
                 <el-option label="技术服务" value="技术服务"></el-option>
@@ -63,7 +63,7 @@
 
       <!-- 数据表格 -->
       <el-table v-loading="loading" :data="supplierInputList" @selection-change="handleSelectionChange" border>
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection" width="100%" align="center" />
         <el-table-column label="ID" align="center" prop="id" width="80" />
         <el-table-column label="企业登记注册类型" align="center" prop="supplierType" width="140" />
         <el-table-column label="企业名称" align="center" prop="supplierName" width="180" />
@@ -82,7 +82,9 @@
         </el-table-column>
         <el-table-column label="入库资料" align="center" prop="inputFile" width="120">
           <template #default="scope">
-            <el-link v-if="scope.row.inputFile" :href="scope.row.inputFile" target="_blank" underline>查看文件</el-link>
+            <el-link v-if="scope.row.inputFile" :href="scope.row.inputFile" target="_blank" :style="{ textDecoration: 'none', color: '#409eff' }">
+              查看文件
+            </el-link>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
@@ -216,7 +218,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="发证日期" prop="issueDate">
-              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" />
+              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" value-format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -225,7 +227,7 @@
         <el-row :gutter="20" class="mb-4">
           <el-col :span="12">
             <el-form-item label="证书有效期" prop="certificateValidity">
-              <el-date-picker v-model="form.certificateValidity" type="date" placeholder="请选择证书有效期" />
+              <el-date-picker v-model="form.certificateValidity" type="date" placeholder="请选择证书有效期" value-format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -252,8 +254,8 @@
         <!-- 第十行：安全生产许可证有效期（仅劳务类型显示） -->
         <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
           <el-col :span="12">
-            <el-form-item label="安全生产许可证有效期" prop="safeCertificateValidity">
+            <el-form-item label="安全生产许可证发证日期" prop="safeCertificateValidity">
-              <el-input v-model="form.safeCertificateValidity" placeholder="请输入有效期" clearable />
+              <el-date-picker v-model="form.safeCertificateValidity" type="date" placeholder="请选择发证日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -285,17 +287,17 @@
         <!-- 第十二行：职称人员数量（仅劳务类型显示） -->
         <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
           <el-col :span="12">
-            <el-form-item label="职称人员数量" prop="personnelNumber1">
+            <el-form-item label="高级工程师人数" prop="personnelNumber1">
-              <el-input v-model="form.personnelNumber1" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber1" placeholder="请输高级工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber2">
+            <el-form-item label="工程师数量" prop="personnelNumber2">
-              <el-input v-model="form.personnelNumber2" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber2" placeholder="请输入工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber3">
+            <el-form-item label="助理工程师数量" prop="personnelNumber3">
-              <el-input v-model="form.personnelNumber3" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber3" placeholder="请输入助理工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber4">
+            <el-form-item label="其他人员数量" prop="personnelNumber4">
-              <el-input v-model="form.personnelNumber4" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber4" placeholder="请输入其他人员数量" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -303,22 +305,6 @@
           </el-col>
         </el-row>
 
-        <!-- 第十三行：审核状态 -->
-        <el-row :gutter="20" class="mb-4">
-          <el-col :span="12">
-            <!-- 空列占位，保持布局对称 -->
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="审核状态" prop="state" v-if="dialog.title === '修改供应商入库'">
-              <el-select v-model="form.state" disabled>
-                <el-option label="待审核" value="0"></el-option>
-                <el-option label="已通过" value="1"></el-option>
-                <el-option label="未通过" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <!-- 第十四行：入库资料上传 -->
         <el-row class="mb-4">
           <el-col :span="24">
@@ -347,7 +333,7 @@
                   >
                     <li style="margin-top: 10px" class="el-upload-list__item ele-upload-list__item-content">
                       <el-link :href="`${fileUrl}`" :underline="false" target="_blank">
-                        <el-button class="el-icon-document"> 下载文件 </el-button>
+                        <el-button class="el-icon-document"> 查看文件 </el-button>
                       </el-link>
                     </li>
                   </transition-group>
@@ -372,7 +358,7 @@
 <script setup name="SupplierInput" lang="ts">
 import { ComponentInternalInstance, getCurrentInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
 import { ElFormInstance } from 'element-plus';
-import { listSupplierInput, getSupplierInput, delSupplierInput, addSupplierInput, updateSupplierInput } from '@/api/supplierInput/supplierInput';
+import { listSupplierInput, getSupplierInput, delSupplierInput } from '@/api/supplierInput/supplierInput';
 import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
 import Pagination from '@/components/Pagination/index.vue';
 import RightToolbar from '@/components/RightToolbar/index.vue';
@@ -403,7 +389,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-// 初始化表单数据
+// 初始化表单数据：新增build1-build4、personnelNumber1-personnelNumber4字段（用于拆分拼接字符串）
 const initFormData: any = {
   id: undefined,
   supplierType: undefined,
@@ -425,13 +411,21 @@ const initFormData: any = {
   safeCode: undefined,
   safeCodeData: undefined,
   safeCertificateValidity: undefined,
-  registeredNumber: undefined,
+  registeredNumber: undefined, // 后端返回的拼接字符串（如“1,2,3,4”）
-  personnelNumber: undefined,
+  personnelNumber: undefined, // 后端返回的拼接字符串（如“5,6,7,8”）
   fileId: undefined,
   inputFile: undefined,
-  state: '0' // 新增默认待审核
+  state: '0', // 新增默认待审核
+  // 新增：用于表单输入的单独字段
+  build1: undefined, // 一建建造师
+  build2: undefined, // 二建建造师
+  build3: undefined, // 注册造价工程师
+  build4: undefined, // 其他注册人员
+  personnelNumber1: undefined, // 高级工程师
+  personnelNumber2: undefined, // 工程师
+  personnelNumber3: undefined, // 助理工程师
+  personnelNumber4: undefined // 其他职称人员
 };
-
 // 核心数据（表单+查询参数）
 const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
   form: { ...initFormData },
@@ -442,6 +436,8 @@ const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
     supplierName: undefined,
     state: undefined,
     inputFile: undefined,
+    registeredNumber: undefined,
+    personnelNumber: undefined,
     params: {}
   }
 });
@@ -462,7 +458,14 @@ const rules = computed(() => {
       { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
     ],
     id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
-    build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }]
+    build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }],
+    build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'change' }],
+    build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'change' }],
+    build4: [{ required: true, message: '请输入其他数量', trigger: 'change' }],
+    personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'change' }],
+    personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'change' }],
+    personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'change' }],
+    personnelNumber4: [{ required: true, message: '请输入其他数量', trigger: 'change' }]
   };
 
   // 仅当类型为"劳务"时，添加安全生产许可证+人员数量校验
@@ -472,10 +475,17 @@ const rules = computed(() => {
       // 安全生产许可证相关校验
       safeCode: [{ required: true, message: '请输入安全生产许可证编号', trigger: 'blur' }],
       safeCodeData: [{ required: true, message: '请选择安全生产许可证发证日期', trigger: 'change' }],
-      safeCertificateValidity: [{ required: true, message: '请输入安全生产许可证有效期', trigger: 'blur' }],
+      safeCertificateValidity: [{ required: true, message: '请选择安全生产许可证有效期', trigger: 'change' }],
-      // 人员数量相关校验
+      // 注册人员数量校验
-      registeredNumber: [{ required: true, message: '请输入注册人员数量', trigger: 'blur' }]
+      build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'blur' }],
-      // personnelNumber: [{ required: true, message: '请输入职称人员数量', trigger: 'blur' }]
+      build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'blur' }],
+      build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'blur' }],
+      build4: [{ required: true, message: '请输入其他注册人员数量', trigger: 'blur' }],
+      // 职称人员数量校验
+      personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'blur' }],
+      personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'blur' }],
+      personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'blur' }],
+      personnelNumber4: [{ required: true, message: '请输入其他职称人员数量', trigger: 'blur' }]
     };
   }
 
@@ -491,9 +501,24 @@ const handleTypeChange = () => {
     form.value.safeCertificateValidity = undefined;
     form.value.registeredNumber = undefined;
     form.value.personnelNumber = undefined;
+    // 清空表单单独字段
+    form.value.build1 = form.value.build2 = form.value.build3 = form.value.build4 = undefined;
+    form.value.personnelNumber1 = form.value.personnelNumber2 = form.value.personnelNumber3 = form.value.personnelNumber4 = undefined;
   }
   // 重置隐藏字段的校验状态，避免错误提示残留
-  supplierInputFormRef.value?.clearValidate(['safeCode', 'safeCodeData', 'safeCertificateValidity', 'registeredNumber', 'personnelNumber']);
+  supplierInputFormRef.value?.clearValidate([
+    'safeCode',
+    'safeCodeData',
+    'safeCertificateValidity',
+    'build1',
+    'build2',
+    'build3',
+    'build4',
+    'personnelNumber1',
+    'personnelNumber2',
+    'personnelNumber3',
+    'personnelNumber4'
+  ]);
 };
 
 /** 查询供应商入库列表 */
@@ -536,14 +561,23 @@ const resetQuery = () => {
   handleQuery();
 };
 
-/** 文件上传成功回调 */
+const splitBackEndStrToForm = (resData: any) => {
-// const handleUploadSuccess = () => {
+  if (resData.registeredNumber) {
-//   proxy?.$modal.msgSuccess('操作成功');
+    const registeredArr = resData.registeredNumber.split(',');
-//   dialog.visible = false;
+    form.value.build1 = registeredArr[0] || undefined; // 一建建造师
-//   buttonLoading.value = false;
+    form.value.build2 = registeredArr[1] || undefined; // 二建建造师
-//   getList();
+    form.value.build3 = registeredArr[2] || undefined; // 注册造价工程师
-// };
+    form.value.build4 = registeredArr[3] || undefined; // 其他注册人员
+  }
 
+  if (resData.personnelNumber) {
+    const personnelArr = resData.personnelNumber.split(',');
+    form.value.personnelNumber1 = personnelArr[0] || undefined; // 高级工程师
+    form.value.personnelNumber2 = personnelArr[1] || undefined; // 工程师
+    form.value.personnelNumber3 = personnelArr[2] || undefined; // 助理工程师
+    form.value.personnelNumber4 = personnelArr[3] || undefined; // 其他职称人员
+  }
+};
 /** 文件选择变更 */
 const change = () => {
   fileUrl.value = '';
@@ -563,7 +597,6 @@ const handleAdd = () => {
   dialog.title = '添加供应商入库';
 };
 
-/** 修改操作 */
 const handleUpdate = async (row?: SupplierInputVO) => {
   reset();
   const _id = row?.id || ids.value[0];
@@ -571,8 +604,14 @@ const handleUpdate = async (row?: SupplierInputVO) => {
 
   try {
     const res = await getSupplierInput(_id);
-    form.value = { ...form.value, ...res.data, inputFile: '' };
+    const resData = res.data || {};
-    fileUrl.value = res.data.inputFile;
+    // 1. 基础字段回显
+    form.value = { ...form.value, ...resData, inputFile: '' };
+    // 2. 核心修复：拆分后端拼接字符串到表单单独字段
+    splitBackEndStrToForm(resData);
+    // 3. 文件地址回显
+    fileUrl.value = resData.inputFile || '';
+    // 4. 打开对话框
     dialog.visible = true;
     dialog.title = '修改供应商入库';
   } catch (error) {
@@ -586,8 +625,15 @@ const submitForm = () => {
 
   supplierInputFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
-    form.value.registeredNumber = `${form.value.build1},${form.value.build2},${form.value.build3},${form.value.build4}`;
+    if (form.value.supplierType === '劳务') {
-    form.value.personnelNumber = `${form.value.personnelNumber1},${form.value.personnelNumber2},${form.value.personnelNumber3},${form.value.personnelNumber4}`;
+      form.value.registeredNumber = [form.value.build1, form.value.build2, form.value.build3, form.value.build4].join(',');
+      form.value.personnelNumber = [
+        form.value.personnelNumber1,
+        form.value.personnelNumber2,
+        form.value.personnelNumber3,
+        form.value.personnelNumber4
+      ].join(',');
+    }
     buttonLoading.value = true;
     try {
       if (fileUploadRef.value) {