Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -240,6 +240,7 @@
      let slotColumnList = [];
      formItemList.forEach((formItem) => {
        formItem = this.resetFormConfig(formItem);
        console.log(formItem)
        //属性码段规则
        if (formItem.secType === "codeattrsec") {
          this.attrList.push(formItem);
@@ -247,6 +248,7 @@
        //系列号规则
        if (formItem.field === "codeStandardEditType") {
          if (this.status === "amend") {
            console.log("formItem-amend",formItem)
            formItem.readOnly = true;
          }
        }
@@ -296,8 +298,8 @@
              this.codeattrsecValue = val.value;
              return;
            }
            //是否系列-系列号
            if (val.column.field === "isSeries") {
            //修订为-系列号
            if (val.column.field === "reviseSeries") {
              if (val.value === "false") {
                this.isShow = true;
              } else {
@@ -323,7 +325,8 @@
          field: formItem.field,
          type: this.columnType[formItem.type],
          dicData: this.getDataList(formItem.type, formItem.data),
          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false),
          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
            (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
          prepend: this.preOrSufFixShow("text", formItem.prefix),
          append: this.preOrSufFixShow("text", formItem.suffix),
          prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),

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

@@ -120,6 +120,22 @@
  mounted() {
  },
  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)// 解析成对象失败，说明是正常的文件流
          func.downloadFileByBlobHandler(res);
          this.$message.success('下载成功，请查看！');
        }
      };
    },
    escHandler() {
      this.$emit('update:visible', false);
      this.value = [];
@@ -157,11 +173,8 @@
              'conditionMap[oid]': this.ids, ...this.exportArrTwo,
              limit: -1
            }).then(res => {
              // console.log('res',res)
              if (res) {
                func.downloadFileByBlobHandler(res);
                this.escHandler()
              }
                this.handlerFile(res);
                this.escHandler();
            })
          } else {

@@ -170,10 +183,9 @@
              'conditionMap[oid]': this.ids, ...this.exportArr
            }).then(res => {
              // console.log('res',res)
              if (res) {
                func.downloadFileByBlobHandler(res);
                this.escHandler()
              }
                this.handlerFile(res);
                this.escHandler();

            })

          }
@@ -185,19 +197,15 @@
              this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
            });
          exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArrTwo, limit: -1}).then(res => {
            // console.log('res',res)
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler()
              this.escHandler();
            }
          })
        } else {
          exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => {
            // console.log('res',res)
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler()
            }
              this.handlerFile(res);
              this.escHandler();
          })
        }
      } else if (this.radio === 2) {
@@ -233,10 +241,9 @@
            endPage: end
          }).then((res) => {
            // console.log('res',res)
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler()
            }
              this.handlerFile(res);
              this.escHandler();

          });
        } else {
          this.tableHeadData.map(item => item.prop)
@@ -249,11 +256,9 @@
            page: start,
            endPage: end
          }).then(res => {
            // console.log('res',res)
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler()
            }
            console.log('res',res)
              this.handlerFile(res);
              this.escHandler();
          })
        }
      }

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

@@ -99,8 +99,8 @@
          </FormTemplateDialog>
          <!--          修订-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'数据修订'"
                              :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
                              :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
                              :title="'数据修订'" :visible.sync="amendvisible" status="amend"
                              type="add" @submit="amendSumbit"></FormTemplateDialog>
          <!--          新增-->
          <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -111,9 +111,9 @@
          </FormTemplateDialog>
          <!--          修改-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'修改编码信息'"
                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
                              :title="'修改编码信息'"
                              :visible.sync="editvisible"
                              :rowOid="rowOid"
                              type="edit" @submit="EditSumbit"></FormTemplateDialog>
          <!--          批量编辑-->
          <!--          <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -395,7 +395,7 @@
  watch: {
    isLoading:{
      handler(newval){
        console.log(newval)
        // console.log(newval)
      }
    },
    tableHeadDataFateher: {
@@ -500,6 +500,7 @@
      }
    },
    cellStatusFind(lcstatus) {
      this.isLoading = true;
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
@@ -507,7 +508,10 @@
        limit: this.page.pageSize,
        'conditionMap[lcstatus]': lcstatus
      }).then(res => {
        this.tableData = res.data.data
        // console.log(res)
        this.tableData = res.data.data;
        this.page.total = res.data.total;
        this.isLoading = false;
      })
    },
    //展开附件
@@ -574,16 +578,25 @@
      exportGroupCodeExcel({
        codeClassifyOid: this.codeClassifyOid,
      }).then(res => {
        console.log(res.data)
        if (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)// 解析成对象失败，说明是正常的文件流
          func.downloadFileByBlobHandler(res);
          this.$message.success('下载成功，请查看！');
          this.isLoading = false;
        }
      }).catch(error=>{
        this.$message.error(error);
        this.isLoading = false;
      })
        };

      });
    },
    //标准申请
    codeApplyHandler() {
@@ -1061,10 +1074,7 @@
    },
    //输入回车搜索
    tableFindInp() {
      /*if (this.WupinFindValue.trim() === '') {
        this.$message.warning('输入值不能为空')
        return;
      }*/
      this.isLoading = true;
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
@@ -1073,7 +1083,8 @@
        ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
      }).then(res => {
        this.tableData = res.data.data;
        // this.page.total = res.data.data.total;
        this.page.total = res.data.total;
        this.isLoading = false;
      })
    }


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

@@ -2,45 +2,44 @@
<template>
  <el-container>
    <!--    左侧菜单-->
    <el-aside>
    <el-aside style="width: 20%;">
      <basic-container>
        <div>
          <div>
            <div style="display: flex; flex-direction: column;">
              <div style="display: flex;justify-content: space-around">
        <el-collapse accordion>
          <el-collapse-item style="padding-left: 3px;">
            <template slot="title">
              <div style="display: flex;justify-content: space-around;">
                <el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">添加
                </el-button>
                <el-button v-if="permissionList.TreeEditStatus" plain size="mini" type="primary" @click="TreeEdit">修改
                </el-button>
                <el-button v-if="permissionList.TreeDelStatus" plain size="mini" type="primary" @click="TreeDel">删除
                </el-button>
              </div>
              <div style="display: flex; margin-top: 10px;justify-content: space-around">
                <el-button v-if="permissionList.flushedStatus" plain size="mini" type="primary" @click="flushed">刷新
                </el-button>
              </div>
            </template>
            <div>
                <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">启用
                </el-button>
                <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate">
                  停用
                </el-button>
              </div>
              <div style="display: flex; margin-top: 10px;justify-content: space-around">
                <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary"
                           @click.native="ImportExcel">导入
                </el-button>
                <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
                           @click="ExportExcel">导出
                </el-button>
                <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
                           @click="testHandler">测试
            </div>
            <div style="margin-top: 10px;margin-bottom: 10px">
              <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">流水处理
                </el-button>
              </div>
            </div>
            <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
            </div>
          </div>
          </el-collapse-item>
        </el-collapse>

          <!--          左侧树-->
          <div style="height: calc(100vh - 230px);overflow: auto;">
          <div style="height: calc(100vh - 194px);overflow: auto;">
            <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
                       :defaultExpandAll="false"
                       :option="Treeoption"
@@ -107,7 +106,6 @@
                              :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
                              @referTreeForm="referTreeForm"></classifyTreeform>
          </el-dialog>
        </div>
      </basic-container>
    </el-aside>
    <el-main>
@@ -439,6 +437,7 @@
  name: "classifyTrees.vue",
  data() {
    return {
      activeName: 'first',
      masterRow: null,
      AddLoading: false,
      // 定义一个变量来保存树请求的数量
@@ -885,6 +884,9 @@
  created() {
  },
  methods: {
    handleTabClick(){

    },
    testHandler(){
      if(this.nodeClickList.length <=0 ){
        this.$message.warning('请至少选择一条数据！')

 Source/UBCS-WEB/src/util/func.js

@@ -133,6 +133,7 @@
   * @returns {Boolean}
   */
  static downloadFileByBlobHandler(res) {
    if(res.headers['content-disposition']){
    const fileNames = res.headers['content-disposition'].split(";");
    let characterSet = fileNames[2].split("filename*=")[1];
    let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet);  // 下载的文件名
@@ -148,6 +149,7 @@
    document.body.removeChild(link); //删除下载
    window.URL.revokeObjectURL(url); //释放掉blob对象
  }
  }

  /**
   * 获取流文件进行文件下

 Source/UBCS-WEB/src/views/system/menu.vue

@@ -55,6 +55,8 @@
    </avue-crud>
    <!-- 从其他菜单克隆按钮 -->
    <el-dialog :visible.sync="cloneOtherMenuButtons.cloneButtonSettingBox"
               class="avue-dialog avue-dialog--top"
               top="0"
               append-to-body
               style="height: 110vh; margin-top: -10vh;"
               title="从其他菜单克隆按钮"
@@ -295,7 +297,6 @@
        cloneButtonSettingBox: false,
        selectCloneButtons: [],
        cloneOption: {
          height: "auto",
          menu: false,
          header: false,
          addBtn: false,