复制节点按钮显示顺序更改

src/views/data-fill/division.vue

@@ -104,13 +104,6 @@
             <div class="header-new-switch">
                 <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel"   label-position="left"
                          :rules="formCopyNodeModelRules" label-width="auto" size="large">
-                    <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;">
-                        <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
-                        <el-checkbox-group v-model="classifyList">
-                            <el-checkbox label="施工"/>
-                            <el-checkbox label="监理"/>
-                        </el-checkbox-group>
-                    </el-form-item>
                     <el-form-item label="是否复制数据" prop="isCopyData" style="margin-bottom: 0;"  v-if="copyNodeTabKey === '2'">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-radio-group v-model="isCopyData">
@@ -118,6 +111,13 @@
                             <el-radio :label="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
+                    <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;" v-if="isCopyData===1">
+                        <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
+                        <el-checkbox-group v-model="classifyList">
+                            <el-checkbox label="施工"/>
+                            <el-checkbox label="监理"/>
+                        </el-checkbox-group>
+                    </el-form-item>
                 </el-form>
                 <!--HcNewSwitch :datas="authBtnTabdata" :keys="classifyType" :round="false" size="default"
                              @change="classifyTypeTabClick"/-->
@@ -788,6 +788,7 @@ const copyNodeTableDel = (index) => {
     copyNodeTable.value.splice(index, 1)
 }
 //复制节点
+//复制节点
 const copyNodeClick = async () => {
     const type = copyNodeTabKey.value
     const form = formCopyNodeModel.value
@@ -814,43 +815,37 @@ const copyNodeClick = async () => {
             }
         })
     }
-    //效验数据
-    if (type === '1') {
-        const validate = await formValidate(formCopyNodeModelRef.value)
-        if (validate) await copyContractTreeNode(type, form, [])
-    } else if (type === '2') {
-        if (table.length > 0) {
-            const validate = await formValidate(copyNodeTableRef.value)
-            if (validate) await copyContractTreeNode(type, form, table)
-        } else {
-            window?.$message?.warning('请先在左侧选择要复制到的节点')
-        }
-    } else if (type === '3') {
-        if (table.length > 0 && classify.length > 0) {
-            await copyContractNodeSubmitBusinessData(form, table, classify)
-        } else {
-            window?.$message?.warning('请先在左侧选择要复制的节点或选择所属方')
+  if(isCopyData.value===1){
+    if (classify) {
+        //效验数据
+        if (type === '1') {
+            const validate = await formValidate(formCopyNodeModelRef.value)
+            if (validate) await copyContractTreeNode(type, form, [], classify)
+        } else if (type === '2') {
+            if (table.length > 0) {
+                const validate = await formValidate(copyNodeTableRef.value)
+                if (validate) await copyContractTreeNode(type, form, table, classify)
+            } else {
+                window?.$message?.warning('请先在左侧选择要复制到的节点')
+            }
         }
+    } else {
+        window?.$message?.warning('请选择所属方')
     }
+  }else{
+    if (type === '1') {
+            const validate = await formValidate(formCopyNodeModelRef.value)
+            if (validate) await copyContractTreeNode(type, form, [], classify)
+    } else if (type === '2') {
+            if (table.length > 0) {
+                const validate = await formValidate(copyNodeTableRef.value)
+                if (validate) await copyContractTreeNode(type, form, table, classify)
+            } else {
+                window?.$message?.warning('请先在左侧选择要复制到的节点')
+            }
+     }
+  }
 }
-//单个复制、多份复制请求
-// const copyContractTreeNode = async (type, form, table) => {
-//     copyNodeLoading.value = true
-//     const {error, code} = await wbsApi.copyContractTreeNode({
-//         copyType: type,
-//         needCopyNodeName: form?.title || '',
-//         needCopyPrimaryKeyId: form?.primaryKeyId || '',
-//         parentPrimaryKeyId: form?.parent?.primaryKeyId || '',
-//         copyBatchToPaths: table
-//     })
-//     //判断状态
-//     copyNodeLoading.value = false
-//     if (!error && code === 200) {
-//         window?.$message?.success('复制成功')
-//         copyNodeModal.value = false
-//         window?.location?.reload()  //刷新页面
-//     }
-// }
 const copyContractTreeNode = async (type, form, table, classify) => {
     copyNodeLoading.value = true
     if (type === '1') {

src/views/data-fill/wbs.vue

@@ -317,13 +317,6 @@
             <div class="header-new-switch">
                 <el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel"   label-position="left"
                          :rules="formCopyNodeModelRules" label-width="auto" size="large">
-                    <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;">
-                        <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
-                        <el-checkbox-group v-model="classifyList">
-                            <el-checkbox label="施工"/>
-                            <el-checkbox label="监理"/>
-                        </el-checkbox-group>
-                    </el-form-item>
                     <el-form-item label="是否复制数据" prop="isCopyData" style="margin-bottom: 0;"  v-if="copyNodeTabKey === '2'">
                         <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
                         <el-radio-group v-model="isCopyData">
@@ -331,6 +324,13 @@
                             <el-radio :label="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
+                    <el-form-item label="所属方" prop="classify" style="margin-bottom: 0;" v-if="isCopyData===1">
+                        <!-- <el-input v-model="formCopyNodeModel.classify" placeholder="请输入节点名称"/> -->
+                        <el-checkbox-group v-model="classifyList">
+                            <el-checkbox label="施工"/>
+                            <el-checkbox label="监理"/>
+                        </el-checkbox-group>
+                    </el-form-item>
                 </el-form>
                 <!--HcNewSwitch :datas="authBtnTabdata" :keys="classifyType" :round="false" size="default"
                              @change="classifyTypeTabClick"/-->
@@ -1339,6 +1339,7 @@ const copyNodeClick = async () => {
             }
         })
     }
+  if(isCopyData.value===1){
     if (classify) {
         //效验数据
         if (type === '1') {
@@ -1347,23 +1348,27 @@ const copyNodeClick = async () => {
         } else if (type === '2') {
             if (table.length > 0) {
                 const validate = await formValidate(copyNodeTableRef.value)
-                console.log(form,'form');
-                console.log( formCopyNodeModel.value,' formCopyNodeModel.value');
                 if (validate) await copyContractTreeNode(type, form, table, classify)
             } else {
                 window?.$message?.warning('请先在左侧选择要复制到的节点')
             }
         }
-        /* else if (type === '3') {
-            if (table.length > 0 && classify.length > 0) {
-                await copyContractNodeSubmitBusinessData(form, table, classify)
-            } else {
-                window?.$message?.warning('请先在左侧选择要复制的节点或选择所属方')
-            }
-        }*/
     } else {
-        window?.$message?.warning('请先选择所属方')
+        window?.$message?.warning('请选择所属方')
     }
+  }else{
+    if (type === '1') {
+            const validate = await formValidate(formCopyNodeModelRef.value)
+            if (validate) await copyContractTreeNode(type, form, [], classify)
+    } else if (type === '2') {
+            if (table.length > 0) {
+                const validate = await formValidate(copyNodeTableRef.value)
+                if (validate) await copyContractTreeNode(type, form, table, classify)
+            } else {
+                window?.$message?.warning('请先在左侧选择要复制到的节点')
+            }
+     }
+  }
 }
 //单个复制、多份复制请求
 const copyContractTreeNode = async (type, form, table, classify) => {