修改样式、附件列表

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

@@ -1,90 +1,96 @@
<template>
  <basic-container>
    <div class="testbox">
      <div>
        <!-- <el-button plain size="small" type="primary" @click="addvisible = true">增加
        </el-button>
        <el-button plain size="small" type="primary" @click="editHandler">编辑
        </el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">批量导入申请</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">历史数据导入</el-button>
        <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">批量申请编码</el-button>
        <el-button plain size="small" type="primary">批量发布</el-button>
        <el-button plain size="small" type="primary">查看流程历史</el-button>
        <el-button plain size="small" type="primary">删除</el-button>
        <el-button plain size="small" type="primary" @click="setHandler">发布</el-button>
        <el-button plain size="small" type="primary" @click="DataChange">数据更改</el-button>
        <el-button plain size="small" type="primary" @click="huishouHandler">回收</el-button>
        <el-button plain size="small" type="primary" @click="openD">导出
        </el-button>
        <el-button plain size="small" type="primary" @click="findHandler">查询
        </el-button>
        <el-button plain size="small" type="primary" @click="similarHandler">相似项查询</el-button>
        <el-button plain size="small" type="primary">刷新</el-button>
        <el-input placeholder="请输入关键字按回车查询" size="small"
          style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->

      </div>
      <el-row style="height: 700px; width: 100%">
    <div class="main">
    <div class="top">
      <div class="testbox">
        <div>
          <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
                     @click="handelBtnClick(item)">{{
              item.name
            }}
          <!-- <el-button plain size="small" type="primary" @click="addvisible = true">增加
          </el-button>
          <el-input v-model="WupinFindValue" placeholder="请输入关键字按回车查询"
                    size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
          <el-button plain size="small" type="primary" @click="editHandler">编辑
          </el-button>
          <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">批量导入申请</el-button>
          <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">历史数据导入</el-button>
          <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">批量申请编码</el-button>
          <el-button plain size="small" type="primary">批量发布</el-button>
          <el-button plain size="small" type="primary">查看流程历史</el-button>
          <el-button plain size="small" type="primary">删除</el-button>
          <el-button plain size="small" type="primary" @click="setHandler">发布</el-button>
          <el-button plain size="small" type="primary" @click="DataChange">数据更改</el-button>
          <el-button plain size="small" type="primary" @click="huishouHandler">回收</el-button>
          <el-button plain size="small" type="primary" @click="openD">导出
          </el-button>
          <el-button plain size="small" type="primary" @click="findHandler">查询
          </el-button>
          <el-button plain size="small" type="primary" @click="similarHandler">相似项查询</el-button>
          <el-button plain size="small" type="primary">刷新</el-button>
          <el-input placeholder="请输入关键字按回车查询" size="small"
            style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->

        </div>
        <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
                  @cell-click="handleCellClick" @row-click="handleRowClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
          <el-table-column fixed type="selection" width="55"></el-table-column>
          <el-table-column fixed label="序号" type="index" width="55">
          </el-table-column>
          <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
                           :prop="item.prop" :show-overflow-tooltip="true"
                           :sortable="item.sortable"
                           :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
                           align="center">
          </el-table-column>
        </el-table>
      </el-row>
      <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                          :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
                          @submit="AddSumbit">
      </FormTemplateDialog>
      <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                          :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                          :visible.sync="editvisible"
                          type="edit" @submit="EditSumbit"></FormTemplateDialog>
      <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                          :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'已发布数据更改'"
                          :type="edit"
                          :visible.sync="DataVisible"></FormTemplateDialog>
      <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
      <advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
      <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
                            @save="handelTransferSave"></integration-transfer>
      <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
                           :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
        <el-row style="height: 700px; width: 100%">
          <div>
            <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
                       @click="handelBtnClick(item)">{{
                item.name
              }}
            </el-button>
            <el-input v-model="WupinFindValue" placeholder="请输入关键字按回车查询"
                      size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
          </div>
          <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
                    @cell-click="handleCellClick" @row-click="handleRowClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
            <el-table-column fixed type="selection" width="55"></el-table-column>
            <el-table-column fixed label="序号" type="index" width="55">
            </el-table-column>
            <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
                             :prop="item.prop" :show-overflow-tooltip="true"
                             :sortable="item.sortable"
                             :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
                             align="center">
            </el-table-column>
          </el-table>
        </el-row>
        <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                            :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
                            @submit="AddSumbit">
        </FormTemplateDialog>
        <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                            :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                            :visible.sync="editvisible"
                            type="edit" @submit="EditSumbit"></FormTemplateDialog>
        <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                            :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'已发布数据更改'"
                            :type="edit"
                            :visible.sync="DataVisible"></FormTemplateDialog>
        <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
        <advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
        <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
                              @save="handelTransferSave"></integration-transfer>
        <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
                             :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
      </div>
      <div class="block" style="display: flex; justify-content: flex-end">
        <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
                       :total="page.total" layout="total, sizes, prev, pager, next, jumper"
                       @size-change="handleSizeChange"
                       @current-change="handleCurrentChange">
        </el-pagination>
      </div>
      <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
      </BatchImport>
    </div>
    <div class="block" style="display: flex; justify-content: flex-end">
      <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
                     :total="page.total" layout="total, sizes, prev, pager, next, jumper"
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange">
      </el-pagination>
    <div class="bottom">
      <el-collapse v-model="visibleNames" accordion>
        <el-collapse-item title="附件列表" name="1">
          <fileInHtml :options="fileOptions"></fileInHtml>
        </el-collapse-item>
      </el-collapse>
    </div>
    <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
    </BatchImport>
    <el-collapse v-model="visibleNames">
      <el-collapse-item title="附件列表" name="1">
        <fileInHtml :options="fileOptions"></fileInHtml>
      </el-collapse-item>
    </el-collapse>
    </div>
  </basic-container>
</template>
<script>
import {MasterTable, TableData, FindData,addSaveCode,editSaveCode} from "@/api/GetItem";
import {MasterTable, TableData, FindData} from "@/api/GetItem";
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
@@ -158,7 +164,7 @@
          codeClassifyOid: ""
        }
      },
      visibleNames:['1'],
      visibleNames:[],
      visibleFile:false,
      visibleFlow: false,
      transferData: [],
@@ -230,8 +236,7 @@
    codeClassifyOid: {
      handler(newval, oldval) {
        this.codeClassifyOid = newval;
        this.parameter.vars.codeClassifyOid = newval;
        console.log('子',newval)
        this.parameter.vars.codeClassifyOid = newval
      },
      deep: true,
    },
@@ -268,6 +273,7 @@
    templateOid: {
      handler(newval, oldval) {
        this.parameter.code = newval;
        this.fileOptions.ownbizOid="1";
      },
      deep: true,
    },
@@ -443,7 +449,6 @@
    },
    //多选
    handleSelectionChange(row) {
      console.log(row)
      if (this.row) {
        this.rowOid = row[0].oid;
      } else {
@@ -455,6 +460,10 @@
        this.parameter.ids.push(item.oid);
      });
      console.log('  this.parameter.ids', this.parameter.ids)

      this.fileOptions.ownbizOid= row.oid;
      this.fileOptions.ownbizBtm=row.btmname;

    },
    //编辑
    editHandler() {
@@ -508,26 +517,16 @@
      }
    },
    //增加保存
    AddSumbit(val) {
    AddSumbit() {
      this.addvisible = false;
      console.log(val)
      addSaveCode(val).then(res=>{
        console.log(res)
        this.onLoad()
      })
    },
    EditSumbit(val) {
      this.editvisible = false;
      console.log(val)
      editSaveCode(val).then(res=>{
        console.log(res)
        this.onLoad()
      })
    },
    openBatchImport(type) {
      this.batchImportData.visible = true;
      this.batchImportData.type = type;
      this.batchImportData.codeClassifyOid = this.codeClassifyOid;
      this.batchImportData.visible = true
      this.batchImportData.type = type
      this.batchImportData.codeClassifyOid = this.codeClassifyOid
    }
  },
};
@@ -538,6 +537,7 @@
  .el-table--scrollable-x .el-table__body-wrapper {
    overflow: auto !important;
  }

  .el-table__fixed-right-patch {
    background-color: #f5f7fa !important;
  }
@@ -546,4 +546,21 @@
/deep/ .el-button {
  margin: 0 10px 10px 0;
}

.main {
  display: flex;
  flex-direction: column;
  height: calc(100vh - 150px);
  min-height: 400px;
}
.top {
  overflow-y: scroll;
  min-height: 55%;
}

.bottom {
  margin-top: 20px;
  max-height: 43%;
  overflow-y: scroll;
}
</style>

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

@@ -1,7 +1,7 @@
<template>
  <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
             :option="Treeoption"
             style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px"
             style="height: calc(100vh - 150px);"
             @node-click=" nodeClick"
  ></avue-tree>
</template>

 Source/UBCS-WEB/src/components/Tree/attrCrud.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
      <el-button-group>
      <!--新增-->
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">添加 {{ msg }}</el-button>
@@ -242,7 +242,7 @@
    </div>
    <el-table :data="ProData"
              style="width: 100%"
              :height='attrEditVisible == false && attrFlagChiledren==false?400 :750'
              height="280"
              @cell-click="handleCellClicks"
              @select="selectHandle"
              @selection-change="selectionChange"
@@ -936,13 +936,11 @@
        column: [
          {
            label: "属性英文名称",
            prop: "id",
            width:110
            prop: "id"
          },
          {
            label: "属性中文名称",
            prop: "name",
            width:110
            prop: "name"
          },
          {
            label: "长度",
@@ -1486,7 +1484,6 @@
    //业务类型选择
    businessSelect(selection, row) {
      this.busineSelectList = selection
      console.log(selection)
    },
    // 从业务类型中选择数据弹窗
    busineHandle() {
@@ -1590,6 +1587,8 @@
      }else if(column.property == 'verifyRule'){
        this.RulesForm.expressionTextt=this.CurrentCell.verifyRule;
        this.rulesVisible=true;
        console.log(this.CurrentCell.verifyRule)
        console.log(this.RulesForm.expressionText)
      }
    },
    saveRows() {
@@ -1816,9 +1815,7 @@
</script>

<style scoped lang="scss" >
.app {
   /deep/ .el-button {
     margin: 0 10px 10px 0;
     }
/deep/ .el-button {
  margin: 0 10px 10px 0;
}
</style>

 Source/UBCS-WEB/src/components/file/inDialog.vue

@@ -9,6 +9,7 @@
             :width="options.width|| '80%'">
    <fileContent
      :options="options"
      :ownbizOid="options.ownbizOid"
    ></fileContent>
  </el-dialog>
  </div>

 Source/UBCS-WEB/src/components/file/inHtml.vue

@@ -1,9 +1,8 @@
<template>
  <basic-container>
    <fileContent
      :options="options"
      :ownbizOid="options.ownbizOid"
    ></fileContent>
  </basic-container>
</template>

<script>

 Source/UBCS-WEB/src/components/file/main.vue

@@ -7,6 +7,7 @@
               :before-open="beforeOpen"
               :permission="permissionList"
               v-model="form"
               :height="options.height || 200"
               ref="crud"
               @row-del="rowDel"
               @search-change="searchChange"
@@ -67,13 +68,14 @@
import {validatenull} from "@/util/validate";

export default {
  props: ["options","visible"],
  props: ["options","visible","ownbizOid"],
  data() {
    return {
      form: {},
      query: {},
      params:{},
      loading: false,
      hasPage:this.options.hasPage||false,
      page: {
        pageSize: 10,
        currentPage: 1,
@@ -232,6 +234,12 @@
  mounted() {

  },
  watch:{
    ownbizOid(val){
      this.setParams()
      this.refreshChange()
    }
  },
  methods: {
    setFormItem(){
      /*this.options.formItems=[{
@@ -312,9 +320,9 @@
    setParams() {
      var queryMap = {
        currentButtonKey: 'VIEW',
        ownbizOid:this.options.ownbizOid || "share",
        ownBtmName:this.options.ownbizBtm || "share",
        fileDocClassify: this.options.fileDocClassify|| "ADMIN_SHARE",
        ownbizOid: this.options.ownbizOid || "share",
        ownBtmName: this.options.ownbizBtm || "share",
        fileDocClassify: this.options.fileDocClassify || "ADMIN_SHARE",
        fileDocClassifyName: this.options.fileDocClassifyName || "管理员共享文件"
      };
      if (this.options.where) {
@@ -330,6 +338,12 @@
      }
      this.page.pageSize = this.options.pageObject.limit;
      this.page.currentPage = this.options.pageObject.page;

      this.attachOption.column[1].data.ownbizOid = this.options.ownbizOid || "share";
      this.attachOption.column[1].data.ownBtmName = this.options.ownbizBtm || "share";
      this.attachOption.column[1].data.fileDocClassify = this.options.fileDocClassify || "ADMIN_SHARE";
      this.attachOption.column[1].data.fileDocClassifyName = this.options.fileDocClassifyName || "管理员共享文件"

    },
    handleUpload() {
      this.attachOption.column[1].data.fileOid='';
@@ -448,7 +462,7 @@
      this.page.pageSize = pageSize;
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
      this.onLoad(this.page);
    },
    onLoad(page, params={}) {
      this.loading = true;

 Source/UBCS-WEB/src/views/MasterData/items.vue

@@ -1,7 +1,7 @@
<template>
  <el-container>
    <el-aside>
      <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
      <basic-container style="overflow: hidden;">
        <!--          树组件-->
        <master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
          :currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
@@ -85,4 +85,14 @@
}
</script>

<style scoped></style>
<style scoped>
.el-container{
  height: 100%;
}
.el-aside {
  height: calc(100% - 30px);
}
.el-main {
  height: calc(100% - 30px);
}
</style>