diff --git a/src/api/formalities/formalitiesAreConsolidated/index.ts b/src/api/formalities/formalitiesAreConsolidated/index.ts
index 218187c..f6db0c1 100644
--- a/src/api/formalities/formalitiesAreConsolidated/index.ts
+++ b/src/api/formalities/formalitiesAreConsolidated/index.ts
@@ -5,6 +5,7 @@ import {
   FormalitiesAreConsolidatedForm,
   FormalitiesAreConsolidatedQuery
 } from '@/api/formalities/formalitiesAreConsolidated/types';
+import { ListOfFormalitiesQuery, ListOfFormalitiesVO } from '../listOfFormalities/types';
 
 /**
  * 查询合规性手续合账列表
@@ -101,3 +102,17 @@ export const delFormalitiesAnnex = (id: string | number | Array<string | number>
     method: 'delete'
   });
 };
+
+/**
+ * 查询手续办理清单模板属性列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getTemplateTreeList = (query?: any): AxiosPromise<ListOfFormalitiesVO[]> => {
+  return request({
+    url: '/formalities/formalitiesAreConsolidated/getTree',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/progress/progressCategoryTemplate/index.ts b/src/api/progress/progressCategoryTemplate/index.ts
index 3e80694..5743b83 100644
--- a/src/api/progress/progressCategoryTemplate/index.ts
+++ b/src/api/progress/progressCategoryTemplate/index.ts
@@ -1,6 +1,10 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ProgressCategoryTemplateVO, ProgressCategoryTemplateForm, ProgressCategoryTemplateQuery } from '@/api/progress/progressCategoryTemplate/types';
+import {
+  ProgressCategoryTemplateVO,
+  ProgressCategoryTemplateForm,
+  ProgressCategoryTemplateQuery
+} from '@/api/progress/progressCategoryTemplate/types';
 
 /**
  * 查询进度类别模版列表
@@ -61,3 +65,10 @@ export const delProgressCategoryTemplate = (id: string | number | Array<string |
     method: 'delete'
   });
 };
+
+export const getTabList = () => {
+  return request({
+    url: '/progress/progressCategoryTemplate/listSystemTop',
+    method: 'get'
+  });
+};
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 5011b9d..b2580ea 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -48,7 +48,13 @@
             tag="ul"
             @click.stop
           >
-            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
+            <li
+              style="margin-top: 10px"
+              v-for="(file, index) in fileList"
+              :key="file.uid"
+              class="el-upload-list__item ele-upload-list__item-content"
+              v-if="autoUpload"
+            >
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
                 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
               </el-link>
@@ -213,31 +219,27 @@ watch(
 );
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
-  // 校检文件类型
-  if (props.fileType.length) {
-    const fileName = file.name.split('.');
-    const fileExt = fileName[fileName.length - 1];
-    const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
-    if (!isTypeOk) {
-      proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
-      return false;
-    }
+  if (!validateFile(file)) return false;
+  proxy?.$modal.loading('正在上传文件，请稍候...');
+  number.value++;
+  return true;
+};
+
+//校检格式和大小
+const validateFile = (file: File) => {
+  const ext = file.name.split('.').pop()?.toLowerCase();
+  if (props.fileType.length && !props.fileType.includes(ext!)) {
+    proxy?.$modal.msgError(`文件格式不正确，请上传 ${props.fileType.join('/')} 格式文件!`);
+    return false;
   }
-  // 校检文件名是否包含特殊字符
   if (file.name.includes(',')) {
     proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
     return false;
   }
-  // 校检文件大小
-  if (props.fileSize) {
-    const isLt = file.size / 1024 / 1024 < props.fileSize;
-    if (!isLt) {
-      proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
-      return false;
-    }
+  if (props.fileSize && file.size / 1024 / 1024 > props.fileSize) {
+    proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+    return false;
   }
-  proxy?.$modal.loading('正在上传文件，请稍候...');
-  number.value++;
   return true;
 };
 
@@ -278,13 +280,25 @@ const handleUploadSuccess = (res: any, file: UploadFileWithOssId) => {
   uploadedSuccessfully(res);
 };
 
-const handleChange = (file: any, fileList: any) => {
+const handleChange = (file: any, filelist: any) => {
+  if (!props.autoUpload) {
+    // 手动上传模式：在选中文件时拦截非法文件
+    const isValid = validateFile(file.raw || file);
+    if (!isValid) {
+      fileUploadRef.value?.handleRemove(file); // 直接移除非法文件
+      console.log(file, filelist, fileList.value);
+      fileList.value = [...fileList.value]; // 触发列表更新
+      return;
+    }
+  }
   // 记录 status = 'ready' 的文件
   if (file.status === 'ready') {
     pendingFiles.value.push(file);
+    fileList.value = pendingFiles.value;
   }
+  console.log(fileList.value);
 
-  emit('handleChange', file, fileList);
+  emit('handleChange', file, filelist);
 };
 
 // 删除文件
@@ -332,11 +346,6 @@ const uploadedSuccessfully = (res: any) => {
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }
-  // if (props.autoUpload && props.limit === fileList.value.length) {
-  //   fileUploadRef.value?.clearFiles();
-  //   fileList.value = [];
-  //   emit('update:modelValue', ''); // 同步到外部 v-model
-  // }
   props.onUploadSuccess?.(fileList.value, res);
 };
 
@@ -400,6 +409,11 @@ const submitUpload = async () => {
   if (!pendingFiles.value.length) {
     return 'noFile';
   }
+  const validFiles = pendingFiles.value.filter((f: any) => validateFile(f.raw || f));
+  if (!validFiles.length) {
+    proxy?.$modal.msgError('没有符合条件的文件可上传');
+    return;
+  }
   try {
     proxy?.$modal.loading('正在上传文件，请稍候...');
     const formData = new FormData();
diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue
index bb795fe..6726936 100644
--- a/src/views/design/Professional/index.vue
+++ b/src/views/design/Professional/index.vue
@@ -187,7 +187,7 @@ const handleDownload = (row) => {
     {
       id: row.id
     },
-    `互提资料.zip`
+    `互提资料.docx`
   );
 };
 const handleViewFile = (row) => {
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index 88cca58..e6fa601 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -176,7 +176,7 @@
 <script setup name="DataCollectionForm" lang="ts">
 import { ref, reactive, computed, onMounted, onUnmounted, watch, getCurrentInstance } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
-import { ElMessage, ElLoading } from 'element-plus';
+import { ElMessage, ElLoading, FormRules } from 'element-plus';
 import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index ebeda55..f4918d9 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -46,6 +46,9 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="success"
@@ -213,6 +216,28 @@
         </span>
       </template>
     </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-form-item>
+      <template #footer>
+        <span>
+          <el-button @click="templateVisbile = false">取消</el-button>
+          <el-button type="primary" @click="setTemp">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -225,7 +250,8 @@ import {
   updateFormalitiesAreConsolidated,
   listFormalitiesAnnex,
   delFormalitiesAnnex,
-  editStatus
+  editStatus,
+  getTemplateTreeList
 } from '@/api/formalities/formalitiesAreConsolidated';
 import {
   FormalitiesAreConsolidatedVO,
@@ -272,6 +298,8 @@ const statusForm = ref({
   projectId: currentProject.value?.id,
   processingStatus: undefined
 });
+const templateVisbile = ref(false);
+const tempTreeList = ref([]);
 
 const initFormData: FormalitiesAreConsolidatedForm = {
   id: undefined,
@@ -307,6 +335,8 @@ const data = reactive<PageData<FormalitiesAreConsolidatedForm, FormalitiesAreCon
 
 const { queryParams, form, rules } = toRefs(data);
 
+const tempValue = ref(null);
+
 /** 查询合规性手续合账列表 */
 const getList = async () => {
   loading.value = true;
@@ -367,6 +397,39 @@ const handleUpdate = async (row?: FormalitiesAreConsolidatedVO) => {
   dialog.title = '修改合规性手续合账';
 };
 
+//新增
+const handleAdd = async () => {
+  tempValue.value = null;
+  const res = await getTemplateTreeList({ projectId: currentProject.value.id });
+  tempTreeList.value = res.data;
+  templateVisbile.value = true;
+};
+
+// 选择模板
+const setTemp = async () => {
+  // form.value.formalitiesPid = tempValue.value[tempValue.value.length - 1];
+  if (!tempValue.value || !tempValue.value.length) {
+    proxy?.$modal.msgWarning('请选择模板');
+    return;
+  }
+  let addBusFormalitiesAreConsolidatedBos = tempValue.value.map((item) => {
+    return {
+      formalitiesId: item[1],
+      formalitiesPid: item[0]
+    };
+  });
+  const data = {
+    addBusFormalitiesAreConsolidatedBos,
+    projectId: currentProject.value.id
+  };
+  const res = await addFormalitiesAreConsolidated(data);
+  if (res.code == 200) {
+    proxy?.$modal.msgSuccess('操作成功');
+    templateVisbile.value = false;
+    getList();
+  }
+};
+
 /** 上传按钮操作 */
 const handleUpload = (row) => {
   form.value.id = row.id;
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index bac3df0..8d8bdb1 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -6,20 +6,44 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0"><el-button type="primary"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']" size="default" @click="handleAdd"
-                  icon="FolderAdd" plain>新增</el-button></el-col>
-              <el-col :span="1.5" :offset="0"><el-button type="danger" size="default"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']" @click="handleDeleteBatch"
-                  icon="FolderDelete" plain>删除</el-button></el-col>
+              <el-col :span="1.5" :offset="0"
+                ><el-button
+                  type="primary"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
+                  size="default"
+                  @click="handleAdd"
+                  icon="FolderAdd"
+                  plain
+                  >新增</el-button
+                ></el-col
+              >
+              <el-col :span="1.5" :offset="0"
+                ><el-button
+                  type="danger"
+                  size="default"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
+                  @click="handleDeleteBatch"
+                  :disabled="form.mrpBaseBo.status != 'draft'"
+                  icon="FolderDelete"
+                  plain
+                  >删除</el-button
+                ></el-col
+              >
             </el-row>
           </template>
 
-          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search"
-            clearable />
-          <el-tree ref="batchTreeRef" class="mt-2" node-key="id" :data="batchOptions"
-            :props="{ label: 'planCode', children: 'children' }" :expand-on-click-node="false" highlight-current
-            default-expand-all @node-click="handleNodeClick">
+          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
+          <el-tree
+            ref="batchTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="batchOptions"
+            :props="{ label: 'planCode', children: 'children' }"
+            :expand-on-click-node="false"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          >
             <template #default="{ node, data }">
               <div class="custom-tree-node">
                 {{ node.label }}
@@ -27,8 +51,14 @@
               </div>
             </template>
           </el-tree>
-          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.batchData.pageNum"
-            v-model:limit="queryParams.batchData.pageSize" @pagination="getList" layout="prev, pager, next,jumper" />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.batchData.pageNum"
+            v-model:limit="queryParams.batchData.pageSize"
+            @pagination="getList"
+            layout="prev, pager, next,jumper"
+          />
         </el-card>
       </el-col>
       <el-col :span="19">
@@ -36,12 +66,14 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']">修改</el-button>
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
+                  >修改</el-button
+                >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']">审核</el-button>
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
+                  >审核</el-button
+                >
               </el-col>
 
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -59,8 +91,13 @@
             <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
             <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
-          <pagination v-show="mainTotal > 0" :total="mainTotal" v-model:page="queryParams.mainData.pageNum"
-            v-model:limit="queryParams.mainData.pageSize" @pagination="getMainList" />
+          <pagination
+            v-show="mainTotal > 0"
+            :total="mainTotal"
+            v-model:page="queryParams.mainData.pageNum"
+            v-model:limit="queryParams.mainData.pageSize"
+            @pagination="getMainList"
+          />
         </el-card>
       </el-col>
     </el-row>
@@ -77,8 +114,7 @@
           </el-col>
           <el-col :span="8" :offset="0">
             <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择编制日期" />
+              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
             </el-form-item>
           </el-col>
           <el-col :span="8" :offset="0">
@@ -91,20 +127,20 @@
         <el-divider>主要信息</el-divider>
         <el-table :data="form.planList">
           <el-table-column prop="name" align="center" label="版本号 " width="150">
-
             <template #default="scope">
-              <el-select v-model="scope.row.versions" placeholder="请选择"
-                @change="(val) => selectNameVersion(val, scope.row)">
-
-                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions"
-                  :value="item.versions" />
+              <el-select v-model="scope.row.versions" placeholder="请选择" @change="(val) => selectNameVersion(val, scope.row)">
+                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions" :value="item.versions" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column prop="name" align="center" label="物资名称">
             <template #default="scope">
-              <el-select :disabled="!scope.row.versions" v-model="scope.row.suppliespriceId" placeholder="请选择"
-                @change="(val) => selectName(val, scope.row)">
+              <el-select
+                :disabled="!scope.row.versions"
+                v-model="scope.row.suppliespriceId"
+                placeholder="请选择"
+                @change="(val) => selectName(val, scope.row)"
+              >
                 <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </template>
@@ -125,14 +161,16 @@
             </template>
           </el-table-column>
           <el-table-column prop="qs" align="center" label="质量标准" width="150">
+            <template #header> <span class="text-red">*</span> 质量标准 </template>
             <template #default="scope">
               <el-input v-model="scope.row.qs" placeholder="请输入质量标准" />
             </template>
           </el-table-column>
           <el-table-column prop="arrivalTime" align="center" label="需求到货时间">
+            <template #header> <span class="text-red">*</span> 需求到货时间 </template>
+
             <template #default="scope">
-              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择"
-                style="width: 140px" />
+              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
             </template>
           </el-table-column>
           <el-table-column prop="remark" align="center" label="备注" width="150">
@@ -165,8 +203,10 @@ import {
   listBatch,
   getBatch,
   delBatch,
-  listSelectCailiaoshebei, obtainTheVersion,
-  getDictList, coryEngineeringList
+  listSelectCailiaoshebei,
+  obtainTheVersion,
+  getDictList,
+  coryEngineeringList
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -392,11 +432,11 @@ const handleUpdata = () => {
 /** 提交数据 */
 const submitTransferForm = async () => {
   const result = validateAndClean(form.value.planList);
-  console.log('🚀 ~ submitTransferForm ~ form.value.planList:', form.value.planList);
   if (!result.valid) {
-    proxy?.$modal.msgError('验证失败,主要信息存在部分字段缺失的数据项');
+    proxy?.$modal.msgError(result.message);
     return;
   }
+
   cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
@@ -408,7 +448,6 @@ const submitTransferForm = async () => {
     }
   });
 };
-
 /** 删除批次 */
 const handleDeleteBatch = async () => {
   const _ids = batchTreeRef.value.getCurrentNode()?.id;
@@ -419,29 +458,49 @@ const handleDeleteBatch = async () => {
   await getList();
 };
 
-//检测主要信息填写状况
-function validateAndClean(arr) {
+interface ValidateResult {
+  valid: boolean;
+  data: any[];
+  errors: { index: number; field: string; message: string }[];
+}
+
+function validateAndClean(arr: any[]) {
   // 过滤掉全空的数据项
   const cleanedArr = arr.filter((item) => !Object.values(item).every((v) => v === '' || v == null));
-  let hasFullItem = false; // 是否有一条全填数据
 
-  for (const item of cleanedArr) {
+  let hasFullItem = false; // 是否有至少一条全填数据
+
+  for (let idx = 0; idx < cleanedArr.length; idx++) {
+    const item = cleanedArr[idx];
     const keys = Object.keys(item).filter((k) => k !== 'remark' && k !== 'id');
+
     const allFilled = keys.every((k) => item[k] !== '' && item[k] != null);
-    if (allFilled) {
-      hasFullItem = true; // 有一条全填
-    }
     const allEmpty = Object.values(item).every((v) => v === '' || v == null);
-    // 如果不是全填，也不是全空（部分填） → 直接返回失败
+
+    // 单独检查 qs 和 arrivalTime
+    if (!item.qs) {
+      return { valid: false, message: `第${idx + 1}行：质量标准不能为空`, data: cleanedArr };
+    }
+    if (!item.arrivalTime) {
+      return { valid: false, message: `第${idx + 1}行：需求到货时间不能为空`, data: cleanedArr };
+    }
+
+    // 检查其他字段是否部分填
     if (!allFilled && !allEmpty) {
-      return { valid: false, data: cleanedArr };
+      return { valid: false, message: `第${idx + 1}行：主要信息存在部分字段缺失的数据项`, data: cleanedArr };
+    }
+
+    if (allFilled) {
+      hasFullItem = true;
     }
   }
-  // 如果没有至少一条全填，返回失败
+
+  // 检查是否至少有一条完整的数据
   if (!hasFullItem) {
-    return { valid: false, data: cleanedArr };
+    return { valid: false, message: '至少需要一条完整的数据', data: cleanedArr };
   }
-  return { valid: true, data: cleanedArr };
+
+  return { valid: true, message: '', data: cleanedArr };
 }
 
 /** 审核按钮操作 */
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index bf61f0e..cb88092 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -268,6 +268,7 @@ import { listContractor } from '@/api/project/contractor';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
 import logisticsDetail from './comm/logisticsDetail.vue';
+import { FormRules } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@@ -349,7 +350,7 @@ const data = reactive({
     status: undefined,
     params: {}
   },
-  rules: {
+  rules: <FormRules>{
     id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
     docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }],
     planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }],
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 224b281..11177c0 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -123,27 +123,27 @@
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="计量方式" prop="unitType" v-if="!form.id">
+        <el-form-item label="计量方式" prop="unitType" v-if="!form.workType">
           <el-select v-model="form.unitType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="类别名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入类别名称" :disabled="form.id != null" />
+          <el-input v-model="form.name" placeholder="请输入类别名称" />
         </el-form-item>
-        <el-form-item label="计量单位" prop="unit">
+        <el-form-item label="计量单位" prop="unit" v-if="form.unitType != '0'">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
-        <el-form-item label="综合单价(业主)" prop="ownerPrice">
+        <el-form-item label="综合单价(业主)" prop="ownerPrice" v-if="form.unitType != '0'">
           <el-input v-model="form.ownerPrice" placeholder="请输入综合单价(业主)" />
         </el-form-item>
-        <el-form-item label="综合单价(分包)" prop="constructionPrice">
+        <el-form-item label="综合单价(分包)" prop="constructionPrice" v-if="form.unitType != '0'">
           <el-input v-model="form.constructionPrice" placeholder="请输入综合单价(分包)" />
         </el-form-item>
-        <el-form-item label="数量" prop="total" v-if="isDisabled">
+        <el-form-item label="数量" prop="total" v-if="!form.workType && form.unitType != '0'">
           <el-input v-model="form.total" placeholder="请输入数量" />
         </el-form-item>
-        <el-form-item label="关联数据" prop="workType" v-if="!form.id">
+        <el-form-item label="关联数据" prop="workType" v-if="!form.id && form.unitType != '0'">
           <el-select v-model="form.workType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -328,10 +328,7 @@ const cancel = () => {
 const reset = () => {
   const projectId = form.value.projectId;
   const matrixId = form.value.matrixId;
-
   form.value = { ...initFormData, projectId, matrixId };
-
-  isDisabled.value = false;
   progressCategoryFormRef.value?.resetFields();
 };
 /** 级联选择器改变事件 */
@@ -381,12 +378,8 @@ const toggleExpandAll = (data: ProgressCategoryVO[], status: boolean) => {
 };
 
 /** 修改按钮操作 */
-const isDisabled = ref<boolean>(false);
 const handleUpdate = async (row: ProgressCategoryVO) => {
   reset();
-  if (!row.unitType) {
-    isDisabled.value = true;
-  }
   await getTreeselect();
   if (row != null) {
     form.value.parentId = row.parentId;
diff --git a/src/views/progress/progressCategorySystemTemplate/index.vue b/src/views/progress/progressCategorySystemTemplate/index.vue
index 12900fa..12bcd3b 100644
--- a/src/views/progress/progressCategorySystemTemplate/index.vue
+++ b/src/views/progress/progressCategorySystemTemplate/index.vue
@@ -20,60 +20,65 @@
         </el-card>
       </div>
     </transition>
+    <el-tabs type="border-card">
+      <el-tab-pane label="User"></el-tab-pane>
+      <el-tab-pane label="Config"></el-tab-pane>
+      <el-card shadow="never">
+        <template #header>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:progressCategoryTemplate:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </template>
+
+        <el-table
+          ref="progressCategoryTemplateTableRef"
+          v-loading="loading"
+          :data="progressCategoryTemplateList"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+          <el-table-column label="类别名称" prop="name" />
+          <el-table-column label="计量方式" align="center" prop="unitType" width="100">
+            <template #default="{ row }">
+              <dict-tag :options="progress_unit_type" :value="row.unitType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="关联数据" align="center" prop="workType">
+            <template #default="{ row }">
+              <dict-tag :options="progress_work_type" :value="row.workType" />
+            </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">
+              <el-tooltip content="修改" placement="top">
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:edit']" />
+              </el-tooltip>
+              <el-tooltip content="新增" placement="top">
+                <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:add']" />
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top">
+                <el-button
+                  link
+                  type="primary"
+                  icon="Delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['progress:progressCategoryTemplate:remove']"
+                />
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-tabs>
 
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:progressCategoryTemplate:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-      <el-table
-        ref="progressCategoryTemplateTableRef"
-        v-loading="loading"
-        :data="progressCategoryTemplateList"
-        row-key="id"
-        :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-        <el-table-column label="类别名称" prop="name" />
-        <el-table-column label="计量方式" align="center" prop="unitType" width="100">
-          <template #default="{ row }">
-            <dict-tag :options="progress_unit_type" :value="row.unitType" />
-          </template>
-        </el-table-column>
-        <el-table-column label="关联数据" align="center" prop="workType">
-          <template #default="{ row }">
-            <dict-tag :options="progress_work_type" :value="row.workType" />
-          </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">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:edit']" />
-            </el-tooltip>
-            <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:progressCategoryTemplate:add']" />
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['progress:progressCategoryTemplate:remove']"
-              />
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
     <!-- 添加或修改进度类别模版对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="progressCategoryTemplateFormRef" :model="form" :rules="rules" label-width="80px">
@@ -124,6 +129,7 @@ import {
   addProgressCategoryTemplate,
   delProgressCategoryTemplate,
   getProgressCategoryTemplate,
+  getTabList,
   listProgressCategoryTemplate,
   updateProgressCategoryTemplate
 } from '@/api/progress/progressCategoryTemplate';
@@ -306,5 +312,8 @@ const handleDelete = async (row: ProgressCategoryTemplateVO) => {
 
 onMounted(() => {
   getList();
+  getTabList().then((res) => {
+    console.log('tabList', res.data);
+  });
 });
 </script>