Merge remote-tracking branch 'origin/master'

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

@@ -10,8 +10,7 @@
          <el-radio :label="1">全部</el-radio>
          <el-radio :label="2">页码</el-radio>
        </el-radio-group>
        <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport"
                                                                      style="width: 150px"></el-input> （输入页码或者页面范围，如：1-10)）</span>
        <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" style="width: 150px"></el-input> （输入页码或者页面范围，如：1-10）</span>
      </div>
    </div>
    <div style="text-align: center">

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

@@ -1,10 +1,11 @@
<template>
  <div class="app">
  <div class="app" style="display: flex;">
    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
      <template slot-scope="{ node }">
        <span style="display: inline-block;">{{ node.label }}</span>
      </template>
    </avue-tree>
    <div style="display: inline-block;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></div>
  </div>
</template>

@@ -206,4 +207,10 @@
  border-radius: 20px;
  border: #ececec;
}
.refresh-icon {
  color: #409EFF;
  margin-top: 8px;
  margin-left: 6px;
  font-size: 18px;
}
</style>

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

@@ -11,7 +11,7 @@
                         v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
                         :key="index" plain size="small"
                         type="primary"
                         @click="handelBtnClick(item)">{{
                         @click="handleBtnClick(item)">{{
                  item.name
                }}
              </el-button>
@@ -470,10 +470,10 @@
    openVis(visible) {
      this[visible] = true
    },
    handelBtnClick(event) {
    handleBtnClick(event) {
      const {uniqueFlag} = event
      this.$nextTick(() => {
        if (uniqueFlag === 'CODEADD') return this.addvisible = true
        if (uniqueFlag === 'CODEADD') return this.addSaveHandler()
        if (uniqueFlag === 'CODEEDIT') return this.editHandler()
        if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
        if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
@@ -500,6 +500,12 @@
        //  if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
      });
    },
    addSaveHandler(){

      this.$nextTick(() => {
        this.addvisible = true;
      });
    },
    //申请集团码数据
    applyGroupCode() {
      if (this.selectRow.length <= 0) {

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

@@ -73,10 +73,10 @@
                search: true,
                dicData: [{
                  label: '申请',
                  value: 1
                  value: '1'
                }, {
                  label: '更改',
                  value: 2
                  value: '2'
                }]
              }, {
                label: '申请单数据信息',