9bf5c6e2 by fanguang

fix

1 parent 30869d5a
...@@ -343,18 +343,18 @@ function getDetail () { ...@@ -343,18 +343,18 @@ function getDetail () {
343 const data = res.data 343 const data = res.data
344 data.fieldRQVOS = data.fieldRSVOS 344 data.fieldRQVOS = data.fieldRSVOS
345 form.value = { ...data } 345 form.value = { ...data }
346 let { level, isHaveData, children } = treeCurrentNode.value 346 let { level, isChildHaveData, children } = treeCurrentNode.value
347 if (level == 1) { 347 if (level == 1) {
348 // 所选为一级节点,当前二级节点 348 // 所选为一级节点,当前二级节点
349 fieldsTableShow.value = false 349 fieldsTableShow.value = false
350 } 350 }
351 if (level == 2) { 351 if (level == 2) {
352 fieldsDisabled.value = isHaveData === 'Y' ? true : false 352 fieldsDisabled.value = isChildHaveData === 'Y' ? true : false
353 } 353 }
354 if (level >= 3) { 354 if (level >= 3) {
355 fieldsDisabled.value = true 355 fieldsDisabled.value = true
356 } 356 }
357 if ((children && children.length) || isHaveData === 'Y') { 357 if ((children && children.length) || isChildHaveData === 'Y') {
358 treeSelectDisabled.value = true 358 treeSelectDisabled.value = true
359 } 359 }
360 } 360 }
......
...@@ -923,10 +923,12 @@ const tableBtnClick = (scope, btn) => { ...@@ -923,10 +923,12 @@ const tableBtnClick = (scope, btn) => {
923 923
924 } else if (type === 'remove') { 924 } else if (type === 'remove') {
925 let removeRows = () => { 925 let removeRows = () => {
926 console.log('formTableData.value', formTableData.value) 926 const existIndex = formTableData.value.findIndex(s => {
927 console.log('row', row) 927 if (s.ROWID) {
928 // return 928 return s.ROWID == row.ROWID
929 const existIndex = formTableData.value.findIndex(s => s.ROWID == row.ROWID) 929 }
930 return s.guid == row.guid
931 })
930 existIndex > -1 && formTableData.value.splice(existIndex, 1) 932 existIndex > -1 && formTableData.value.splice(existIndex, 1)
931 } 933 }
932 if (drawerInfo.value.type == 'edit') { 934 if (drawerInfo.value.type == 'edit') {
......
...@@ -120,6 +120,10 @@ function refreshTree () { ...@@ -120,6 +120,10 @@ function refreshTree () {
120 } 120 }
121 }) 121 })
122 } 122 }
123 function refreshTreeAndPage () {
124 refreshTree()
125 getFirstPageData()
126 }
123 127
124 function deleteTreeNode (guid) { 128 function deleteTreeNode (guid) {
125 deleteMetaStandard([guid]).then((res:any) => { 129 deleteMetaStandard([guid]).then((res:any) => {
...@@ -254,7 +258,7 @@ function deleteStandardFields (row) { ...@@ -254,7 +258,7 @@ function deleteStandardFields (row) {
254 deleteMetaStandardDataFields([row.guid]).then((res:any) => { 258 deleteMetaStandardDataFields([row.guid]).then((res:any) => {
255 if (res.code === proxy.$passCode) { 259 if (res.code === proxy.$passCode) {
256 ElMessage.success('删除成功') 260 ElMessage.success('删除成功')
257 getFirstPageData() 261 refreshTreeAndPage()
258 } else { 262 } else {
259 ElMessage.error(res.msg) 263 ElMessage.error(res.msg)
260 } 264 }
...@@ -471,7 +475,7 @@ function batchDelete () { ...@@ -471,7 +475,7 @@ function batchDelete () {
471 deleteMetaStandardDataFields(selectRowGuids).then((res:any) => { 475 deleteMetaStandardDataFields(selectRowGuids).then((res:any) => {
472 if (res.code === proxy.$passCode) { 476 if (res.code === proxy.$passCode) {
473 ElMessage.success('删除成功') 477 ElMessage.success('删除成功')
474 getFirstPageData() 478 refreshTreeAndPage()
475 } else { 479 } else {
476 ElMessage.error(res.msg) 480 ElMessage.error(res.msg)
477 } 481 }
...@@ -566,7 +570,7 @@ const viewGraph = () => { ...@@ -566,7 +570,7 @@ const viewGraph = () => {
566 :type="standardFieldsDialog.type" 570 :type="standardFieldsDialog.type"
567 :metaStandardGuid="standardFieldsDialog.metaStandardGuid" 571 :metaStandardGuid="standardFieldsDialog.metaStandardGuid"
568 :data="standardFieldsDialog.data" 572 :data="standardFieldsDialog.data"
569 @success="getFirstPageData" 573 @success="refreshTreeAndPage"
570 /> 574 />
571 </div> 575 </div>
572 </template> 576 </template>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!