Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/code/codeApply.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <p>编码申请</p>
</template>

<script>
export default {
name: "codeApply"
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/views/integration/systemInfo.vue

@@ -37,6 +37,7 @@
          </avue-tree>
        </el-col>
      </el-row>

      <div slot="footer" class="dialog-footer" style="height: 50px;line-height: 50px">
        <el-button icon="el-icon-plus" size="small" type="primary" @click="empower">授 æƒ</el-button>
        <el-button icon="el-icon-close" size="small" type="danger">重 ç½®</el-button>
@@ -141,11 +142,17 @@
  methods: {
    empower() {
      batchAddSave(this.checkAll.oid, this.checkAll.id, this.ParentList).then(res => {
        console.log(res)
        // console.log(res.data)
        if(res.data.code === 200){
          this.$message.success(res.data.msg)
          this.dialogVisible=false;
        }
      })
    },
    //分类授权多选回调
    checkChange(row, checked) {
      // this.ParentList=[]
      // console.log('row',row)
      if (checked) {
        if (!row.parentId) {
          const parentRecord = {
@@ -155,7 +162,7 @@
            classParentOid: row.parentId,
          };
          this.ParentList.push(parentRecord);
          // å¦‚æžœrow的children不为空，继续循环children中的每个对象
          // å¦‚æžœrow的children不为空 ç»§ç»­å¾ªçŽ¯children中的每个对象
          if (row.children && row.children.length > 0) {
            for (let child of row.children) {
              const childRecord = {
@@ -165,7 +172,7 @@
                classParentOid: child.parentId,
              };
              this.ParentList.push(childRecord);
              // å¦‚果子对象的children不为空，继续循环获取数据
              // å¦‚果子对象的children不为空 ç»§ç»­å¾ªçŽ¯èŽ·å–数据
              if (child.children && child.children.length > 0) {
                for (let subChild of child.children) {
                  const subRecord = {
@@ -213,21 +220,75 @@
          }
        }
      }
      console.log(this.ParentList);
      console.log('this.ParentList',this.ParentList);
    },
    //分类授权
    classifyHandler(row) {
      this.loading = true;
      this.checkAll = row
      sysInfoTree({systemOid: row.oid, systemId: row.id}).then(res => {
        this.TreeData = res.data;
        this.ModifyProperties(this.TreeData, 'text', 'label');
        // æ ¹æ® this.TreeData çš„长度计算延迟时间
        let List = [];
        let value = 0;
        let NumberList= [];
        function traverse(obj, parent) {
          //重新构建一次选中当前row的数据
          const record = {
            label: obj.text,
            oid: obj.oid,
            attributes:{
              classifyId: obj.attributes.classifyId,
              classifyOid: obj.attributes.classifyOid,
              selected:obj.attributes.selected
            },
            classParentOid: obj.parentId,
            value: value,
            children: []
          };
          //当前已选择数据回填
          if (record.attributes.selected == 'true') {
            NumberList.push(record.value);
          }
          if (parent) {
            const stingChild = parent.children.find(child => child.label === record.label);
            if (stingChild) {
              record.value = stingChild.value; // ä½¿ç”¨å·²å­˜åœ¨çš„子节点的value值
            } else {
              parent.children.push(record);
              value++;
            }
          } else {
            const stingRecord = List.find(item => item.label === record.label);
            if (stingRecord) {
              record.value = stingRecord.value; // ä½¿ç”¨å·²å­˜åœ¨çš„顶层节点的value值
            } else {
              List.push(record);
              value++;
            }
          }
          if (obj.children && obj.children.length > 0) {
            for (let child of obj.children) {
              traverse(child, record);
            }
          }
        }
        for (let item of res.data) {
          traverse(item, null);
        }
        // console.log('list', List);
        this.TreeData = List;
        // this.ModifyProperties(this.TreeData, 'text', 'label');
        // æ ¹æ®this.TreeData的长度计算延迟时间
        const delayTime = this.TreeData.length * 1;
        setTimeout(() => {
          this.loading = false;
          this.reload = Math.random()
          this.reload = Math.random();
          this.dialogVisible = true;

          this.$nextTick(() => {
            if (this.$refs.tree) {
              this.$refs.tree.setCheckedKeys(NumberList);
            }
          });
        }, delayTime);
      });
    },
@@ -245,7 +306,6 @@
    },
    async getDataList() {
      this.loading = true;
      console.log(this.search);
      const {pageSize, currentPage} = this.page;
      const conditions = {};
      if (Object.keys(this.search).length > 0) {
@@ -257,7 +317,7 @@
      }
      const response = await getSysInfoList(pageSize, currentPage, conditions);
      if (response.status === 200) {
        console.log(response);
        // console.log(response);
        this.loading = false;
        const data = response.data.data;
        this.data = data.records;
@@ -326,7 +386,7 @@
      }).then(async () => {
        const response = await sysInfoDel(param)
        if (response.status === 200) {
          console.log(response)
          // console.log(response)
          this.$message({
            type: 'success',
            message: '删除成功!'