合并

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 
 # 无人机接口地址
 

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/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/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>