Merge remote-tracking branch 'origin/master'

src/views/data-fill/wbs.vue

@@ -478,10 +478,10 @@
                         />
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item
+                <el-form-item
                     label="标准分类"
                     prop="className"
-                    v-if="formEditNodeModel.parentId !== 0"
+                    v-if="formEditNodeModel.notExsitChild"
                 >
                     <el-select
                         v-model="formEditNodeModel.className"
@@ -495,11 +495,11 @@
                             :value="item.value"
                         />
                     </el-select>
-                </el-form-item> -->
-                <!-- <el-form-item
+                </el-form-item>
+                <el-form-item
                     label="单位名称"
                     prop="unitName"
-                    v-if="formEditNodeModel.parentId !== 0"
+                    v-if="formEditNodeModel.notExsitChild"
                 >
                     <el-select v-model="formEditNodeModel.unitName" block>
                         <el-option
@@ -509,7 +509,7 @@
                             :value="item.dictKey"
                         />
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="划分编号">
                     <el-input
                         v-model="formEditNodeModel.partitionCode"
@@ -857,9 +857,9 @@
                 label-width="auto"
                 size="large"
             >
-                <el-form-item label="节点名称" prop="title">
+                <el-form-item label="节点名称" prop="nodeName">
                     <el-input
-                        v-model="formDataNodeModel.title"
+                        v-model="formDataNodeModel.nodeName"
                         placeholder="请输入节点名称"
                     />
                 </el-form-item>
@@ -874,8 +874,8 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="是否含单元评定" prop="isClassifcation">
-                    <el-radio-group v-model="formDataNodeModel.isClassifcation">
+                <el-form-item label="是否含单元评定" prop="isClassifition">
+                    <el-radio-group v-model="formDataNodeModel.isClassifition">
                         <el-radio :value="1">是</el-radio>
                         <el-radio :value="0">否</el-radio>
                     </el-radio-group>
@@ -884,7 +884,7 @@
                 <el-form-item
                     label="标准分类"
                     prop="className"
-                    v-if="formDataNodeModel.isClassifcation === 1"
+                    v-if="formDataNodeModel.isClassifition === 1"
                 >
                     <el-select
                         v-model="formDataNodeModel.className"
@@ -902,7 +902,7 @@
                 <el-form-item
                     label="单位名称"
                     prop="unitName"
-                    v-if="formDataNodeModel.isClassifcation === 1"
+                    v-if="formDataNodeModel.isClassifition === 1"
                 >
                     <el-select v-model="formDataNodeModel.unitName" block>
                         <el-option
@@ -916,7 +916,7 @@
                 <el-form-item
                     prop="excellentNum"
                     label="优良个数"
-                    v-if="formDataNodeModel.isClassifcation === 1"
+                    v-if="formDataNodeModel.isClassifition === 1"
                 >
                     <el-input-number
                         v-model="formDataNodeModel.excellentNum"
@@ -1380,11 +1380,11 @@ const setElTreeMenu = (contractType) => {
                 label: "自定义节点（水利工程）",
                 key: "add1",
             });
-            // newArr.push({
-            //     icon: "add-circle",
-            //     label: "自定义节点（数字化工程）",
-            //     key: "add2",
-            // });
+            newArr.push({
+                icon: "add-circle",
+                label: "自定义节点（数字化文件）",
+                key: "add2",
+            });
         }
         if (HcIsButton("wbs_tree_edit")) {
             newArr.push({ icon: "draft", label: "编辑节点", key: "edit" });
@@ -1428,11 +1428,11 @@ const setElTreeMenu = (contractType) => {
                 label: "自定义节点（水利工程）",
                 key: "add1",
             });
-            // newArr.push({
-            //     icon: "add-circle",
-            //     label: "自定义节点（数字化文件）",
-            //     key: "add2",
-            // });
+            newArr.push({
+                icon: "add-circle",
+                label: "自定义节点（数字化文件）",
+                key: "add2",
+            });
         }
         if (HcIsButton("wbs_tree_copy")) {
             newArr.push({
@@ -1591,6 +1591,7 @@ const NodeTreeMenuClick = async ({ key, node, data }) => {
 };
 
 //处理菜单被点击数据
+
 const setTreeMenuDataClick = ({ key, node, data }) => {
     const tabKey = wbsTypeTabKey.value;
     if (key === "mark" || key === "cancel_mark") {
@@ -1645,7 +1646,11 @@ const setTreeMenuDataClick = ({ key, node, data }) => {
         addTreeNodeOldId.value = data?.oldId;
         addNodeLoading.value = false;
         nodeNameinput.value = "";
-        addNodeModalData.value = true;
+        if (data?.isClassifition === 1) {
+            window.$message.warning("该节点下不能创建子节点");
+        } else {
+            addNodeModalData.value = true;
+        }
     } else if (key === "upload") {
         const info = nodeDataInfo.value;
         HcUploadFileApi({
@@ -1779,7 +1784,7 @@ const formEditNodeModel = ref({
     partitionCode: "",
     position: "",
 
-    parentId: "",
+    notExsitChild: "",
 });
 const formEditNodeRules = {
     title: {
@@ -2116,7 +2121,7 @@ const formDataNodeRef = ref(null);
 const formDataNodeModel = ref({
     title: "",
     nodeType: null,
-    isClassifcation: "",
+    isClassifition: 0,
     className: "",
     unitName: "",
 
@@ -2161,7 +2166,7 @@ const changeStandType = async (val) => {
 };
 
 const formDataNodeRules = {
-    title: {
+    nodeName: {
         required: true,
         trigger: "blur",
         message: "请输入节点名称",
@@ -2173,7 +2178,7 @@ const formDataNodeRules = {
         message: "请选择节点类型",
     },
 
-    isClassifcation: {
+    isClassifition: {
         required: true,
         trigger: "blur",
         message: "请选择是否含单元评定",
@@ -2199,21 +2204,26 @@ const formDataNodeRules = {
 const addNodeClickData = async () => {
     //发起请求
     addNodeClickData.value = true;
-    // const { error, code, msg } = await wbsApi.saveCustomAddContractNode({
-    //     nodeName: nodeNameinput.value,
-    //     nodeType: nodeDataInfo.value?.nodeType || "",
-    //     partitionCode: nodeDataInfo.value?.partitionCode || "",
-    //     primaryKeyId: nodeDataInfo.value?.primaryKeyId || "",
-    // });
+    const { error, code, msg } = await wbsApi.saveCustomAddContractNode({
+        nodeName: formDataNodeModel.value.nodeName,
+        nodeType: formDataNodeModel.value?.nodeType || "",
+        partitionCode: nodeDataInfo.value?.partitionCode || "",
+        primaryKeyId: nodeDataInfo.value?.primaryKeyId || "",
+        nodeClass: 2, //数字化文件
+        isClassifition: formDataNodeModel.value?.isClassifition || 0,
+        className: formDataNodeModel.value?.className || "",
+        unitName: Number(formDataNodeModel.value?.unitName) || "",
+        excellentNum: formDataNodeModel.value?.excellentNum || 0,
+    });
     //判断状态
     addNodeClickData.value = false;
-    // if (!error && code === 200) {
-    //     window?.$message?.success("新增成功");
-    //     addNodeModalCus.value = false;
-    //     window?.location?.reload(); //刷新页面
-    // } else {
-    //     window?.$message?.error(msg);
-    // }
+    if (!error && code === 200) {
+        window?.$message?.success("新增成功");
+        addNodeModalData.value = false;
+        window?.location?.reload(); //刷新页面
+    } else {
+        window?.$message?.error(msg);
+    }
 };
 
 //选中的节点
@@ -2280,6 +2290,8 @@ const addNodeClickCur = async () => {
     const { error, code, msg } = await wbsApi.saveCustomAddContractNode({
         nodeName: nodeNameinput.value,
         nodeType: nodeDataInfo.value?.nodeType || "",
+
+        nodeClass: 1, //1水利化工程，2数字化文件
         partitionCode: nodeDataInfo.value?.partitionCode || "",
         primaryKeyId: nodeDataInfo.value?.primaryKeyId || "",
     });
@@ -2941,11 +2953,11 @@ const loadMenu = ({ node, item, level }, resolve) => {
                 label: "自定义节点（水利工程）",
                 key: "add1",
             },
-            // {
-            //     icon: "add-circle",
-            //     label: "自定义节点（数字化文件）",
-            //     key: "add2",
-            // },
+            {
+                icon: "add-circle",
+                label: "自定义节点（数字化文件）",
+                key: "add2",
+            },
         ];
         resolve(menusArr);
     } else {