主数据导出重新修改

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

@@ -57,6 +57,7 @@
        data: []
      },
      exportArr:{},
      exportArrTwo:{},
      ids:""
    };
  },
@@ -68,7 +69,6 @@
    //表头数据 用来渲染穿梭框
    tableHeadData: {
      handler(newval, oldval) {
        console.log(newval)
        if (newval) {
          // 清空data数组
          this.data = [];
@@ -80,7 +80,6 @@
              key: index,
            });
          });
          console.log(this.data)
          // excel表格数据转换
          this.option.column[0].children = newval.map(obj => {
            return {
@@ -107,6 +106,11 @@
    codeClassifyOid:{
      handler(newval,oldval){
      }
    },
    value:{
      handler(newval,oldval){
        console.log('value',newval)
      }
    }
  },
  computed:{
@@ -125,16 +129,54 @@
      this.$emit('update:visible', false);
    },
    handleExcel(){
      if(this.value <= 0){
        this.$message.warning('请选择属性')
      }else {
        this.value.map(index => this.tableHeadData[index].prop).forEach((item, index) => {
          this.exportArr[`attrIdIndexMap[${index}]`] = item
        })
        if(this.radio === 0){
          if(this.selectRow.length<=0){
            this.ids=this.tableData.map(item => item.oid).join(',')
            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
            this.$message.warning('请选择要导出的模板')
          }else {
            //已选择多选
            const selectList=[]
            //已选择属性
            let exportArr={}
            this.ids = this.selectRow.map(item => item.oid).join(',')
            this.selectRow.forEach(item=>{
              selectList.push(
                item.oid
              )
            })
            if(this.value <= 0){
              this.tableHeadData.map(item => item.prop)
                .forEach((prop, index) => {
                  this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
                });
              exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArrTwo,limit:-1}).then(res=>{
                // console.log('res',res)
                if(res){
                  func.downloadFileByBlobHandler(res);
                  this.escHandler()
                }
              })
            }else {

              exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
                // console.log('res',res)
                if(res){
                  func.downloadFileByBlobHandler(res);
                  this.escHandler()
                }
              })

            }
            }
        }else if(this.radio === 1){
          if(this.value <= 0){
            this.tableHeadData.map(item => item.prop)
              .forEach((prop, index) => {
                this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
              });
            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArrTwo,limit:-1}).then(res=>{
              // console.log('res',res)
              if(res){
                func.downloadFileByBlobHandler(res);
@@ -142,34 +184,14 @@
              }
            })
          }else {
            //已选择多选
            const selectList=[]
            //已选择属性
            let exportArr={}
            const ids = this.selectRow.map(item => item.oid).join(',')
            this.selectRow.forEach(item=>{
              selectList.push(
                item.oid
              )
            })
            exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
              // console.log('res',res)
              if(res){
                func.downloadFileByBlobHandler(res);
                this.escHandler()
              }
            })

          }
        }else if(this.radio === 1){
          this.ids=this.tableData.map(item => item.oid).join(',')
          exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
            // console.log('res',res)
            if(res){
              func.downloadFileByBlobHandler(res);
              this.escHandler()
            }
          })
        }else if(this.radio === 2){
          const input = this.pageExport.trim();
          let start, end;
@@ -195,17 +217,28 @@
              return;
            }
          }
          exportCode({ codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: this.limit, page: start, endPage: end }).then((res) => {
            // console.log('res',res)
            if (res) {
              func.downloadFileByBlobHandler(res);
              this.escHandler()
            }
          });
          if(this.value >=1 ){
            exportCode({ codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: this.limit, page: start, endPage: end }).then((res) => {
              // console.log('res',res)
              if (res) {
                func.downloadFileByBlobHandler(res);
                this.escHandler()
              }
            });
          }else {
            this.tableHeadData.map(item => item.prop)
              .forEach((prop, index) => {
                this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
              });
            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArrTwo,limit:this.limit,page: start, endPage: end}).then(res=>{
              // console.log('res',res)
              if(res){
                func.downloadFileByBlobHandler(res);
                this.escHandler()
              }
            })
          }
        }

      }

    },
  }
}

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

@@ -875,6 +875,7 @@
    updataSumbit(val){
      this.DataVisible = false;
      upSaveCode(val).then(res=>{
        res.data.data.copyfromversion=this.rowOid
        this.$nextTick(() => {
          this.onLoad()
        })