From d37243af6bccbfefdffef3b22cc90e5d4b786c55 Mon Sep 17 00:00:00 2001
From: tcy <1193318383@qq.com>
Date: Sat, 6 Sep 2025 15:09:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor(volumeCatalog):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8D=B7=E5=86=8C=E7=9B=AE=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整表格列布局，增加文件数量徽章
- 优化导入按钮位置和样式
- 改进查看文件列表对话框，统一操作按钮样式
- 调整上传图纸和意见的组件样式
- 优化表格样式，增加对齐方式
---
 .env.development                         |   2 +-
 src/views/design/volumeCatalog/index.vue | 160 ++++++++++-------------
 2 files changed, 71 insertions(+), 91 deletions(-)

diff --git a/.env.development b/.env.development
index eb8185a..faff5a9 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.188:8899'
+VITE_APP_BASE_API = 'http://192.168.110.210:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index f7d77df..e231fe4 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2 volumeCatalog">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -11,7 +12,8 @@
               <el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery"
+                v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
             </el-form-item>
           </el-form>
@@ -23,23 +25,16 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:volumeCatalog:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['design:volumeCatalog:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <file-upload
-              v-model="form.file"
-              isImportInfo
-              :isShowTip="false"
-              uploadUrl="/design/volumeCatalog/importData"
-              :limit="1"
-              :fileType="['xlsx', 'xls']"
-              :data="{
+            <file-upload v-model="form.file" isImportInfo :isShowTip="false"
+              uploadUrl="/design/volumeCatalog/importData" :limit="1" :fileType="['xlsx', 'xls']" :data="{
                 projectId: currentProject?.id
-              }"
-              :file-size="50"
-              :onUploadSuccess="handleUploadSuccess"
-            >
-              <el-button v-hasPermi="['design:volumeCatalog:importData']" type="warning" plain icon="Upload">导入</el-button>
+              }" :file-size="50" :onUploadSuccess="handleUploadSuccess">
+              <el-button v-hasPermi="['design:volumeCatalog:importData']" type="warning" plain
+                icon="Upload">导入</el-button>
             </file-upload>
           </el-col>
           <el-col :span="1.5">
@@ -65,9 +60,10 @@
         <el-table-column label="计划出图时间" align="center" prop="plannedCompletion" width="200" />
         <el-table-column label="图纸文件" align="center" prop="remark" width="150">
           <template #default="scope">
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeCatalog:listFile']"
-              >查看文件</el-button
-            >
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+              v-hasPermi="['design:volumeCatalog:listFile']">查看文件</el-button>
+            <el-badge v-if="scope.row.fileCount" :value="scope.row.fileCount" class="item" type="danger">
+            </el-badge>
           </template>
         </el-table-column>
         <el-table-column label="外部意见" align="center">
@@ -79,23 +75,18 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:volumeFile:edit']">修改</el-button>
-            <el-button
-              link
-              type="primary"
-              icon="Upload"
-              @click="handleUpload(scope.row)"
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['design:volumeFile:edit']">修改</el-button>
+            <el-button link type="primary" icon="Upload" @click="handleUpload(scope.row)"
               v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
-              v-hasPermi="['design:volumeFile:add']"
-              >上传图纸</el-button
-            >
-            <el-button link type="primary" v-hasPermi="['design:volumeFile:edit']" icon="Upload" @click="handleOpinion(scope.row)"
-              >外部意见</el-button
-            >
+              v-hasPermi="['design:volumeFile:add']">上传图纸</el-button>
+            <el-button link type="primary" v-hasPermi="['design:volumeFile:edit']" icon="Upload"
+              @click="handleOpinion(scope.row)">外部意见</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改卷册目录对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -105,17 +96,15 @@
         </el-form-item>
         <el-form-item label="专业" prop="specialty">
           <el-select v-model="form.specialty" placeholder="请选择专业" @change="changeSpecialty">
-            <el-option :value="item.userMajor" v-for="item in des_user_major" :key="item.userMajor" :label="item.userMajorName" />
+            <el-option :value="item.userMajor" v-for="item in des_user_major" :key="item.userMajor"
+              :label="item.userMajorName" />
           </el-select>
         </el-form-item>
         <el-form-item label="设计人员" prop="principal">
-          <el-select
-            :disabled="!form.specialty"
-            v-model="form.principal"
-            placeholder="请选择设计人员"
-            class="transition-all duration-300 border-gray-300"
-          >
-            <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName" :value="item.userId.toString()" />
+          <el-select :disabled="!form.specialty" v-model="form.principal" placeholder="请选择设计人员"
+            class="transition-all duration-300 border-gray-300">
+            <el-option v-for="item in userAppList" :key="item.userId" :label="item.userName"
+              :value="item.userId.toString()" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="设计状态" prop="designState">
@@ -124,7 +113,8 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="计划出图时间" prop="plannedCompletion">
-          <el-date-picker v-model="form.plannedCompletion" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划出图时间" />
+          <el-date-picker v-model="form.plannedCompletion" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择计划出图时间" />
         </el-form-item>
         <el-form-item label="卷册号" prop="volumeNumber">
           <el-input v-model="form.volumeNumber" placeholder="请输入卷册号" />
@@ -146,15 +136,16 @@
     <el-dialog draggable title="上传图纸文件" v-model="uploadVisible" width="500px" append-to-body>
       <el-form :model="uploadForm" label-width="80px" :inline="false">
         <el-form-item label="图纸类型" prop="type">
-          <el-select v-model="uploadForm.type" placeholder="请选择图纸类型"
-            ><el-option label="过程图纸" value="1" /><el-option label="蓝图" value="3"
-          /></el-select>
+          <el-select v-model="uploadForm.type" placeholder="请选择图纸类型"><el-option label="过程图纸" value="1" /><el-option
+              label="蓝图" value="3" /></el-select>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
-          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
+          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100"
+            v-model="uploadForm.fileIds"></file-upload>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
-          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
+          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100"
+            v-model="uploadForm.cancellationIds"></file-upload>
         </el-form-item>
       </el-form>
       <span style="font-size: 12px; color: #999999">注意:请上传pdf格式文件</span>
@@ -166,60 +157,41 @@
     <!-- 查看文件列表 -->
     <el-dialog draggable title="图纸列表" v-model="viewVisible" width="1000px">
       <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="蓝图" name="3"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+        <el-tab-pane label="蓝图" name="3">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
             <template #operation="{ row }">
-              <el-button
-                link
-                type="primary"
-                icon="edit"
-                @click="handleAuditLantu(row)"
-                v-if="(row.status != '2' && row.auditStatus == 'draft') || row.auditStatus == 'back'"
-                >审核</el-button
-              >
-              <el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'" @click="handleAuditViewLantu(row)"
-                >查看流程</el-button
-              >
+              <el-button link type="primary" icon="edit" @click="handleAuditLantu(row)"
+                v-if="(row.status != '2' && row.auditStatus == 'draft') || row.auditStatus == 'back'">审核</el-button>
+              <el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'"
+                @click="handleAuditViewLantu(row)">查看流程</el-button>
               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
-              <el-button
-                type="warning"
-                link
-                icon="View"
+              <el-button type="warning" link icon="View"
                 v-if="(row.status != '2' && row.auditStatus == 'back') || row.auditStatus == 'termination' || row.auditStatus == 'finish'"
-                @click="handleViewHistory(row)"
-                >查看单据</el-button
-              >
+                @click="handleViewHistory(row)">查看单据</el-button>
             </template>
-          </TableContent></el-tab-pane
-        >
-        <el-tab-pane label="过程图纸 " name="1"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+          </TableContent>
+        </el-tab-pane>
+        <el-tab-pane label="过程图纸 " name="1">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
             <template #operation="{ row }">
-              <el-button link type="primary" icon="edit" @click="handleAudit(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'"
-                >审核</el-button
-              >
-              <el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'" @click="handleAuditView(row)"
-                >查看流程</el-button
-              >
+              <el-button link type="primary" icon="edit" @click="handleAudit(row)"
+                v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'">审核</el-button>
+              <el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'"
+                @click="handleAuditView(row)">查看流程</el-button>
               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
-              <el-button
-                type="warning"
-                link
-                icon="View"
+              <el-button type="warning" link icon="View"
                 v-if="row.auditStatus == 'back' || row.auditStatus == 'termination' || row.auditStatus == 'finish'"
-                @click="handleViewHistory(row)"
-                >查看单据</el-button
-              >
+                @click="handleViewHistory(row)">查看单据</el-button>
             </template>
-          </TableContent></el-tab-pane
-        >
-        <el-tab-pane label="作废 " name="4"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+          </TableContent>
+        </el-tab-pane>
+        <el-tab-pane label="作废 " name="4">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
             <template #operation="{ row }">
               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
             </template>
-          </TableContent></el-tab-pane
-        >
+          </TableContent>
+        </el-tab-pane>
       </el-tabs>
       <template #footer>
         <span>
@@ -233,7 +205,8 @@
     <el-dialog draggable title="上传外部意见" v-model="uploadOpinionVisible" width="500px" append-to-body>
       <el-form :model="updateRow" label-width="80px" :inline="false">
         <el-form-item label="外部意见">
-          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" :onUploadSuccess="onUploadSuccess" v-model="opinion"></file-upload>
+          <file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" :onUploadSuccess="onUploadSuccess"
+            v-model="opinion"></file-upload>
         </el-form-item>
       </el-form>
       <span style="font-size: 12px; color: #999999">注意:请上传pdf格式文件</span>
@@ -677,6 +650,7 @@ onUnmounted(() => {
 </script>
 <style lang="scss">
 .volumeCatalog_box {
+
   /* .upload-demo {
     width: 100% !important;
   } */
@@ -684,6 +658,7 @@ onUnmounted(() => {
     border-collapse: collapse; //合并为一个单一的边框
     border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可
   }
+
   thead {
     tr {
       th {
@@ -693,16 +668,19 @@ onUnmounted(() => {
         letter-spacing: 5px;
         padding: 15px;
       }
+
       td {
         text-align: left;
         height: 35px; //设置单元格最小高度
         padding: 15px;
       }
+
       .th-bg {
         background-color: rgba(247, 247, 247, 1);
       }
     }
   }
+
   tbody {
     tr {
       td {
@@ -710,6 +688,7 @@ onUnmounted(() => {
         height: 40px; //设置单元格最小高度
         padding: 15px;
       }
+
       th {
         height: 35px; //设置单元格最小高度
         text-align: center;
@@ -718,6 +697,7 @@ onUnmounted(() => {
       }
     }
   }
+
   .table-content {
     box-shadow: 0px 0px 10px #ddd;
     padding: 20px;

From d50dbe719d4013b5689b12372eeac7c847aa2b90 Mon Sep 17 00:00:00 2001
From: tcy <1193318383@qq.com>
Date: Sat, 6 Sep 2025 15:19:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor(formalities):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=89=8B=E7=BB=AD=E5=8A=9E=E7=90=86=E6=B8=85=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整了多个组件的样式和布局，包括表格、表单、按钮等
- 优化了部分代码结构，提高了代码可读性和维护性
- 添加了文件数量徽章，增强了用户界面的交互性
---
 src/views/design/volumeCatalog/index.vue      |   3 +-
 .../formalitiesAreConsolidated/index.vue      | 147 ++++++++----------
 .../formalities/listOfFormalities/index.vue   |  20 ++-
 3 files changed, 78 insertions(+), 92 deletions(-)

diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index e6fcbad..cfd3457 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -145,7 +145,8 @@
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '3'" label="抄送人">
           <el-select multiple filterable clearable v-model="form.userIds" placeholder="请选择抄送人">
-            <el-option :value="item.userId" v-for="item in userCoryList" :key="item.userId" :label="item.nickName + '-' + item.phonenumber" />
+            <el-option :value="item.userId" v-for="item in userCoryList" :key="item.userId"
+              :label="item.nickName + '-' + item.phonenumber" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 834f4cd..841f2d8 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
@@ -11,25 +12,15 @@
               <el-input v-model="queryParams.formalitiesId" placeholder="请输入手续办理清单模板id" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
             <el-form-item label="计划开始时间" prop="planTheStartTime">
-              <el-date-picker
-                clearable
-                v-model="queryParams.planTheStartTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择计划开始时间"
-              />
+              <el-date-picker clearable v-model="queryParams.planTheStartTime" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择计划开始时间" />
             </el-form-item>
             <el-form-item label="负责人" prop="head">
               <el-input v-model="queryParams.head" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="实际完成时间" prop="actualCompletionTime">
-              <el-date-picker
-                clearable
-                v-model="queryParams.actualCompletionTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择实际完成时间"
-              />
+              <el-date-picker clearable v-model="queryParams.actualCompletionTime" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择实际完成时间" />
             </el-form-item>
             <!-- <el-form-item label="手续材料" prop="formalitiesUrl">
               <el-input v-model="queryParams.formalitiesUrl" placeholder="请输入手续材料" clearable @keyup.enter="handleQuery" />
@@ -47,19 +38,21 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']"
-              >新增</el-button
-            >
-            <span style="margin-left: 10px"
-              ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top">
-                <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip
-            ></span>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
+              v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']">新增</el-button>
+            <span style="margin-left: 10px"><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增"
+                placement="top">
+                <el-icon color="#409efc">
+                  <WarningFilled />
+                </el-icon> </el-tooltip></span>
           </el-col>
           <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']">
             <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button>
             <span style="margin-left: 10px">
               <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top">
-                <el-icon color="#409efc"><WarningFilled /></el-icon>
+                <el-icon color="#409efc">
+                  <WarningFilled />
+                </el-icon>
               </el-tooltip>
             </span>
           </el-col>
@@ -78,7 +71,8 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange" row-key="id" default-expand-all>
+      <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange"
+        row-key="id" default-expand-all>
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="手续办理清单模板父级" align="center" prop="formalitiesPname" /> -->
         <el-table-column label="手续办理清单" align="left" prop="formalitiesName" />
@@ -101,51 +95,52 @@
         <el-table-column label="办理状态" align="center" prop="processingStatus" />
         <el-table-column label="手续材料" align="center" prop="formalitiesUrl" width="180">
           <template #default="scope">
-            <el-link type="primary" :underline="false" @click="handlePreview(scope.row)" target="_blank" v-if="scope.row.formalitiesPid"
-              >查看</el-link
-            >
+            <div style="display: flex; justify-content: center; align-items: center;">
+
+
+              <div>
+                <el-link type="primary" :underline="false" @click="handlePreview(scope.row)" target="_blank"
+                  v-if="scope.row.formalitiesPid">查看</el-link>
+              </div>
+              <div>
+                <el-badge v-if="scope.row.fileCount" :value="scope.row.fileCount" class="item" type="danger">
+                </el-badge>
+              </div>
+            </div>
+
+
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <div v-if="scope.row.formalitiesPid">
-              <el-button
-                link
-                type="primary"
-                icon="Edit"
-                v-if="scope.row.processingStatus != '已完成'"
+              <el-button link type="primary" icon="Edit" v-if="scope.row.processingStatus != '已完成'"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >修改</el-button
-              >
-              <el-button link type="primary" icon="Upload" v-if="scope.row.processingStatus != '已完成'" @click="handleUpload(scope.row)"
-                >上传</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                icon="EditPen"
-                @click="handleUpdateStatus(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >修改状态</el-button
-              >
+                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改</el-button>
+              <el-button link type="primary" icon="Upload" v-if="scope.row.processingStatus != '已完成'"
+                @click="handleUpload(scope.row)">上传</el-button>
+              <el-button link type="primary" icon="EditPen" @click="handleUpdateStatus(scope.row)"
+                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改状态</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改合规性手续合账对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="formalitiesAreConsolidatedFormRef" :model="form" :rules="rules" label-width="160px">
         <el-form-item label="计划开始时间" prop="planTheStartTime">
-          <el-date-picker clearable v-model="form.planTheStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划开始时间">
+          <el-date-picker clearable v-model="form.planTheStartTime" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择计划开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="计划完成时间" prop="planTheStartTime">
-          <el-date-picker clearable v-model="form.planTheEndTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划完成时间">
+          <el-date-picker clearable v-model="form.planTheEndTime" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择计划完成时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="负责人" prop="head">
@@ -167,7 +162,8 @@
       <el-table :data="fileList" style="width: 100%" border v-loading="fileLoading">
         <el-table-column prop="fileName" label="文件" align="center">
           <template #default="scope">
-            <el-link :key="scope.row.annexUrl" :href="scope.row.annexUrl" target="_blank" type="primary" :underline="false">
+            <el-link :key="scope.row.annexUrl" :href="scope.row.annexUrl" target="_blank" type="primary"
+              :underline="false">
               {{ scope.row.fileName || '查看文件' }}
             </el-link>
           </template>
@@ -178,13 +174,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="fileTotal > 0"
-        :total="fileTotal"
-        v-model:page="fileParams.pageNum"
-        v-model:limit="fileParams.pageSize"
-        @pagination="getFileList"
-      />
+      <pagination v-show="fileTotal > 0" :total="fileTotal" v-model:page="fileParams.pageNum"
+        v-model:limit="fileParams.pageSize" @pagination="getFileList" />
       <template #footer>
         <span>
           <el-button type="primary" @click="viewVisible = false">关闭</el-button>
@@ -194,18 +185,9 @@
     <!-- 上传文件对话框 -->
     <el-dialog draggable title="上传文件" v-model="fileVisible" width="450">
       <el-form-item label="上传文件" prop="processingStatus">
-        <file-upload
-          v-model="file"
-          ref="uploadRef"
-          uploadUrl="/formalities/formalitiesAnnex"
-          v-hasPermi="['formalities:formalitiesAnnex:add']"
-          :data="{ formalitiesId: form.id }"
-          :fileType="['pdf']"
-          :auto-upload="false"
-          showFileList
-          method="put"
-          :onUploadSuccess="handleUploadSuccess"
-        />
+        <file-upload v-model="file" ref="uploadRef" uploadUrl="/formalities/formalitiesAnnex"
+          v-hasPermi="['formalities:formalitiesAnnex:add']" :data="{ formalitiesId: form.id }" :fileType="['pdf']"
+          :auto-upload="false" showFileList method="put" :onUploadSuccess="handleUploadSuccess" />
       </el-form-item>
       <template #footer>
         <span>
@@ -233,21 +215,19 @@
     </el-dialog>
     <el-dialog title="新增合规性手续合账" v-model="templateVisbile" width="450">
       <el-form-item label="合规性手续模板">
-        <el-cascader
-          v-model="tempValue"
-          :options="tempTreeList"
-          :props="{
-            multiple: true,
-            value: 'id',
-            label: 'name',
-            disabled: (node: any) => {
-              return (node.pid == 0 && !node.children.length) || node.status == 1; // 有 parent 的是二级，没有 parent 的是一级，禁用一级
-            }
-          }"
-        />
+        <el-cascader v-model="tempValue" :options="tempTreeList" :props="{
+          multiple: true,
+          value: 'id',
+          label: 'name',
+          disabled: (node: any) => {
+            return (node.pid == 0 && !node.children.length) || node.status == 1; // 有 parent 的是二级，没有 parent 的是一级，禁用一级
+          }
+        }" />
         <div style="margin-left: 10px; display: flex; justify-content: center; align-items: center">
           <el-tooltip class="box-item" effect="dark" content="列表上已选择得模版不可再选" placement="top">
-            <el-icon><WarningFilled /></el-icon>
+            <el-icon>
+              <WarningFilled />
+            </el-icon>
           </el-tooltip>
         </div>
       </el-form-item>
@@ -268,7 +248,8 @@
             <el-option v-for="item in listOfFormalitiesList" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="名称" prop="formalitiesName" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]">
+        <el-form-item label="名称" prop="formalitiesName"
+          :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]">
           <el-input v-model="formTemplate.formalitiesName" placeholder="请输入名称" />
         </el-form-item>
       </el-form>
diff --git a/src/views/formalities/listOfFormalities/index.vue b/src/views/formalities/listOfFormalities/index.vue
index 5bcd5b9..fa8c725 100644
--- a/src/views/formalities/listOfFormalities/index.vue
+++ b/src/views/formalities/listOfFormalities/index.vue
@@ -1,7 +1,9 @@
 <template>
-  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay" v-if="showFormalitiesAreConsolidated" />
+  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay"
+    v-if="showFormalitiesAreConsolidated" />
   <div class="p-2" v-else>
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -21,22 +23,24 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk" v-hasPermi="['formalities:listOfFormalities:add']"
-              >确认</el-button
-            >
+            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk"
+              v-hasPermi="['formalities:listOfFormalities:add']">确认</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id" default-expand-all>
+      <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id"
+        default-expand-all>
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="名称" prop="name" />
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改手续办理清单模板对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>

From 5101dc7657326a1258fb72d08aa089e3a807124c Mon Sep 17 00:00:00 2001
From: tcy <1193318383@qq.com>
Date: Sat, 6 Sep 2025 18:26:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(ctr):=20=E4=BF=AE=E5=A4=8D=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E5=90=88=E5=90=8C=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=90=8E=E6=9C=AA=E9=87=8D=E7=BD=AE=E5=90=88=E5=90=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在切换收入合同类型时，确保合同类型被正确重置
- 优化了模板中的代码格式，提高了可读性
---
 src/views/ctr/index.vue | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index 96f5c49..98b913d 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -24,7 +24,8 @@
             </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-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">
@@ -37,17 +38,15 @@
               <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-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" />
+              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef"
+                :defaultFileList="tempFileList" />
             </el-form-item>
           </el-form>
         </template>
@@ -61,35 +60,36 @@
             </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-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="招标计划" prop="tenderId">
               <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
               <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
-              <el-button type="primary" @click="handleChoose" v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button>
+              <el-button type="primary" @click="handleChoose"
+                v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button>
             </el-form-item>
             <el-form-item label="供应商" prop="contractSupplier">
               <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
             </el-form-item>
             <el-form-item label="分包内容">
               <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> -->
-              <el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled />
+              <el-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
-              />
+                v-model="form.amount" placeholder="请输入合同金额" disabled />
             </el-form-item>
 
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
             <el-form-item label="合同附件">
-              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" />
+              <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef"
+                :defaultFileList="tempFileList" />
             </el-form-item>
           </el-form>
         </template>
@@ -208,7 +208,7 @@ const payRatioComputed = computed({
     return total;
   },
   // 只读
-  set: () => {}
+  set: () => { }
 });
 const checkContractType = (type) => {
   contract_type.value = type;
@@ -280,7 +280,6 @@ const resetForm = () => {
   };
   fileList.value = [];
   tempFileList.value = [];
-  contract_type.value = '';
   setTimeout(() => {
     localStorage.removeItem('tempContractForm');
   }, 0);
@@ -399,6 +398,7 @@ const getInfoByProjectIdList = async () => {
   form.value.contractOwner = res.data.planDuration;
 };
 onMounted(() => {
+  contract_type.value = '';
   getInfoByProjectIdList();
 
   const tempForm = localStorage.getItem('tempContractForm');