新增自定义节点

src/api/modules/data-fill/wbs.js

@@ -1,22 +1,22 @@
-import { HcApi } from "../../request/index";
-import { getHeader } from "hc-vue3-ui";
+import { HcApi } from '../../request/index'
+import { getHeader } from 'hc-vue3-ui'
 
 export default {
     //新增或删除 合同段划分树首件关联
     async wbsTreeFirstSave(form) {
         return HcApi({
-            url: "/api/blade-business/treeContractFirst/saveOrDelete",
-            method: "post",
+            url: '/api/blade-business/treeContractFirst/saveOrDelete',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //修改树节点
     async wbsTreeUpdateNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/updateContractNodeParameter",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/updateContractNodeParameter',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //导图结构树节点查询
     // async queryMappingStructureTree(form) {
@@ -28,434 +28,442 @@ export default {
     // },
     async queryMappingStructureTree(form) {
         return HcApi({
-            url: "/api/blade-user/wbs/lazyQueryContractWbsTree",
-            method: "get",
+            url: '/api/blade-user/wbs/lazyQueryContractWbsTree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存或修改节点上传的图纸记录
     async saveContractTreeDrawings(form) {
         return HcApi({
-            url: "/api/blade-business/contractTreeDrawings/saveContractTreeDrawings",
-            method: "post",
+            url: '/api/blade-business/contractTreeDrawings/saveContractTreeDrawings',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //删除节点
     async removeContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/removeContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/removeContractTreeNode',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询当前节点下所有元素表信息
     async searchNodeAllTable(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/search-node-tables",
-            method: "get",
+            url: '/api/blade-manager/wbsTreeContract/search-node-tables',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //清表生成html
     async getExcelHtml(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-excel-html_buss",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-excel-html_buss',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取按键切换输入框的key列表
     async getHtmlBussCols(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-html-buss-cols",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-html-buss-cols',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //填报页面数据保存
     async saveExcelBussData(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/save_buss_data",
-            method: "post",
+            url: '/api/blade-manager/exceltab/save_buss_data',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //懒加载项目级工程划分树
     async queryWbsTreePrivateByProjectIdAndId(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryWbsTreePrivateByProjectIdAndId",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryWbsTreePrivateByProjectIdAndId',
+            method: 'post',
             params: form,
-        });
+        })
     },
     async queryWbsTreeContractByContractIdAndId(form) {
         return HcApi({
-            url: "/api/blade-manager/contractInfo/add-node-tree",
-            method: "get",
+            url: '/api/blade-manager/contractInfo/add-node-tree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //新增自定义节点项目全加载树
     async queryPriateTree(form) {
         return HcApi({
-            url: "/api/blade-user/wbs/private/tree",
-            method: "get",
+            url: '/api/blade-user/wbs/private/tree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //新增节点及其子节点
     async saveContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/saveContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/saveContractTreeNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //新增自定义节点
     async saveCustomAddContractNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/customAddContractNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/customAddContractNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //复制节点
     async copyContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/copyContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/copyContractTreeNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //自定义排序
     async diySortTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/diySort",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/diySort',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //获取表单数据
     async getBussDataInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-dataInfo",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-dataInfo',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //查询节点状态
     async queryNodeStatus(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询监理节点状态
     async queryNodeStatusJl(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-jl",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-jl',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询首件节点状态
     async queryNodeStatusSj(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-sj",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-sj',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询试验上报按钮状态
     async queryNodeStatusTrial(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-trial",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-trial',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //单个废除
     async abolishOne(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/abolishOne",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/abolishOne',
+            method: 'post',
             params: form,
-        });
+        })
     },
 
     //单个废除-首件
     async abolishOneSJ(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/abolishOne-sj",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/abolishOne-sj',
+            method: 'post',
             params: form,
-        });
+        })
     },
 
     //隐藏表单
     async showBussTab(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/show-buss-tab",
-            method: "get",
+            url: '/api/blade-manager/exceltab/show-buss-tab',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //单表pdf预览
     async getBussPdfInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-pdfInfo",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-pdfInfo',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //表单复制
     async copeBussTab(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/cope-buss-tab",
-            method: "get",
+            url: '/api/blade-manager/exceltab/cope-buss-tab',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //多表预览
     async getBussPdfs(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-pdfs",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-pdfs',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取附件列表
     async getBussFileList(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/get-buss-fileList",
-            method: "get",
+            url: '/api/blade-manager/tablefile/get-buss-fileList',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取附件添加列表
     async selectTableFileListByTen(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/selectTableFileListByTen",
-            method: "get",
+            url: '/api/blade-manager/tablefile/selectTableFileListByTen',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //逻辑附件添加
     async delTabById(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/delTabById",
-            method: "post",
+            url: '/api/blade-manager/tablefile/delTabById',
+            method: 'post',
             params: form,
-        });
+        })
     },
     async getBussFileList1(form) {
         return HcApi({
-            url: "/api/blade-business/detection/self/file-list",
-            method: "get",
+            url: '/api/blade-business/detection/self/file-list',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //逻辑删除
     async removeBussFile(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/remove",
-            method: "post",
+            url: '/api/blade-manager/tablefile/remove',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //删除试验文件
     async removeBussFile1(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/remove-trial",
-            method: "post",
+            url: '/api/blade-manager/tablefile/remove-trial',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //用户端删除复制信息表
     async removeBussTabInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/remove-buss-tabInfo",
-            method: "post",
+            url: '/api/blade-manager/exceltab/remove-buss-tabInfo',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //复制节点填报数据
     async copyContractNodeSubmitBusinessData(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/copyContractNodeSubmitBusinessData",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/copyContractNodeSubmitBusinessData',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //输入框查询合同段树
     async searchContractTree(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/searchContractTree",
-            method: "get",
+            url: '/api/blade-business/informationWriteQuery/searchContractTree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //设计值计算
     async queryFormulaRange(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/range",
-            method: "get",
+            url: '/api/blade-manager/formula/range',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取文件题名
     async queryDocumentTitle(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryDocumentTitle",
-            method: "get",
+            url: '/api/blade-business/informationWriteQuery/queryDocumentTitle',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //查询公式参数面板
     async queryPanel(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/panel",
-            method: "get",
+            url: '/api/blade-manager/formula/panel',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存公式参数
 
     async savePanel(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/panel-save",
-            method: "post",
+            url: '/api/blade-manager/formula/panel-save',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //同步质检资料
     async syncTbadata(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/sync-tab-data",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/sync-tab-data',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //获取表单详情
     async getWbsContractById(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/getWbsContractById",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/getWbsContractById',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询当前节点下所有表的附件信息
     async tablesAndFile(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/search-node-tablesAndFile",
-            method: "get",
+            url: '/api/blade-manager/wbsTreeContract/search-node-tablesAndFile',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //清除表单信息
     async rmTabdataInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/rm-tabdata-info",
-            method: "get",
+            url: '/api/blade-manager/exceltab/rm-tabdata-info',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //下载模板
     async downloadExcel(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/download-excel",
-            method: "get",
-            responseType: "blob",
+            url: '/api/blade-manager/wbsTreeContract/download-excel',
+            method: 'get',
+            responseType: 'blob',
             params: form,
-        });
+        })
     },
     //导入模板
     async importExcel(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/import-excel",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/import-excel',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //计算含水率
     async calculateWater(form) {
         return HcApi({
-            url: "/api/blade-manager/mixProportion/calculateWater",
-            method: "post",
+            url: '/api/blade-manager/mixProportion/calculateWater',
+            method: 'post',
             data: form,
-        });
+        })
     },
 
     //批量保存
     async save_nodeId(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/save_nodeId",
-            method: "post",
+            url: '/api/blade-manager/exceltab/save_nodeId',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //批量隐藏节点
     async updateNodeStates(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/updateNodeStates",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/updateNodeStates',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //获取图纸
     async getTreeDrawings(form) {
         return HcApi({
-            url: "/api/blade-business/contractTreeDrawings/getTreeDrawings",
-            method: "get",
+            url: '/api/blade-business/contractTreeDrawings/getTreeDrawings',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存用户填报历史
     async saveUserHistory(form) {
         return HcApi({
-            url: "/api/blade-manager/userHistory/saveUserHistory",
-            method: "post",
+            url: '/api/blade-manager/userHistory/saveUserHistory',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //回到上次填报历史
     async getUserHistory(form) {
         return HcApi({
-            url: "/api/blade-manager/userHistory/getUserHistory",
-            method: "get",
+            url: '/api/blade-manager/userHistory/getUserHistory',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //评定汇总
     async evaluateTotal(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/evaluate",
-            method: "get",
+            url: '/api/blade-manager/formula/evaluate',
+            method: 'get',
             params: form,
-        });
+        })
     },
     async evaluateTotalNew(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/newEvaluate",
-            method: "get",
+            url: '/api/blade-manager/formula/newEvaluate',
+            method: 'get',
             params: form,
-        });
+        })
     },
     async evaluateIsWater(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/isWaterProject",
-            method: "get",
+            url: '/api/blade-manager/formula/isWaterProject',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //排序
     async formTableSort(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/table-sort",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/table-sort',
+            method: 'post',
             data: form,
-        });
+        })
     },
-};
+    //删除节点前
+    async removeContractTreeNodeJudge(form) {
+        return HcApi({
+            url: '/api/blade-business/informationWriteQuery/removeContractTreeNodeJudge',
+            method: 'post',
+            params: form,
+        })
+    },
+}

src/views/data-fill/wbs.vue

@@ -29,15 +29,16 @@
                 </div>
                 <div class="hc-tree-box">
                     <div class="hc-tree-back-to">
-                        <el-link type="primary" @click="gobackHistory"
-                            >回到上一次填报部位</el-link
-                        >
+                        <el-link type="primary" @click="gobackHistory">
+                            回到上一次填报部位
+                        </el-link>
                         <el-link
                             type="warning"
                             class="ml-4"
                             @click="wbsMapTypeTab"
-                            >导图结构填报</el-link
                         >
+                            导图结构填报
+                        </el-link>
                         <HcTooltip keys="data-fill-wbs-hide-btn">
                             <el-button
                                 class="data-fill-wbs-hide-btn ml-6"
@@ -45,8 +46,9 @@
                                 keys="data-fill-wbs-hide-btn"
                                 :loading="hideSaveLoading"
                                 @click="hideTreeNode"
-                                >隐藏</el-button
                             >
+                                隐藏
+                            </el-button>
                         </HcTooltip>
                     </div>
                     <div class="hc-search-tree-val">
@@ -149,8 +151,9 @@
                                 hc-btn
                                 type="primary"
                                 @click="sortFormClick"
-                                >排序</el-button
                             >
+                                排序
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip keys="wbs_views_node_save_btn">
                             <el-button
@@ -158,8 +161,9 @@
                                 hc-btn
                                 type="primary"
                                 @click="NodeSaveClick"
-                                >辅助保存</el-button
                             >
+                                辅助保存
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip keys="wbs_views_drawings">
                             <el-button
@@ -170,8 +174,9 @@
                                 hc-btn
                                 color="#e03997"
                                 @click="viewsDrawings"
-                                >图纸</el-button
                             >
+                                图纸
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip keys="wbs_preview">
                             <el-button
@@ -180,22 +185,25 @@
                                 hc-btn
                                 color="#A16222"
                                 @click="bussPdfsClick"
-                                >预览</el-button
                             >
+                                预览
+                            </el-button>
                         </HcTooltip>
                         <el-button
                             hc-btn
                             color="#A16222"
                             @click="attachmentModalShow"
-                            >查看附件</el-button
                         >
+                            查看附件
+                        </el-button>
                         <el-button
                             hc-btn
                             :disabled="isCanadd"
                             color="#567722"
                             @click="addFilelist"
-                            >上传附件</el-button
                         >
+                            上传附件
+                        </el-button>
                         <HcTooltip v-if="NodeStatus !== '3'" keys="wbs_report">
                             <el-button
                                 :disabled="
@@ -206,8 +214,9 @@
                                 color="#FF976A"
                                 style="color: white"
                                 @click="reportModalClick"
-                                >上报</el-button
                             >
+                                上报
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip v-if="NodeStatus === '3'" keys="wbs_abolish">
                             <el-button
@@ -216,8 +225,9 @@
                                 color="#FF976A"
                                 style="color: white"
                                 @click="abolishOneClick"
-                                >撤回上报流程</el-button
                             >
+                                撤回上报流程
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip keys="wbs_views_sync_data_btn">
                             <el-button
@@ -227,8 +237,9 @@
                                 style="color: white"
                                 :loading="syncdataloading"
                                 @click="syncdata"
-                                >同步质检资料</el-button
                             >
+                                同步质检资料
+                            </el-button>
                         </HcTooltip>
                         <HcTooltip v-if="NodeStatus !== '3'" keys="wbs_save">
                             <el-button
@@ -479,9 +490,9 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item
+                    v-if="formEditNodeModel.notExsitChild"
                     label="标准分类"
                     prop="className"
-                    v-if="formEditNodeModel.notExsitChild"
                 >
                     <el-select
                         v-model="formEditNodeModel.className"
@@ -497,9 +508,9 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item
-                    label="单元名称"
-                    prop="unitName"
                     v-if="formEditNodeModel.notExsitChild"
+                    label="单位名称"
+                    prop="unitName"
                 >
                     <el-select v-model="formEditNodeModel.unitName" block>
                         <el-option
@@ -510,32 +521,6 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-row :gutter="24" v-if="formEditNodeModel.nodeClass === 2">
-                    <el-col :span="12">
-                        <el-form-item prop="unitNum" label="单元个数">
-                            <el-input-number
-                                v-model="formEditNodeModel.unitNum"
-                                placeholder="请输入单元个数"
-                                :controls="false"
-                                :min="0"
-                                :precision="0"
-                                class="w-100"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item prop="excellentNum" label="优良个数">
-                            <el-input-number
-                                v-model="formEditNodeModel.excellentNum"
-                                placeholder="请输入优良个数"
-                                :controls="false"
-                                :min="0"
-                                :precision="0"
-                                class="w-100"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
                 <el-form-item label="划分编号">
                     <el-input
                         v-model="formEditNodeModel.partitionCode"
@@ -736,8 +721,9 @@
                                         plain
                                         type="danger"
                                         @click="copyNodeTableDel($index)"
-                                        >删除</el-button
                                     >
+                                        删除
+                                    </el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -757,16 +743,18 @@
                                 size="large"
                                 type="primary"
                                 @click="copyNodeTabChange(item?.key)"
-                                >{{ item.name }}</el-button
                             >
+                                {{ item.name }}
+                            </el-button>
                             <el-button
                                 v-else
                                 bg
                                 size="large"
                                 text
                                 @click="copyNodeTabChange(item?.key)"
-                                >{{ item.name }}</el-button
                             >
+                                {{ item.name }}
+                            </el-button>
                         </template>
                     </div>
                     <div class="right">
@@ -774,15 +762,17 @@
                             :disabled="copyNodeLoading"
                             size="large"
                             @click="copyNodeModal = false"
-                            >取消</el-button
                         >
+                            取消
+                        </el-button>
                         <el-button
                             :loading="copyNodeLoading"
                             hc-btn
                             type="primary"
                             @click="copyNodeClick"
-                            >提交</el-button
                         >
+                            提交
+                        </el-button>
                     </div>
                 </div>
             </template>
@@ -829,22 +819,23 @@
                         <div class="mr-4">选中方式:</div>
                         <el-radio-group v-model="addTreeNodeType">
                             <el-radio label="1">当前及子节点</el-radio>
-                            <el-radio class="ml-4" label="2"
-                                >仅当前节点</el-radio
-                            >
+                            <el-radio class="ml-4" label="2">
+                                仅当前节点
+                            </el-radio>
                         </el-radio-group>
                     </div>
                     <div class="right">
-                        <el-button size="large" @click="addNodeModal = false"
-                            >取消</el-button
-                        >
+                        <el-button size="large" @click="addNodeModal = false">
+                            取消
+                        </el-button>
                         <el-button
                             :loading="addNodeLoading"
                             hc-btn
                             type="primary"
                             @click="addNodeClick"
-                            >提交</el-button
                         >
+                            提交
+                        </el-button>
                     </div>
                 </div>
             </template>
@@ -859,40 +850,13 @@
             widths="720px"
             @save="addNodeClickCur"
         >
-            <!-- <div>节点名称：</div>
+            <div>节点名称：</div>
             <el-input
                 v-model="nodeNameinput"
                 placeholder="请输入节点名称"
                 size="large"
                 style="margin-top: 15px"
-            /> -->
-
-            <el-form
-                ref="formWaterNodeRef"
-                :model="formWaterNodeModel"
-                :rules="formWaterNodeRules"
-                label-width="auto"
-                size="large"
-                label-position="left"
-            >
-                <el-form-item label="节点名称" prop="nodeName">
-                    <el-input
-                        v-model="formWaterNodeModel.nodeName"
-                        placeholder="请输入节点名称"
-                    />
-                </el-form-item>
-
-                <el-form-item label="节点类型" prop="nodeType">
-                    <el-select v-model="formWaterNodeModel.nodeType" block>
-                        <el-option
-                            v-for="item in nodeTypeData"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-            </el-form>
+            />
         </hc-new-dialog>
         <!-- 新增自定义节点-数字化文件 -->
         <hc-new-dialog
@@ -909,7 +873,6 @@
                 :rules="formDataNodeRules"
                 label-width="auto"
                 size="large"
-                label-position="left"
             >
                 <el-form-item label="节点名称" prop="nodeName">
                     <el-input
@@ -935,81 +898,51 @@
                     </el-radio-group>
                 </el-form-item>
 
-                <el-row :gutter="24">
-                    <el-col :span="12">
-                        <el-form-item
-                            label="标准分类"
-                            prop="className"
-                            v-if="formDataNodeModel.isClassifition === 1"
-                        >
-                            <el-select
-                                v-model="formDataNodeModel.className"
-                                block
-                                @change="changeStandType"
-                            >
-                                <el-option
-                                    v-for="item in standardTypeOptions"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            label="单元名称"
-                            prop="unitName"
-                            v-if="formDataNodeModel.isClassifition === 1"
-                        >
-                            <el-select
-                                v-model="formDataNodeModel.unitName"
-                                block
-                            >
-                                <el-option
-                                    v-for="item in unitNameOptions"
-                                    :key="item.value"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="24">
-                    <el-col :span="12">
-                        <el-form-item
-                            prop="unitNum"
-                            label="单元个数"
-                            v-if="formDataNodeModel.isClassifition === 1"
-                        >
-                            <el-input-number
-                                v-model="formDataNodeModel.unitNum"
-                                placeholder="请输入单元个数"
-                                :controls="false"
-                                :min="0"
-                                :precision="0"
-                                class="w-100"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item
-                            prop="excellentNum"
-                            label="优良个数"
-                            v-if="formDataNodeModel.isClassifition === 1"
-                        >
-                            <el-input-number
-                                v-model="formDataNodeModel.excellentNum"
-                                placeholder="请输入优良个数"
-                                :controls="false"
-                                :min="0"
-                                :precision="0"
-                                class="w-100"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+                <el-form-item
+                    v-if="formDataNodeModel.isClassifition === 1"
+                    label="标准分类"
+                    prop="className"
+                >
+                    <el-select
+                        v-model="formDataNodeModel.className"
+                        block
+                        @change="changeStandType"
+                    >
+                        <el-option
+                            v-for="item in standardTypeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item
+                    v-if="formDataNodeModel.isClassifition === 1"
+                    label="单位名称"
+                    prop="unitName"
+                >
+                    <el-select v-model="formDataNodeModel.unitName" block>
+                        <el-option
+                            v-for="item in unitNameOptions"
+                            :key="item.value"
+                            :label="item.dictValue"
+                            :value="item.dictKey"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item
+                    v-if="formDataNodeModel.isClassifition === 1"
+                    prop="excellentNum"
+                    label="优良个数"
+                >
+                    <el-input-number
+                        v-model="formDataNodeModel.excellentNum"
+                        placeholder="请输入优良个数"
+                        :controls="false"
+                        :min="0"
+                        :precision="0"
+                    />
+                </el-form-item>
             </el-form>
         </hc-new-dialog>
 
@@ -1205,8 +1138,9 @@
                     type="primary"
                     :loading="sortFormLoading"
                     @click="sortFormSubmit"
-                    >提交</el-button
                 >
+                    提交
+                </el-button>
             </template>
         </hc-new-dialog>
     </div>
@@ -1245,7 +1179,7 @@ import {
 import wbsApi from "~api/data-fill/wbs";
 import queryApi from "~api/data-fill/query";
 import Draggable from "vuedraggable";
-import { HcDelMsg, useClick } from "hc-vue3-ui";
+import { HcDelMsg, NewDelMsg, useClick } from "hc-vue3-ui";
 import HcUpload from "./components/HcUpload.vue";
 import { toPdfPage } from "~uti/btn-auth";
 import website from "~src/config";
@@ -1675,7 +1609,6 @@ const NodeTreeMenuClick = async ({ key, node, data }) => {
 };
 
 //处理菜单被点击数据
-
 const setTreeMenuDataClick = ({ key, node, data }) => {
     const tabKey = wbsTypeTabKey.value;
     if (key === "mark" || key === "cancel_mark") {
@@ -1691,7 +1624,6 @@ const setTreeMenuDataClick = ({ key, node, data }) => {
             form = { ...deepClone(data), parent: parent };
         }
         formEditNodeModel.value = form;
-        changeStandType(formEditNodeModel.value?.className);
         editNodeModal.value = true;
         //处理路径
         let pathArr = [];
@@ -1724,27 +1656,13 @@ const setTreeMenuDataClick = ({ key, node, data }) => {
         addTreeNodeId.value = data?.primaryKeyId;
         addTreeNodeOldId.value = data?.oldId;
         addNodeLoading.value = false;
-
-        formWaterNodeModel.value = {
-            nodeName: "",
-            nodeType: null,
-        };
+        nodeNameinput.value = "";
         addNodeModalCus.value = true;
     } else if (key === "add2") {
         addTreeNodeId.value = data?.primaryKeyId;
         addTreeNodeOldId.value = data?.oldId;
         addNodeLoading.value = false;
-
-        addNodeModalData.value = true;
-        formDataNodeModel.value = {
-            nodeName: "",
-            nodeType: null,
-            isClassifition: 0,
-            className: "",
-            unitName: "",
-            unitNum: 1,
-            excellentNum: 1,
-        };
+        nodeNameinput.value = "";
         if (data?.isClassifition === 1) {
             window.$message.warning("该节点下不能创建子节点");
             addNodeModalData.value = false;
@@ -1901,23 +1819,14 @@ const editNodeClick = async () => {
     if (validate) {
         //发起请求
         editNodeLoading.value = true;
-        const {
-            primaryKeyId,
-            title,
-            partitionCode,
-            className,
-            unitName,
-            excellentNum,
-            unitNum,
-        } = formEditNodeModel.value;
+        const { primaryKeyId, title, partitionCode, className, unitName } =
+            formEditNodeModel.value;
         const { error, code, msg } = await wbsApi.wbsTreeUpdateNode({
             nodeName: title || "",
             pKeyId: primaryKeyId || "",
             partitionCode: partitionCode || "",
             className,
             unitName,
-            unitNum,
-            excellentNum,
         });
         //处理数据
         editNodeLoading.value = false;
@@ -2221,39 +2130,21 @@ const isCustom = ref(null);
 //新增自定义节点
 const addNodeModalCus = ref(false);
 const addNodeLoadingCus = ref(false);
-//新增自定义节点（水利工程）
+const nodeNameinput = ref("");
 
-const formWaterNodeRef = ref(null);
-const formWaterNodeModel = ref({
-    nodeName: "",
-    nodeType: null,
-});
-const formWaterNodeRules = {
-    nodeName: {
-        required: true,
-        trigger: "blur",
-        message: "请输入节点名称",
-    },
-
-    nodeType: {
-        required: true,
-        trigger: "blur",
-        message: "请选择节点类型",
-    },
-};
 //新增自定义节点-数字化文件
 
 const addNodeModalData = ref(false);
 const addNodeLoadingData = ref(false);
 const formDataNodeRef = ref(null);
 const formDataNodeModel = ref({
-    nodeName: "",
+    title: "",
     nodeType: null,
     isClassifition: 0,
     className: "",
     unitName: "",
-    unitNum: 1,
-    excellentNum: 1,
+
+    excellentNum: 0,
 });
 const standardTypeOptions = ref([]);
 const getStandardTypeOptions = async () => {
@@ -2326,7 +2217,7 @@ const formDataNodeRules = {
     unitName: {
         required: true,
         trigger: "blur",
-        message: "请选择单元名称",
+        message: "请选择单位名称",
     },
 
     excellentNum: {
@@ -2334,18 +2225,11 @@ const formDataNodeRules = {
         trigger: "blur",
         message: "请输入优良个数",
     },
-    unitNum: {
-        required: true,
-        trigger: "blur",
-        message: "请输入单元个数",
-    },
 };
 
 const addNodeClickData = async () => {
-    const validate = await formValidate(formDataNodeRef.value);
-    if (!validate) return;
     //发起请求
-    addNodeLoadingData.value = true;
+    addNodeClickData.value = true;
     const { error, code, msg } = await wbsApi.saveCustomAddContractNode({
         nodeName: formDataNodeModel.value.nodeName,
         nodeType: formDataNodeModel.value?.nodeType || "",
@@ -2356,10 +2240,9 @@ const addNodeClickData = async () => {
         className: formDataNodeModel.value?.className || "",
         unitName: Number(formDataNodeModel.value?.unitName) || "",
         excellentNum: formDataNodeModel.value?.excellentNum || 0,
-        unitNum: formDataNodeModel.value?.unitNum || 0,
     });
     //判断状态
-    addNodeLoadingData.value = false;
+    addNodeClickData.value = false;
     if (!error && code === 200) {
         window?.$message?.success("新增成功");
         addNodeModalData.value = false;
@@ -2428,16 +2311,14 @@ const addNodeClick = async () => {
     }
 };
 const addNodeClickCur = async () => {
-    const validate = await formValidate(formWaterNodeRef.value);
-    if (!validate) return;
     //发起请求
     addNodeLoadingCus.value = true;
     const { error, code, msg } = await wbsApi.saveCustomAddContractNode({
-        nodeName: formWaterNodeModel.value.nodeName,
-        nodeType: formWaterNodeModel.value?.nodeType || "",
-        partitionCode: nodeDataInfo.value?.partitionCode || "",
-        nodeClass: 1, //1水利化工程，2数字化文件
+        nodeName: nodeNameinput.value,
+        nodeType: nodeDataInfo.value?.nodeType || "",
 
+        nodeClass: 1, //1水利化工程，2数字化文件
+        partitionCode: nodeDataInfo.value?.partitionCode || "",
         primaryKeyId: nodeDataInfo.value?.primaryKeyId || "",
     });
     //判断状态
@@ -2452,11 +2333,27 @@ const addNodeClickCur = async () => {
 };
 
 //删除节点
-const delModalClick = () => {
-    HcDelMsg(async (resolve) => {
-        await removeContractTreeNode();
-        resolve(); //关闭弹窗的回调
+const delModalClick = async () => {
+    const { code, msg } = await wbsApi.removeContractTreeNodeJudge({
+        ids: nodeDataInfo.value?.primaryKeyId || "",
     });
+    if (code === 200) {
+        HcDelMsg(async (resolve) => {
+            await removeContractTreeNode();
+            resolve(); //关闭弹窗的回调
+        });
+    } else {
+        window.$message.error(msg);
+        NewDelMsg(
+            {
+                text: msg,
+            },
+            async (resolve) => {
+                await removeContractTreeNode();
+                resolve(); //关闭弹窗的回调
+            }
+        );
+    }
 };
 
 const removeContractTreeNode = async () => {