From 89bd2e6d9213f01cf95f192dd3236fe4c8f27887 Mon Sep 17 00:00:00 2001
From: taoge1020 <sendtao@163.com>
Date: Fri, 22 Aug 2025 10:29:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingManagemen/biddingLimit/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index d08d055..79b4d4f 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -32,7 +32,7 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
           </el-form-item>
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button
               type="primary"
               v-if="versionObj.status == 'draft' || versionObj.status == 'back'"
@@ -51,7 +51,7 @@
               v-if="versionObj.status != 'draft'"
               >查看流程</el-button
             >
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </el-card>
     </transition>

From dbc26a3d492a955cc66bc0b1f4cd45c03becc5d5 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Fri, 22 Aug 2025 11:42:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=9B=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tender/index.ts                 |  15 ++
 src/views/contract/division/index.vue   |   2 +-
 src/views/tender/plan/comm/planPage.vue | 277 +++++-------------------
 src/views/tender/plan/index.vue         | 104 ++++++---
 4 files changed, 143 insertions(+), 255 deletions(-)

diff --git a/src/api/tender/index.ts b/src/api/tender/index.ts
index 65a71a6..2f79a49 100644
--- a/src/api/tender/index.ts
+++ b/src/api/tender/index.ts
@@ -91,3 +91,18 @@ export const getTenderPlanDetail = (query: any): AxiosPromise<any> => {
     params: query
   });
 };
+//查看招标文件
+export const biddViewLook = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan/getAnnex',
+    method: 'get',
+    params: query
+  });
+};
+//删除招标文件
+export const delBiddView = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlanAnnex/' + query.ids,
+    method: 'delete'
+  });
+};
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index e6a10d1..fe7153c 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -36,7 +36,7 @@
                 >详情</el-button
               >
               <el-button type="primary" size="small" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
-                >修改</el-button
+                >确定</el-button
               >
               <el-button type="danger" size="small" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
                 >删除</el-button
diff --git a/src/views/tender/plan/comm/planPage.vue b/src/views/tender/plan/comm/planPage.vue
index b4b156c..e73cac6 100644
--- a/src/views/tender/plan/comm/planPage.vue
+++ b/src/views/tender/plan/comm/planPage.vue
@@ -1,245 +1,74 @@
 <template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <el-card shadow="always">
-        <el-form :model="queryForm" :inline="true">
-          <el-form-item label="表名" prop="sheet">
-            <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
-              <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-upload
-              ref="uploadRef"
-              class="upload-demo"
-              :http-request="importExcel"
-              :show-file-list="false"
-              v-hasPermi="['bidding:biddingLimitList:importExcelFile']"
-            >
-              <template #trigger>
-                <el-button type="primary">导入excel</el-button>
-              </template>
-            </el-upload>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-    </transition>
-    <el-card shadow="never" class="mb8">
-      <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
-        <el-table-column prop="num" label="编号" />
-        <el-table-column prop="name" label="工程或费用名称" />
-        <el-table-column prop="unit" label="单位" />
-        <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="单价" align="center">
-          <template #default="scope">
-            <el-input-number
-              :model-value="scope.row.unitPrice"
-              @change="(val) => (scope.row.unitPrice = val)"
-              :precision="2"
-              :step="0.1"
-              :controls="false"
-              v-if="scope.row.quantity && scope.row.quantity != 0"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="price" label="总价" align="center">
-          <template #default="scope">
-            {{ scope.row.price }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="price" label="操作" align="center">
-          <template #default="scope">
-            <el-button
-              type="primary"
-              size="small"
-              @click="handleSave(scope.row)"
-              v-if="scope.row.quantity && scope.row.quantity != 0"
-              v-hasPermi="['bidding:biddingLimitList:edit']"
-              >修改</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+  <el-dialog v-model="dialogVisible" title="招标文件" width="500" draggable>
+    <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto">
+      <el-form-item label="招标文件" prop="name">
+        <file-upload
+          v-model="form.costEstimationFile"
+          :fileSize="100"
+          :auto-upload="false"
+          uploadUrl="/tender/biddingPlan/uploadBiddingDocuments"
+          method="put"
+          ref="fileUploadRef"
+          :data="{
+            projectId: currentProject?.id,
+            planType: planType,
+            fileType: '1',
+            bidStatus: '0',
+            id: row.id
+          }"
+          showFileList
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="resetForm()"> 取消 </el-button>
+        <el-button type="primary" @click="submitForm()">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { obtainAllVersionNumbers } from '@/api/contract/index';
-import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+import { id } from 'element-plus/es/locale/index.mjs';
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
-const queryForm = ref({
-  versions: '',
-  sheet: ''
-});
-const loading = ref(false);
-const options = ref<any[]>([]);
-const sheets = ref<any[]>([]);
-const tableData = ref<any[]>([]);
-const isExpandAll = ref(true);
-// 接受父组件传递的参数
-const props = defineProps({
-  type: {
-    type: String,
-    default: ''
-  }
+const dialogVisible = ref(false);
+const row = ref<any>();
+const planType = ref<any>('');
+const fileUploadRef = ref<any>();
+const ruleForm = ref<any>();
+const rules = ref({
+  costEstimationFile: [{ required: true, message: '请上传招标文件', trigger: ['blur'] }]
 });
 
-//获取版本号
-const getVersionNums = async () => {
-  try {
-    const params = {
-      projectId: currentProject.value?.id,
-      pageSize: 1000,
-      pageNum: 1
-    };
+const form = ref({
+  costEstimationFile: ''
+});
 
-    const res = await obtainAllVersionNumbers(params);
-    if (res.code == 200) {
-      options.value = res.data;
-      if (res.data.length > 0) {
-        queryForm.value.versions = res.data[0];
-        getSheetName();
-      } else {
-        queryForm.value.versions = '';
-      }
-    }
-  } catch (error) {
-    console.log(error);
-  }
+const open = (rows: any, type: string) => {
+  dialogVisible.value = true;
+  console.log(rows, type);
+  row.value = rows;
+  planType.value = type;
 };
-//选择版本号
-const changeVersions = () => {
-  getSheetName();
-};
-
-//选择表名
-const changeSheet = () => {
-  getTableData();
-};
-
-//获取表名
-const getSheetName = async () => {
-  try {
-    const params = {
-      projectId: currentProject.value?.id
-      // versions: queryForm.value.versions
-    };
-    const res = await sheetList(params);
-    if (res.code == 200) {
-      sheets.value = res.data;
-      if (res.data.length > 0) {
-        queryForm.value.sheet = res.data[0];
-      } else {
-        queryForm.value.sheet = '';
-      }
-      getTableData();
-    }
-  } catch (error) {}
-};
-//获取表格
-const getTableData = async () => {
-  loading.value = true;
-  const params = {
-    projectId: currentProject.value?.id,
-    sheet: queryForm.value.sheet,
-    type: props.type
-  };
-  const res = await getTreeLimit(params);
-  loading.value = false;
-  if (res.code == 200) {
-    tableData.value = [res.data[0]];
-  }
-  console.log(loading.value);
-};
-//修改单价
-const handleSave = (row: any) => {
-  try {
-    if (!row.unitPrice) {
+const resetForm = () => {};
+const submitForm = () => {
+  fileUploadRef.value.submitUpload().then((res) => {
+    if (res == 'noFile') {
       ElMessage({
-        message: '请输入单价',
+        message: '请上传招标文件',
         type: 'warning'
       });
       return;
     }
-    loading.value = true;
-    biddingLimitListUpdate(row).then((res) => {
-      if (res.code == 200) {
-        ElMessage({
-          message: '修改成功',
-          type: 'success'
-        });
-        getTableData();
-      }
-    });
-  } catch (error) {
-    ElMessage({
-      message: '修改失败',
-      type: 'error'
-    });
-  }
-};
-const tableRef = ref<any>();
-
-const toggleExpandAll = () => {
-  isExpandAll.value = !isExpandAll.value;
-  console.log(isExpandAll.value);
-
-  tableData.value.forEach((row) => {
-    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
+    dialogVisible.value = false;
   });
 };
-//导入
-const importExcel = (options: any): any => {
-  let formData = new FormData();
-  formData.append('file', options.file);
-  loading.value = true;
-  BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
-    .then((res) => {
-      const { code } = res;
-      if (code == 200) {
-        proxy.$modal.msgSuccess(res.msg || '导入成功');
-        getTableData();
-      }
-    })
-    .catch((err) => {})
-    .finally(() => {
-      loading.value = false;
-    });
-};
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    getVersionNums();
-  }
-);
-const handleExport = () => {
-  proxy?.download(
-    '/bidding/biddingLimitList/export',
-    {
-      projectId: currentProject.value?.id,
-      sheet: queryForm.value.sheet
-    },
-    `限价一览表${queryForm.value.sheet}.xlsx`
-  );
-};
-onUnmounted(() => {
-  listeningProject();
-});
-onMounted(() => {
-  getSheetName();
+defineExpose({
+  open
 });
 </script>
 
-<style scoped></style>
+<style scoped lang="scss"></style>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 315b1a1..614d97e 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -10,6 +10,7 @@
             <el-form-item label="内容" prop="sheet">
               <el-input v-model="queryForm.content" placeholder="请输入内容" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -25,6 +26,13 @@
           </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
+          <el-table-column prop="bidd" label="招标文件">
+            <template #default="scope">
+              <el-button type="primary" link v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']" @click="biddView(scope.row)"
+                >查看文件</el-button
+              >
+            </template>
+          </el-table-column>
           <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
             <template #default="scope">
               <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
@@ -32,13 +40,21 @@
           </el-table-column>
           <el-table-column prop="price" label="操作" align="center">
             <template #default="scope">
-              <el-button type="warning" size="small" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+              <el-button type="primary" link icon="View" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
                 >详情</el-button
               >
-              <el-button type="primary" size="small" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
-                >修改</el-button
-              >
-              <el-button type="danger" size="small" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+              <el-button
+                type="primary"
+                link
+                icon="FolderOpened"
+                @click="handleSave(scope.row)"
+                v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                >上传投标资料
+              </el-button>
+              <el-button type="primary" link icon="Edit" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                >信息
+              </el-button>
+              <el-button type="primary" link icon="Delete" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
                 >删除</el-button
               >
             </template>
@@ -143,6 +159,18 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+    <information ref="informationRef" />
+    <el-dialog title="查看文件" v-model="biddDialog" width="45%" draggable>
+      <el-table :data="biddViewData" border>
+        <el-table-column prop="name" label="文件名" />
+        <el-table-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button type="primary" link icon="View" @click="openPdf(scope.row)">查看</el-button>
+            <el-button type="primary" link icon="Delete" @click="delHandlebidd(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -151,6 +179,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { getDicts } from '@/api/system/dict/data';
 import { Plus } from '@element-plus/icons-vue';
 import { FormInstance } from 'element-plus';
+import information from './comm/planPage.vue';
 import {
   sheetList,
   tenderPlanList,
@@ -159,7 +188,9 @@ import {
   updateTenderPlan,
   treeList,
   getTenderPlanDetail,
-  obtainAllVersionNumbers
+  obtainAllVersionNumbers,
+  biddViewLook,
+  delBiddView
 } from '@/api/tender/index';
 
 const userStore = useUserStoreHook();
@@ -456,30 +487,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 };
 //确定修改
 const handleSave = (row: any) => {
-  try {
-    if (!row.plannedBiddingTime) {
-      ElMessage({
-        message: '请输入计划招标时间',
-        type: 'warning'
-      });
-      return;
-    }
-    updateTenderPlan({ ...row, type: planType.value }).then((res) => {
-      if (res.code == 200) {
-        ElMessage({
-          message: '修改成功',
-          type: 'success'
-        });
-        getList();
-      }
-    });
-  } catch (error) {
-    console.log(error);
-    ElMessage({
-      message: '修改失败',
-      type: 'error'
-    });
-  }
+  informationRef.value.open(row, planType.value);
 };
 //删除
 const delHandle = (row: any) => {
@@ -518,6 +526,42 @@ const getDetails = (row: any) => {
     }
   });
 };
+const informationRef = ref();
+const biddDialog = ref(false);
+const biddViewData = ref<any>([]);
+const biddViewRow = ref<any>({});
+
+//查看招标文件
+const biddView = async (row: any) => {
+  biddViewRow.value = row;
+  biddDialog.value = true;
+  const params = {
+    id: row.id
+  };
+  const res = await biddViewLook(params);
+  if (res.code == 200) {
+    biddViewData.value = res.data;
+  }
+};
+//删除文件
+const delHandlebidd = (row: any) => {
+  const params = {
+    ids: row.id
+  };
+  delBiddView(params).then((res) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: '删除成功',
+        type: 'success'
+      });
+      biddView(biddViewRow.value);
+    }
+  });
+};
+//查看文件
+const openPdf = (row: any) => {
+  window.open(row.url);
+};
 
 onMounted(() => {
   getTabsList();

From 3588c5d386e0f5d80cb1ab405aabccd294911b5c Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 22 Aug 2025 14:29:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=99=90=E4=BB=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/limitPrice/index.vue     |  18 +-
 src/views/contract/limitPrice/indexEdit.vue | 357 ++++++++++++++++++++
 2 files changed, 373 insertions(+), 2 deletions(-)
 create mode 100644 src/views/contract/limitPrice/indexEdit.vue

diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 9128276..c491091 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -35,6 +35,9 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="clickApprovalSheet()" v-hasPermi="['tender:billofquantitiesLimitList:export']">审核</el-button>
+          </el-form-item>
         </el-form>
       </el-card>
     </transition>
@@ -135,11 +138,11 @@ const changeVersions = () => {
 
 //选择表名
 const changeSheet = () => {
-  getTableData();
+  getTableData(); 
 };
 
 //获取表名
-const getSheetName = async () => {
+const getSheetName = async () => {  
   try {
     const params = {
       projectId: currentProject.value?.id,
@@ -269,6 +272,17 @@ const handleExport = () => {
     `限价一览表${queryForm.value.sheet}.xlsx`
   );
 };
+// 审批
+function clickApprovalSheet() {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/approval/contractLimitPrice/indexEdit`,
+    query: {
+      id: '',
+      type: 'update'
+    }
+  });
+}
 onUnmounted(() => {
   listeningProject();
 });
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
new file mode 100644
index 0000000..c4571f2
--- /dev/null
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -0,0 +1,357 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.versions"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">合同限价审核</h3>
+        </div>
+        <div class="p-6">
+          <el-form
+            ref="leaveFormRef"
+            v-loading="loading"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
+            <div class="grid grid-cols-1 gap-4">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="版本号" prop="formNo">
+                    <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </el-form>
+          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="specification" label="规格" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="remark" label="备注" />
+          </el-table>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+import { detailsMaterialAndEquipmentApproval } from '@/api/design/billofQuantities/index';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_contractPriceLimit',
+    label: '合同限价审核'
+  }
+];
+
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  fileName: undefined,
+  fileUrl: undefined,
+  status: undefined,
+  originalName: undefined
+};
+const data = reactive({
+  form: { ...initFormData },
+  tableData: [],
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules, tableData } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await detailsMaterialAndEquipmentApproval(routeParams.value.id);
+    console.log('res.data', res.data);
+
+    Object.assign(form.value, res.data);
+    console.log('form', form.value);
+
+    tableData.value = res.data.auditData;
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.versions;
+    //流程变量
+    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.versions);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+      console.log('routeParams.value', routeParams.value);
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>

From d93b0d71a9bd9f19ea7c940341492240926806a7 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Fri, 22 Aug 2025 15:11:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  10 +-
 src/views/ctr/index.vue                       | 715 +++++++++---------
 .../materialReceive/index.vue                 |   6 +-
 .../out/settlementValueSubcontract/index.vue  |  36 +-
 src/views/patch/index.vue                     |   4 +
 src/views/progress/progressCategory/index.vue |   2 +-
 src/views/tender/plan/index.vue               |   4 +-
 vite.config.ts                                |   2 +-
 8 files changed, 422 insertions(+), 357 deletions(-)

diff --git a/.env.development b/.env.development
index d905b86..4b01d87 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,16 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
+# 李陈杰 209
 VITE_APP_BASE_API = 'http://192.168.110.209:8899'
-
+# 曾涛
+# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+# 罗成
+# VITE_APP_BASE_API = 'http://192.168.110.213:8899'
+# 朱银
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 无人机接口地址
 
 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index 851d61e..6bb4d68 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -1,408 +1,429 @@
 <template>
-    <div class="container">
-        <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
-            <el-step title="选择合同类型" />
-            <el-step title="录入合同内容" />
-            <el-step title="录入收款方式" />
-        </el-steps>
-        <div class="content">
-            <template v-if="active == 0">
-                <div>
-                    <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
-                    <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
-                </div>
-
-            </template>
-            <template v-else-if="active == 1">
-                <h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
-                <template v-if="contract_type == 'income'">
-                    <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules"
-                        label-width="80px">
-                        <!-- <el-form-item label="项目名称">
+  <div class="container">
+    <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+      <el-step title="选择合同类型" />
+      <el-step title="录入合同内容" />
+      <el-step title="录入收款方式" />
+    </el-steps>
+    <div class="content">
+      <template v-if="active == 0">
+        <div>
+          <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
+          <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
+        </div>
+      </template>
+      <template v-else-if="active == 1">
+        <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
+        <template v-if="contract_type == 'income'">
+          <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+            <!-- <el-form-item label="项目名称">
                             <el-input :model-value="project.name" disabled />
                         </el-form-item> -->
-                        <el-form-item label="合同编号" prop="contractCode">
-                            <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
-                        </el-form-item>
-                        <el-form-item label="合同类型" prop="contractType">
-                            <el-select v-model="form.contractType" placeholder="请选择合同类型">
-                                <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="业主单位" prop="contractOwner">
-                            <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
-                        </el-form-item>
-                        <el-form-item label="承包内容">
-                            <editor v-model="form.contractedContent" :min-height="192" />
-                        </el-form-item>
-                        <el-form-item label="合同金额" prop="amount">
-                            <el-input v-model="form.amount" placeholder="请输入合同金额"
-                                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="form.remark" placeholder="请输入备注" />
-                        </el-form-item>
-                        <el-form-item label="附件">
-                            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="tempFileList" />
-                        </el-form-item>
-                    </el-form>
-                </template>
-                <template v-else-if="contract_type == 'expenses'">
-                    <el-form ref="expensesContractFormRef" :model="form" :rules="expensesContractFormRules"
-                        label-width="80px">
-                        <!-- <el-form-item label="项目名称">
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+            </el-form-item>
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="业主单位" prop="contractOwner">
+              <el-input 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="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="winningBidder">
+              <el-input v-model="form.winningBidder" 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="contractPrice">
+              <el-input
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+                v-model="form.contractPrice"
+                placeholder="请输入合同金额"
+                disabled
+              />
+            </el-form-item>
 
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="form.remark" placeholder="请输入备注" />
-                        </el-form-item>
-                        <el-form-item label="附件">
-                            <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="tempFileList" />
-                        </el-form-item>
-                    </el-form>
-                </template>
-                <div>
-                    <el-button @click="back(true)">上一步</el-button>
-                    <el-button type="primary" @click="next">下一步</el-button>
-                </div>
-            </template>
-            <template v-else-if="active == 2">
-                <h1>{{ contract_type == "income" ? "收入合同" : "支出合同" }}</h1>
-                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
-                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
-                        <el-select v-model="form.payType">
-                            <el-option :value="1" label="月结算">月结算</el-option>
-                            <el-option :value="2" label="形象节点">形象节点</el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
-                        <el-input v-model="form.advancePayRatio" placeholder="请输入预付款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                    </el-form-item>
-                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
-                        <el-input v-model="form.balancePayRatio" placeholder="请输入尾款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                    </el-form-item>
-                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio;">
-                        <el-input v-model="form.assuranceDepositRatio" placeholder="请输入质保金比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                    </el-form-item>
-                    <el-form-item label="付款比例（%）" prop="payRatio">
-                        <el-input v-model="form.payRatio" placeholder="请输入付款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
-                    </el-form-item>
-                    <el-form-item>
-                        <div>
-                            <el-button @click="back(false)">上一步</el-button>
-                            <el-button type="success" @click="submitForm">提交</el-button>
-                        </div>
-                    </el-form-item>
-                </el-form>
-            </template>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+            <el-form-item label="附件">
+              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
+            </el-form-item>
+          </el-form>
+        </template>
+        <div>
+          <el-button @click="back(true)">上一步</el-button>
+          <el-button type="primary" @click="next">下一步</el-button>
         </div>
-        <el-dialog v-model="dialogVisible" title="选择招标计划" width="45%">
-            <el-table :data="planList">
-                <el-table-column type="index" width="50" label="序号" />
-                <el-table-column label="名称" align="center" prop="name" />
-                <el-table-column label="合同额" align="center" prop="contractPrice" />
-                <el-table-column label="分包内容" align="center" prop="content" />
-                <el-table-column label="中标单位" align="center" prop="winningBidder" />
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                    <template #default="scope">
-                        <el-button type="primary" @click="handleChooseData(scope.row)">选择</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button type="primary" @click="dialogVisible = false">
-                        关闭
-                    </el-button>
-                </div>
-            </template>
-        </el-dialog>
+      </template>
+      <template v-else-if="active == 2">
+        <h1>{{ contract_type == 'income' ? '收入合同' : '支出合同' }}</h1>
+        <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+          <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+            <el-select v-model="form.payType">
+              <el-option :value="1" label="月结算">月结算</el-option>
+              <el-option :value="2" label="形象节点">形象节点</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+            <el-input
+              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 {
+  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 contract_type = ref('');
+const form = ref({ payType: 1 });
+const fileList = ref([]);
+const tempFileList = ref([]);
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
 const planList = ref([]);
 const dialogVisible = ref(false);
 
-const { expenses_contract_type, income_contract_type } = toRefs(
-    proxy?.useDict('income_contract_type', 'expenses_contract_type')
-);
+const { expenses_contract_type, income_contract_type } = toRefs(proxy?.useDict('income_contract_type', 'expenses_contract_type'));
 const fileRef = ref(null);
 const incomeContractFormRef = ref(null);
 const expensesContractFormRef = ref(null);
 const payMentRef = ref(null);
 const incomeContractFormRules = {
-    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
-    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
-    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+  contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const expensesContractFormRules = {
-    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
-    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+  contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+  contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
 
-    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
-    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
-    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+  winningBidder: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+  amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+  tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
 
-    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+  remark: [{ required: false, message: '请输入备注', trigger: 'blur' }]
 };
 const payMentRules = {
-    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
-    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
-    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
-    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
-    payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }],
+  payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+  advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+  balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+  assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
+  payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }]
 };
 
 const project = computed(() => {
-    console.log(111);
+  console.log(111);
 
-    return JSON.parse(localStorage.getItem("selectedProject"))
+  return JSON.parse(localStorage.getItem('selectedProject'));
 });
 
 const checkContractType = (type) => {
-    contract_type.value = type;
-    form.value.contract_type = type;
-    active.value = 1;
-    form.value.step = active.value;
+  contract_type.value = type;
+  form.value.contract_type = type;
+  active.value = 1;
+  form.value.step = active.value;
 };
 const onUploadSuccess = (data) => {
-    fileList.value = data
-}
+  fileList.value = data;
+};
 const back = async (reset) => {
-    console.log(active.value);
+  console.log(active.value);
 
-    if (reset) {
-        await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-        }).then(() => {
-            resetForm();
-            active.value--;
-        }).catch(() => {
-            return;
-        });
-    } else {
+  if (reset) {
+    await ElMessageBox.confirm('返回上一步将清空目前填写的内容，确定返回？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        resetForm();
         active.value--;
-    }
-    console.log(active.value);
-
-    form.value.step = active.value;
+      })
+      .catch(() => {
+        return;
+      });
+  } else {
+    active.value--;
+  }
+  console.log(active.value);
 
+  form.value.step = active.value;
 };
 const next = async () => {
-    if (contract_type.value === 'income') {
-        await incomeContractFormRef.value.validate((valid) => {
-            if (valid) {
-                active.value++;
-            } else {
-                ElMessage.error('请填写完整的收入合同信息');
-            }
-        });
-    } else if (contract_type.value === 'expenses') {
-        await expensesContractFormRef.value.validate((valid) => {
-            if (valid) {
-                active.value++;
-            } else {
-                ElMessage.error('请填写完整的支出合同信息');
-            }
-        });
-    }
-    console.log(active.value);
+  if (contract_type.value === 'income') {
+    await incomeContractFormRef.value.validate((valid) => {
+      if (valid) {
+        active.value++;
+      } else {
+        ElMessage.error('请填写完整的收入合同信息');
+      }
+    });
+  } else if (contract_type.value === 'expenses') {
+    await expensesContractFormRef.value.validate((valid) => {
+      if (valid) {
+        active.value++;
+      } else {
+        ElMessage.error('请填写完整的支出合同信息');
+      }
+    });
+  }
+  console.log(active.value);
 
-    form.value.step = active.value;
+  form.value.step = active.value;
 };
 const resetForm = () => {
-    form.value = {
-        payType: 1,
-        contractCode: '',
-        contractType: '',
-        contractOwner: '',
-        contractedContent: '',
-        amount: '',
-        remark: '',
-        advancePayRatio: '',
-        balancePayRatio: '',
-        assuranceDepositRatio: '',
-        payRatio: ''
-    };
-    fileList.value = [];
-    tempFileList.value = [];
-    contract_type.value = '';
-    setTimeout(() => {
-        localStorage.removeItem("tempContractForm");
-    }, 0);
+  form.value = {
+    payType: 1,
+    contractCode: '',
+    contractType: '',
+    contractOwner: '',
+    contractedContent: '',
+    amount: '',
+    remark: '',
+    advancePayRatio: '',
+    balancePayRatio: '',
+    assuranceDepositRatio: '',
+    payRatio: ''
+  };
+  fileList.value = [];
+  tempFileList.value = [];
+  contract_type.value = '';
+  setTimeout(() => {
+    localStorage.removeItem('tempContractForm');
+  }, 0);
 };
 const submitForm = async () => {
-    console.log(payMentRef.value);
+  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;
+  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('请填写完整的付款信息');
     }
-    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;
+  });
+  // if (contract_type.value === 'income') {
+  //     const incomeContractFormRef = ref(null);
+  //     await incomeContractFormRef.value.validate(async (valid) => {
+  //         if (valid) {
+  //             // 提交收入合同逻辑
+  //             console.log('提交收入合同', form.value, fileList.value);
+  //             // 这里可以调用API提交数据
+  //             resetForm();
+  //             ElMessage.success('收入合同提交成功');
+  //         } else {
+  //             ElMessage.error('请填写完整的收入合同信息');
+  //         }
+  //     });
+  // } else if (contract_type.value === 'expenses') {
+  //     const expensesContractFormRef = ref(null);
+  //     await expensesContractFormRef.value.validate(async (valid) => {
+  //         if (valid) {
+  //             // 提交支出合同逻辑
+  //             console.log('提交支出合同', form.value, fileList.value);
+  //             // 这里可以调用API提交数据
+  //             resetForm();
+  //             ElMessage.success('支出合同提交成功');
+  //         } else {
+  //             ElMessage.error('请填写完整的支出合同信息');
+  //         }
+  //     });
+  // }
 };
-watch(form, (val) => {
-    localStorage.setItem("tempContractForm", JSON.stringify({ ...val, fileList: fileList.value }));
-}, { deep: true });
-watch(fileList, (val) => {
-    localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
-}, { deep: true });
+const handleChoose = async () => {
+  if (!form.value.contractType) {
+    ElMessage.error('请先选择合同类型');
+    return;
+  }
+  const formData = {
+    projectId: userStore.selectedProject.id,
+    dictName: form.value.contractType,
+    bidStatus: 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");
-        });
-
-    }
+  const tempForm = localStorage.getItem('tempContractForm');
+  if (tempForm) {
+    ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
+      confirmButtonText: '继续',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        const t = JSON.parse(tempForm);
+        const { fileList: files, ...rest } = JSON.parse(tempForm);
+        form.value = rest;
+        fileList.value = files || [];
+        tempFileList.value = files || [];
+        contract_type.value = form.value.contract_type;
+        active.value = form.value.step || 0;
+      })
+      .catch(() => {
+        localStorage.removeItem('tempContractForm');
+      });
+  }
 });
 </script>
 <style scoped lang="scss">
 .container {
-    padding: 20px;
+  padding: 20px;
 
-    .content {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 30px;
-        flex-direction: column;
-    }
+  .content {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 30px;
+    flex-direction: column;
+  }
 }
 </style>
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 6e14b99..ecf7bc1 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -485,13 +485,15 @@ const addItem = () => {
 // 监听条目数据变化，自动计算缺件数量
 const watchItemChanges = (index: number) => {
   watch(
-    () => [form.value.itemList[index].quantity, form.value.itemList[index].acceptedQuantity],
+    () => [form.value.itemList[index]?.quantity, form.value.itemList[index]?.acceptedQuantity],
     ([quantity, acceptedQuantity]) => {
       // 确保数量和验收数量都是数字
       const qty = Number(quantity) || 0;
       const acceptedQty = Number(acceptedQuantity) || 0;
       // 计算缺件数量（数量 - 验收数量）
-      form.value.itemList[index].shortageQuantity = qty - acceptedQty;
+      if (form.value.itemList[index]) {
+        form.value.itemList[index].shortageQuantity = qty - acceptedQty;
+      }
     },
     { immediate: true }
   );
diff --git a/src/views/out/settlementValueSubcontract/index.vue b/src/views/out/settlementValueSubcontract/index.vue
index d25c1fd..393c571 100644
--- a/src/views/out/settlementValueSubcontract/index.vue
+++ b/src/views/out/settlementValueSubcontract/index.vue
@@ -105,7 +105,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="产值类型" prop="valueType">
-          <el-select v-model="form.valueType" placeholder="请选择产值类型">
+          <el-select v-model="form.valueType" placeholder="请选择产值类型" @change="changeValue">
             <el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -121,7 +121,9 @@
           <el-input v-model="form.remark" placeholder="请输入说明" />
         </el-form-item>
         <el-form-item label="合同编码" prop="contractCode">
-          <el-input v-model="form.contractCode" placeholder="请输入合同编码" />
+          <el-select v-model="form.contractCode" value-key="id" placeholder="请输入合同编码" clearable filterable :disabled="!form.valueType">
+            <el-option v-for="item in contractCodeList" :key="item.contractCode" :label="item.contractCode" :value="item.contractCode"> </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="合同名称" prop="contractName">
           <el-input v-model="form.contractName" placeholder="请输入合同名称" />
@@ -138,6 +140,7 @@
 </template>
 
 <script setup name="SettlementValueSubcontract" lang="ts">
+import { listExpensesContract } from '@/api/ctr/expensesContract';
 import {
   listSettlementValueSubcontract,
   getSettlementValueSubcontract,
@@ -154,7 +157,27 @@ import { listContractor } from '@/api/project/contractor';
 import { ContractorVO } from '@/api/project/contractor/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
+// const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
+const out_value_type = [
+  {
+    'label': '设计',
+    'value': '3',
+    'elTagType': 'primary',
+    'elTagClass': ''
+  },
+  {
+    'label': '采购',
+    'value': '2',
+    'elTagType': 'warning',
+    'elTagClass': ''
+  },
+  {
+    'label': '施工',
+    'value': '1',
+    'elTagType': 'success',
+    'elTagClass': ''
+  }
+];
 import { useUserStoreHook } from '@/store/modules/user';
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -239,6 +262,13 @@ const getContractorList = async () => {
   contractorList.value = res.rows;
 };
 
+//获取合同编码
+const contractCodeList = ref<any[]>([]);
+const changeValue = async (contractType: string) => {
+  const res = await listExpensesContract({ projectId: currentProject.value?.id, contractType } as any);
+  contractCodeList.value = res.rows as any;
+};
+
 /** 取消按钮 */
 const cancel = () => {
   reset();
diff --git a/src/views/patch/index.vue b/src/views/patch/index.vue
index 149aea8..d6ba12a 100644
--- a/src/views/patch/index.vue
+++ b/src/views/patch/index.vue
@@ -632,6 +632,10 @@ const handleExport = () => {
   proxy?.download('patch/patch/export', { ...queryParams.value }, `任务列表_${new Date().getTime()}.xlsx`);
 };
 
+onMounted(() => {
+  getList();
+});
+
 // 监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 8537361..bb8b8db 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -66,7 +66,7 @@
             {{ row.parentId == 0 ? '' : row.outputValue }}
           </template>
         </el-table-column>
-        <el-table-column label="总数量/百分比" align="center" prop="total">
+        <el-table-column label="总数量" align="center" prop="total">
           <template #default="{ row }">
             {{ row.parentId == 0 ? '' : row.total }}
           </template>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index dff6321..0e73d12 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -77,8 +77,8 @@
               ['1', 1].includes(scope.row.plannedBiddingMethod)
                 ? '公招'
                 : ['2', 2].includes(scope.row.plannedBiddingMethod)
-                ? '邀标'
-                : scope.row.plannedBiddingMethod || '-'
+                  ? '邀标'
+                  : scope.row.plannedBiddingMethod || '-'
             }}
           </template>
         </el-table-column>
diff --git a/vite.config.ts b/vite.config.ts
index ecd9c03..005038c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -48,7 +48,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
         },
-         '/auth': {
+        '/auth': {
           target: env.VITE_APP_BASE_API,
           changeOrigin: true,
           ws: true,

From 6c05e20e8df893d2c05fab869b17982b587bc41f Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Fri, 22 Aug 2025 15:32:55 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=8B=9B=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |   2 +-
 src/api/tender/index.ts                  |   9 +-
 src/views/tender/plan/comm/planPage.vue  |   9 +-
 src/views/tender/plan/comm/winTheBid.vue | 104 +++++++++++++++++++++++
 src/views/tender/plan/index.vue          |  99 ++++++++++++++++++---
 5 files changed, 205 insertions(+), 18 deletions(-)
 create mode 100644 src/views/tender/plan/comm/winTheBid.vue

diff --git a/.env.development b/.env.development
index b59befd..6e07116 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 
 # 无人机接口地址
 
diff --git a/src/api/tender/index.ts b/src/api/tender/index.ts
index 2f79a49..4c367c5 100644
--- a/src/api/tender/index.ts
+++ b/src/api/tender/index.ts
@@ -44,7 +44,6 @@ export const importExcelFile = (query: any, data: any): AxiosPromise<any> => {
 };
 
 //招标计划列表
-
 export const tenderPlanList = (query: any): AxiosPromise<any> => {
   return request({
     url: '/tender/biddingPlan/list',
@@ -106,3 +105,11 @@ export const delBiddView = (query: any): AxiosPromise<any> => {
     method: 'delete'
   });
 };
+//获取招标单位
+export const getUnitList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/supplierInput/supplierInput/getList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/views/tender/plan/comm/planPage.vue b/src/views/tender/plan/comm/planPage.vue
index e73cac6..a8db316 100644
--- a/src/views/tender/plan/comm/planPage.vue
+++ b/src/views/tender/plan/comm/planPage.vue
@@ -31,7 +31,6 @@
 
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { id } from 'element-plus/es/locale/index.mjs';
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const dialogVisible = ref(false);
@@ -42,7 +41,12 @@ const ruleForm = ref<any>();
 const rules = ref({
   costEstimationFile: [{ required: true, message: '请上传招标文件', trigger: ['blur'] }]
 });
-
+const emit = defineProps({
+  success: {
+    type: Function
+    // required: true
+  }
+});
 const form = ref({
   costEstimationFile: ''
 });
@@ -64,6 +68,7 @@ const submitForm = () => {
       return;
     }
     dialogVisible.value = false;
+    emit.success();
   });
 };
 defineExpose({
diff --git a/src/views/tender/plan/comm/winTheBid.vue b/src/views/tender/plan/comm/winTheBid.vue
new file mode 100644
index 0000000..c606f32
--- /dev/null
+++ b/src/views/tender/plan/comm/winTheBid.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-dialog v-model="dialogVisible" title="招标文件" width="500" draggable>
+    <el-form ref="ruleFormRef" style="max-width: 600px" :model="form" :rules="rules" label-width="auto">
+      <el-form-item label="中标单位" prop="winningBidder">
+        <el-select v-model="form.winningBidder" filterable placeholder="请选择单位" style="width: 240px">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="招标文件" prop="name">
+        <file-upload
+          v-model="form.costEstimationFile"
+          :fileSize="100"
+          :auto-upload="false"
+          uploadUrl="/tender/biddingPlan/uploadBiddingDocuments"
+          method="put"
+          ref="fileUploadRef"
+          :data="{
+            projectId: currentProject?.id,
+            planType: planType,
+            fileType: '0',
+            bidStatus: '0',
+            id: row.id,
+            winningBidderId: form.winningBidder
+          }"
+          showFileList
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="resetForm()"> 取消 </el-button>
+        <el-button type="primary" @click="submitForm()">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { getUnitList } from '@/api/tender/index';
+import { useUserStoreHook } from '@/store/modules/user';
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const dialogVisible = ref(false);
+const row = ref<any>();
+const planType = ref<any>('');
+const fileUploadRef = ref<any>();
+const ruleForm = ref<any>();
+const options = ref<any>([]);
+
+const rules = ref({
+  costEstimationFile: [{ required: true, message: '请上传招标文件', trigger: ['blur'] }]
+});
+const emit = defineProps({
+  success: {
+    type: Function
+    // required: true
+  }
+});
+const form = ref({
+  costEstimationFile: '',
+  winningBidder: ''
+});
+
+const open = (rows: any, type: string) => {
+  dialogVisible.value = true;
+  console.log(rows, type);
+  row.value = rows;
+  planType.value = type;
+  getUnitListData();
+};
+const getUnitListData = async () => {
+  let res = await getUnitList({
+    projectId: currentProject.value?.id
+  });
+  if (res.code == 200) {
+    options.value = res.data.map((item: any) => {
+      return {
+        label: item.supplierName,
+        value: item.id
+      };
+    });
+  }
+  console.log(res);
+};
+const resetForm = () => {};
+const submitForm = () => {
+  fileUploadRef.value.submitUpload().then((res) => {
+    if (res == 'noFile') {
+      ElMessage({
+        message: '请上传招标文件',
+        type: 'warning'
+      });
+      return;
+    }
+    dialogVisible.value = false;
+    emit.success();
+  });
+};
+defineExpose({
+  open
+});
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 614d97e..3f2eb41 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -28,33 +28,77 @@
           <el-table-column prop="content" label="内容" />
           <el-table-column prop="bidd" label="招标文件">
             <template #default="scope">
-              <el-button type="primary" link v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']" @click="biddView(scope.row)"
+              <el-button
+                type="primary"
+                :disabled="scope.row.bidStatus == 1"
+                link
+                v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+                @click="biddView(scope.row)"
                 >查看文件</el-button
               >
             </template>
           </el-table-column>
+          <el-table-column prop="winningBidder" label="中标单位" />
+          <el-table-column prop="bidFileName" label="中标文件">
+            <template #default="scope">
+              <el-button type="primary" link :disabled="scope.row.bidStatus == 1">{{ scope.row.bidFileName }} </el-button>
+            </template>
+          </el-table-column>
           <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
             <template #default="scope">
-              <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
+              <el-date-picker
+                v-model="scope.row.plannedBiddingTime"
+                @change="
+                  (val: any) => {
+                    changeBiddingTime(val, scope.row);
+                  }
+                "
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择时间"
+                :disabled="scope.row.bidStatus == 1"
+              />
             </template>
           </el-table-column>
           <el-table-column prop="price" label="操作" align="center">
             <template #default="scope">
-              <el-button type="primary" link icon="View" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
-                >详情</el-button
-              >
               <el-button
                 type="primary"
                 link
                 icon="FolderOpened"
                 @click="handleSave(scope.row)"
                 v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                :disabled="scope.row.bidStatus == 1"
                 >上传投标资料
               </el-button>
-              <el-button type="primary" link icon="Edit" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
-                >信息
+              <el-button
+                type="primary"
+                link
+                icon="FolderOpened"
+                @click="handleWinTheBid(scope.row)"
+                v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                :disabled="scope.row.bidStatus == 1"
+                >上传中标资料
               </el-button>
-              <el-button type="primary" link icon="Delete" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+              <!-- <el-button type="primary" link icon="Edit" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                >信息
+              </el-button> -->
+              <el-button
+                type="primary"
+                link
+                icon="View"
+                @click="handleDetail(scope.row)"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+                >详情</el-button
+              >
+              <el-button
+                type="primary"
+                link
+                icon="Delete"
+                @click="delHandle(scope.row)"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
                 >删除</el-button
               >
             </template>
@@ -142,7 +186,7 @@
       </el-row>
       <template #footer>
         <el-button @click="closeDialog">取消</el-button>
-        <el-button type="primary" @click="submitForm(formRef)">确定</el-button>
+        <el-button type="primary" @click="submitForm(formRef)" :loading="subLoading">确定</el-button>
       </template>
     </el-dialog>
     <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
@@ -159,18 +203,21 @@
         </el-table-column>
       </el-table>
     </el-dialog>
-    <information ref="informationRef" />
+
     <el-dialog title="查看文件" v-model="biddDialog" width="45%" draggable>
       <el-table :data="biddViewData" border>
         <el-table-column prop="name" label="文件名" />
         <el-table-column prop="price" label="操作" align="center">
           <template #default="scope">
-            <el-button type="primary" link icon="View" @click="openPdf(scope.row)">查看</el-button>
+            <el-button type="primary" link icon="View" @click="openPdf(scope.row.url)">查看</el-button>
             <el-button type="primary" link icon="Delete" @click="delHandlebidd(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
+    <information ref="informationRef" @success="getList()" />
+
+    <winTheBid ref="winTheBidRef" @success="getList()" />
   </div>
 </template>
 
@@ -180,6 +227,7 @@ import { getDicts } from '@/api/system/dict/data';
 import { Plus } from '@element-plus/icons-vue';
 import { FormInstance } from 'element-plus';
 import information from './comm/planPage.vue';
+import winTheBid from './comm/winTheBid.vue';
 import {
   sheetList,
   tenderPlanList,
@@ -436,12 +484,14 @@ const getTreeList = async () => {
     treeLoading.value = false;
   }
 };
+const subLoading = ref(false);
 
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       try {
+        subLoading.value = true;
         if (selectionData.value.length == 0) {
           ElMessage({
             message: '请选择项目材料',
@@ -476,8 +526,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           });
           closeDialog();
           getList();
+          subLoading.value = false;
         }
       } catch (error) {
+        subLoading.value = false;
         console.log(error);
       }
     } else {
@@ -485,10 +537,28 @@ const submitForm = async (formEl: FormInstance | undefined) => {
     }
   });
 };
-//确定修改
+const changeBiddingTime = (value: any, row: any) => {
+  updateTenderPlan({
+    ...row
+  }).then((res) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: '修改成功',
+        type: 'success'
+      });
+      getList();
+    }
+  });
+};
+//上传投标文件
 const handleSave = (row: any) => {
   informationRef.value.open(row, planType.value);
 };
+const winTheBidRef = ref();
+//上传中标文件
+const handleWinTheBid = (row: any) => {
+  winTheBidRef.value.open(row, planType.value);
+};
 //删除
 const delHandle = (row: any) => {
   try {
@@ -558,9 +628,10 @@ const delHandlebidd = (row: any) => {
     }
   });
 };
+
 //查看文件
-const openPdf = (row: any) => {
-  window.open(row.url);
+const openPdf = (url: any) => {
+  window.open(url);
 };
 
 onMounted(() => {