|
@@ -293,7 +293,7 @@
|
|
|
</HcDialog>
|
|
|
|
|
|
<!--复制节点-->
|
|
|
- <HcDialog :show="copyNodeModal" title="复制节点1" :widths="copyNodeTabKey === '1'?'600px':'1200px'" @close="copyNodeModal = false">
|
|
|
+ <HcDialog :show="copyNodeModal" title="复制节点" :widths="copyNodeTabKey === '1'?'600px':'1200px'" @close="copyNodeModal = false">
|
|
|
<el-form ref="formCopyNodeModelRef" :model="formCopyNodeModel" :rules="formCopyNodeModelRules" label-width="auto" size="large" v-if="copyNodeTabKey !== '3'">
|
|
|
<el-form-item label="节点名称" prop="title" style="margin-bottom: 0;">
|
|
|
<el-input v-model="formCopyNodeModel.title" placeholder="请输入节点名称"/>
|
|
@@ -746,6 +746,7 @@ const setTreeMenuDataClick = ({key,node,data}) => {
|
|
|
copyNodeTabKey.value = '1'
|
|
|
copyNodeTable.value = []
|
|
|
copyNodeLoading.value = false
|
|
|
+
|
|
|
copyNodeModal.value = true
|
|
|
} else if (key === 'add') {
|
|
|
addTreeNodeId.value = data?.id
|
|
@@ -969,21 +970,33 @@ const copyNodeElTreeClick = ({data}) => {
|
|
|
setCopyNodeTable(data, title,partitionCode)
|
|
|
}
|
|
|
} else if (TabKey === '3') {
|
|
|
- if (data['notExsitChild']) {
|
|
|
- if(data['nodeType']===6){
|
|
|
- let oldarr= copyNodeTable.value
|
|
|
- let result = oldarr.some(item => item.primaryKeyId===data['primaryKeyId']) //true
|
|
|
- //限制点工序节点的时候,只能加一个,只针对复制数据
|
|
|
- if(!result){
|
|
|
- setCopyNodeTable(data, data?.title)
|
|
|
+ //限制复制数据不能复制到本身节点下
|
|
|
+ if(data['id']!==formCopyNodeModel.value.id){
|
|
|
+ // console.log(formCopyNodeModel.value,'formCopyNodeModel.value');
|
|
|
+ // console.log(data,'data');
|
|
|
+ // if(data['colorStatus']===1||data['colorStatus']===2){
|
|
|
+ // // delModalClick()
|
|
|
+ // }else{
|
|
|
+ // window?.$message?.warning('该节点已存在上报数据,不允许复制')
|
|
|
+ // }
|
|
|
+ if (data['notExsitChild']) {
|
|
|
+ if(data['nodeType']===6){
|
|
|
+ let oldarr= copyNodeTable.value
|
|
|
+ let result = oldarr.some(item => item.primaryKeyId===data['primaryKeyId']) //true
|
|
|
+ //限制点工序节点的时候,只能加一个,只针对复制数据
|
|
|
+
|
|
|
+ if(!result){
|
|
|
+ setCopyNodeTable(data, data?.title)
|
|
|
+ }
|
|
|
+
|
|
|
+ }else{
|
|
|
+ setCopyNodeTable(data, data?.title)
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
- }else{
|
|
|
- setCopyNodeTable(data, data?.title)
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|