Merge remote-tracking branch 'origin/master'

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

@@ -439,6 +439,8 @@
            fileDocClassifyName: '',
            hasDownload: true,
            hasUpload: true,
            hasEdit:true,
            hasDel:true,
            height: 'auto'
          }
        } else {

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

@@ -1,13 +1,13 @@
<template>
  <basic-container>
    <avue-crud :option="option"
      :table-loading="loading"
      :data="data"
      :page.sync="page"
      :before-open="beforeOpen"
      :permission="permissionList"
    <avue-crud ref="crud"
      v-model="form"
      ref="crud"
               :before-open="beforeOpen"
               :data="data"
               :option="option"
               :page.sync="page"
               :permission="permissionList"
               :table-loading="loading"
      @row-del="rowDel"
      @search-change="searchChange"
      @search-reset="searchReset"
@@ -18,44 +18,45 @@
      @refresh-change="refreshChange"
      @on-load="onLoad">
      <template slot="menuLeft">
        <el-button v-if="hasUpload" type="primary"
                   size="small"
        <el-button v-if="hasUpload" icon="el-icon-upload2"
                   plain
                   icon="el-icon-upload2"
                   size="small"
                   type="primary"
                   @click="handleUpload">上 传
        </el-button>
        <el-button v-if="hasEdit" type="primary"
                   size="small"
        <el-button v-if="hasEdit" icon="el-icon-edit"
                   plain
                   icon="el-icon-edit"
                   size="small"
                   type="primary"
                   @click="handleEdit">修 改
        </el-button>
        <el-button  v-if="hasDownload" type="primary"
                    size="small"
                    icon="el-icon-download"
        <el-button v-if="hasDownload" icon="el-icon-download"
                    plain
                   size="small"
                   type="primary"
                    @click="handleDownload">下 载
        </el-button>
        <el-button  v-if="hasDel" type="danger"
                   size="small"
                   icon="el-icon-delete"
        <el-button v-if="hasDel" icon="el-icon-delete"
                   plain
                   size="small"
                   type="danger"
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button v-if="hasDownload" type="text"
                   icon="el-icon-download"
      <template slot="menu" slot-scope="scope">
        <el-button v-if="hasDownload" icon="el-icon-download"
                   size="small"
                   type="text"
                   @click="handleDownload(scope.row)">下载
        </el-button>
      </template>
    </avue-crud>
    <el-dialog title="附件管理"
    <el-dialog :visible.sync="attachBox"
               append-to-body
               :visible.sync="attachBox"
               title="附件管理"
               width="555px">
      <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-before="uploadBefore"  :upload-after="uploadAfter" :upload-error="uploadError">
      <avue-form ref="form" v-model="attachForm" :option="attachOption" :upload-after="uploadAfter"
                 :upload-before="uploadBefore" :upload-error="uploadError">
      </avue-form>
    </el-dialog>
  </basic-container>
@@ -83,6 +84,7 @@
      },
      attachBox: false,
      selectionList: [],
      //默认为null全部是true
      hasUpload:validatenull(this.options.hasUpload) ? true :this.options.hasUpload,
      hasEdit:validatenull(this.options.hasEdit) ? true :this.options.hasEdit,
      hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
@@ -96,6 +98,7 @@
        border: true,
        index: true,
        viewBtn: true,
        refreshBtn: false,
        selection: true,
        dialogClickModal: false,
        column: [
@@ -238,7 +241,7 @@
    ownbizOid(val){
      this.setParams()
      this.refreshChange()
    }
    },
  },
  methods: {
    setFormItem(){

 Source/UBCS-WEB/src/const/code/mdmrule.js

@@ -2,6 +2,7 @@
  tip: false,
  searchShow: true,
  searchMenuSpan: 6,
  height:340,
  border: true,
  index: true,
  viewBtn: false,

 Source/UBCS-WEB/src/views/code/code.vue

@@ -2,7 +2,7 @@
  <basic-container class="code-total" style=" height: 100%">
    <!-- 编码规则信息展示区域 -->
    <basic-container class="code-rule-container">
      <div style="height: 40vh;overflow: auto;">
      <div style="height: 55vh;overflow: auto;">
        <p
          style="
          margin-top: -5px;
@@ -220,7 +220,7 @@

    <!-- 基础码段展示区域 -->
    <basic-container class="code-basicsec-container">
      <div style="height: 38.5vh;overflow: auto">
      <div style="height: 23.5vh;overflow: auto">
        <p
          style="margin-top: -5px;
          margin-bottom: 4px;
@@ -1306,7 +1306,6 @@
      </refer-config-dialog>
    </el-dialog>

    <!--自定义流水参照组件-->

  </basic-container>
</template>
@@ -1408,7 +1407,7 @@
        showField: 'customCodeSerialClassText',
        field: 'customCodeSerialClass',
        fieldMap: {
          serialType: "serialType"
          serialType: "serialType",
        },
        placeholder: '请选择自定义流水',
        options: {
@@ -1765,7 +1764,7 @@
        this.form[data.field] = data.value || "";
        this.form[data.showField] = data.text || "";
        this.form.serialType = data.rawData[0].serialType || "";

        this.form.customCodeSerialType = data.rawData[0].serialType || "";
      }
    },
    /** 转移规则所有者对话框 */
@@ -2837,7 +2836,6 @@
    },
    /** 打开新增或编辑基础码段对话框*/
    openBasicDialog(condition, row) {
      //console.log(row);
      if (condition == "add") {
        this.basicSecDialogTitle = "添加码段信息";
        this.showbtn = true;

 Source/UBCS-WEB/src/views/docking/info.vue

@@ -93,6 +93,14 @@
      }, {
        label: 'Json', value: 'json'
      }],
      //内容类型
      contentTypeList: [{
        label:'application/json',value:'application/json'
      },{
        label:'application/x-www-form-urlencoded',value:'application/x-www-form-urlencoded'
      },{
        label:'multipart/form-data',value:'multipart/form-data'
      }],
      //推送类型
      pushTypeList: [{value: '1', label: '数据推送'},
        {value: '2', label: '分类推送'},
@@ -250,6 +258,14 @@
          sortable: true,
          width: 150
        }, {
          label: '内容类型',
          prop: 'contentType',
          sortable: true,
          width: 150,
          formatter: (d) => {
            return this.contentTypeList[d.contentType]
          }
        },{
          label: '系统描述',
          prop: 'description',
          width: 150

 Source/UBCS-WEB/src/views/docking/infoForm.vue

@@ -28,6 +28,13 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="内容类型" prop="contentType">
          <el-select v-model="formData.contentType" placeholder="请选择">
            <el-option v-for="item in contentTypeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-divider></el-divider>
        <div v-if="formData.dataFlowType=='push'">
          <el-form-item  label="分类选择" prop="classifyName">
            <vciWebRefer
@@ -105,25 +112,13 @@
              @setReferValue="setReferValue"
            ></vciWebRefer>
          </el-form-item>
        </div>
        <el-form-item label="接口方式" prop="interfaceType">
          <el-select v-model="formData.interfaceType" clearable placeholder="请选择">
            <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item v-if="formData.pushType=='1'" label="是否推送集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item v-if="formData.pushType=='3'" label="是否申请集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item  v-if="formData.pushType=='4'" label="是否维护集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item  v-if="formData.pushType=='7'" label="是否查询集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        </div>
        <el-form-item label="系统描述"  style="width: 850px;" prop="description">
          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
        </el-form-item>
@@ -153,6 +148,18 @@
        </el-form-item>
        <el-form-item v-if="formData.interfaceType=='classPath'" label="类路径" prop="classPath">
          <el-input v-model="formData.classPath" ></el-input>
        </el-form-item>
        <el-form-item v-if="formData.pushType=='1'" label="是否推送集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item v-if="formData.pushType=='3'" label="是否申请集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item  v-if="formData.pushType=='4'" label="是否维护集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-form-item  v-if="formData.pushType=='7'" label="是否查询集团码" prop="isGroupCodeFlag">
          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
        </el-form-item>
        <el-tabs v-model="activeName" @tab-click="tabClick">
          <el-tab-pane label="参数对象" name="paramTab">
@@ -255,6 +262,14 @@
      }, {
        label: 'Json', value: 'json'
      }],
      //内容类型
      contentTypeList: [{
        label:'application/json',value:'application/json'
      },{
        label:'application/x-www-form-urlencoded',value:'application/x-www-form-urlencoded'
      },{
        label:'multipart/form-data',value:'multipart/form-data'
      }],
      dataFlowTypeList: [{
        label: '推送', value: 'push'
      }, {
@@ -316,6 +331,9 @@
        ],
        cxfaxis: [
          {required: true, message: '请输入cxfaxis', trigger: 'blur'}
        ],
        contentType: [
          {required: true, message: 'contentType', trigger: 'blur'}
        ]
      },
      // 表格配置