Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/BatchImport/index.vue

@@ -61,7 +61,7 @@
      >
    </el-upload>
    <template #footer>
      <div style="display: inline-block">
      <div style="display: inline-block" v-if="type != 'groupCode'">
          <el-button
            v-if="type !== 'bulkEdit' "
            :loading="downloadLoading"
@@ -323,6 +323,7 @@
      }
    },
    onSuccess(res) {
      console.log(res)
      if (Object.keys(res.data).length === 0) {
        this.$message.success(this.title + "导入成功！");
        this.resetTable()

 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue

@@ -122,20 +122,22 @@
  },
  methods: {
    handlerFile(res) {
      let reader = new FileReader();
      reader.readAsText(res.data);
      reader.onload = (result) => {
        try {
          let resData = JSON.parse(result.target.result);  // 解析对象成功
          if (resData.code != 200) {
            this.$message.error(resData.msg);
          }
        } catch (err) {
          // console.log("err",err)// 解析成对象失败，说明是正常的文件流
      // let reader = new FileReader();
      // reader.readAsText(res.data);
      // reader.onload = (result) => {
      //   try {
      //     let resData = JSON.parse(result.target.result);  // 解析对象成功
      //     if (resData.code != 200) {
      //       this.$message.error(resData.msg);
      //     }
      //   } catch (err) {
      //   // 解析成对象失败，说明是正常的文件流
      //     func.downloadFileByBlobHandler(res);
      //     this.$message.success('下载成功，请查看！');
      //   }
      // };
          func.downloadFileByBlobHandler(res);
          this.$message.success('下载成功，请查看！');
        }
      };
    },
    escHandler() {
      this.$emit('update:visible', false);
@@ -257,7 +259,7 @@
            page: start,
            endPage: end
          }).then(res => {
            console.log('res', res)
            // console.log('res', res)
            this.handlerFile(res);
            this.escHandler();
          })

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -578,24 +578,27 @@
      exportGroupCodeExcel({
        codeClassifyOid: this.codeClassifyOid,
      }).then(res => {
        let reader = new FileReader();
        reader.readAsText(res.data)
        reader.onload = (result) => {
          try {
            let resData = JSON.parse(result.target.result);  // 解析对象成功
            if (!resData.success) {
              console.log("resData", resData)
              this.$message.error(resData.msg);
              this.isLoading = false;
            }
          } catch (err) {
            // console.log("err",err)// 解析成对象失败，说明是正常的文件流
        // let reader = new FileReader();
        // reader.readAsText(res.data);
        // reader.onload = () => {
        //   try {
        //     let resData = JSON.parse(reader.result);  // 解析对象成功
        //     if (!resData.success) {
        //       this.$message.error(resData.msg);
        //       this.isLoading = false;
        //     }
        //   } catch (err) {
        //     // 解析成对象失败，说明是正常的文件流
        //     func.downloadFileByBlobHandler(res);
        //     this.$message.success('下载成功，请查看！');
        //     this.isLoading = false;
        //   }
        // };
            func.downloadFileByBlobHandler(res);
            this.$message.success('下载成功，请查看！');
            this.isLoading = false;
          }
        };

      }).catch(error=>{
        this.$message.error(error);
      });
    },
    //标准申请

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -892,7 +892,6 @@
        this.$message.warning('请至少选择一条数据！')
        return;
      }
      console.log(this.nodeClickList.oid)
      flowingDependencyGen(this.nodeClickList.oid).then(res => {
        this.$message.success('操作成功')
      }).catch(res => {
@@ -902,7 +901,6 @@
    // switch
    switchChange() {
      this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
      // console.log(this.TreeAddform.isParticipateCheck)
    },
    //存储的业务类型关闭
    BtmEscHandler() {
@@ -1346,7 +1344,7 @@
          });
        }
      } catch (error) {
        console.error(error);
        // console.error(error);
      } finally {
        this.loading = false;
      }
@@ -1389,7 +1387,7 @@
          });
        }
      } catch (error) {
        console.error(error);
        // console.error(error);
      } finally {
        this.loading = false;
      }
@@ -1459,7 +1457,7 @@
      }
    },
    treeClick(e) {
      console.log(e);
      // console.log(e);
    },
    //基本信息表单刷新
    referTreeForm() {

 Source/UBCS-WEB/src/views/modeling/Business.vue

@@ -1,24 +1,24 @@
<template>
  <el-container>
    <el-header class="businessHeader" style="height: 40px;padding:0 8px">
      <div>
        <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd" plain>
<!--    <el-header class="businessHeader" style="height: 40px;padding:0 8px">-->

<!--    </el-header>-->
    <el-container>
      <el-aside>
        <basic-container class="businessTreeContainer">
          <div class="app">
            <div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
              <el-button v-if="permissionList.addBtn"  size="mini" type="primary" @click="businessAdd" plain style="width: 60px">
          新增
        </el-button>
        <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit" plain>
              <el-button v-if="permissionList.editBtn"  size="mini" type="primary" @click="businessEdit" plain style="width: 60px">
          修改
        </el-button>
        <el-button v-if="permissionList.table" icon="el-icon-thumb" size="small" type="primary"
              <el-button v-if="permissionList.table"  size="mini" type="primary"
                   @click="selectFromTable" plain> 从已有中获取
        </el-button>
      </div>
    </el-header>
    <el-container>
      <el-aside style="width:250px">
        <basic-container class="businessTreeContainer">
          <div class="app">
            <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
            <avue-tree id="basic" :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
            <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
            <span slot-scope="{ node, data }" class="el-tree-node__label">
              <span>
                <i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
@@ -382,10 +382,6 @@
</script>

<style lang="scss">
#basic {
  height: 770px;
  border-radius: 10px;
}

.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
  display: none !important;
@@ -395,6 +391,24 @@
  display: none !important;
}

.businessTreeContainer > .el-card > .el-card__body {
  height: 775px;
}</style>

.app {
  overflow: auto;
  height: calc(100vh - 150px);
}

.app::-webkit-scrollbar {
  height: 15px; // 纵向滚动条 必写
  background: white;
  border: white;
  width: 10px;

}

// 滚动条的滑块
.app::-webkit-scrollbar-thumb {
  background-color: #ececec;
  border-radius: 20px;
  border: #ececec;
}
</style>