Merge branch 'fix_foton_20240430' into 'master'

Fix foton 20240430

See merge request laws-foton-slrs/foton-laws-system-front!188

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1994,8 +1994,9 @@
     </el-drawer>
     <!-- 组件树-->
     <tree-select-new
-      :multiple="false"
+      :multiple="true"
       :lazy="false"
+      :check-strictly="true"
       :modalShowFlag="modalShowFlag1"
       :drawerTitle="drawerTitle1"
       width="500"
@@ -2116,6 +2117,7 @@ export default {
   props: {},
   data () {
     return {
+      editCheckd:[],
       rootNode: '', // 左侧树当前选中的数据的根节点（企业标准，技术体系）
       systemCategoryId: [], // 表格选中数据的体系标准Id
       opinionsStand: [
@@ -3304,11 +3306,11 @@ export default {
       this.modalShowFlag1 = false
     },
     popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
+      this.sarBussionessStandEO.txlbId = checkedIds.join(',')
+      this.sarBussionessStandEO.menuId = checkedIds.join(',')
       if (checkedData) {
         if (checkedData.length > 0) {
           this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuNames).join(',')
-          this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(',')
-          this.sarBussionessStandEO.txlbId = checkedData.map(item => item.menuId).join(',')
           this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(',')
         } else {
           if (checkedData.parentId == null || checkedData.parentId === '') {
@@ -3700,15 +3702,14 @@ export default {
     // 节点选中状态发生变化时的回调，当选中另一个后，当前的的节点状态变化也会触发这个事件
     handleCheckChange (item, checked, self) {
       if(checked) {
-        console.log(item)
-        this.editCheckd = item.id
+        this.editCheckd.push(item.id)
         this.NewTreeType = item.treeType
-        this.$refs.menuTree.setCheckedKeys([ item.id ]);
+        // this.$refs.menuTree.setCheckedKeys([ item.id ]);
         // this.nodeClick(item)
       }else{
-        if(this.editCheckd === item.id) {
-          this.$refs.menuTree.setCheckedKeys([ item.id ]);
-        }
+        // if(this.editCheckd === item.id) {
+        //   this.$refs.menuTree.setCheckedKeys([ item.id ]);
+        // }
       }
     },
     // 移动标准
@@ -3729,7 +3730,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.menuTree.setCheckedKeys(checkedObj);
       })
-      this.editCheckd = ''
+      this.editCheckd = []
       this.mobileModal = false
     },
     // 移动标准提交
@@ -3738,7 +3739,7 @@ export default {
       const search = {}
       // 取最外层目录id
       search.oldMenuId = this.selectSarMenu.id
-      search.menuId = this.editCheckd
+      search.menuId = this.editCheckd.join(',')
       search.treeType = this.selectSarMenu.treeType
       // search.oldTreeType = this.selectSarMenu.treeType
       // search.NewTreeType = this.NewTreeType
@@ -3760,7 +3761,7 @@ export default {
           this.$nextTick(() => {
             this.$refs.menuTree.setCheckedKeys(checkedObj);
           })
-          this.editCheckd = ''
+          this.editCheckd = []
           this.mobileModal = false
           this.getBussionStandTable()
         }, e => {
@@ -3771,12 +3772,12 @@ export default {
       const checkedObj = []
       const search = {}
       // 取最外层目录id
-      search.newStandCategoryId = this.editCheckd
+      search.newStandCategoryId = this.editCheckd.join(',')
       search.standIds = []
       for (let i = 0; i < this.selectedList.length; i++) {
         search.standIds.push(this.selectedList[i])
       }
-      if(search.newStandCategoryId == '' || search.newStandCategoryId == null || search.newStandCategoryId == undefined) {
+      if(search.newStandCategoryId == '' || search.newStandCategoryId == null || search.newStandCategoryId == undefined || search.newStandCategoryId == []) {
         this.$message.error('请至少选择一个节点')
       }else{
         search.standIds = search.standIds.join(',')