Merge remote-tracking branch 'origin/master'

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

@@ -881,6 +881,8 @@
    },
    //增加保存
    AddSumbit(val) {
      console.log(val)
      val.ts = val.ts.toISOString().replace("Z", "");
      addSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.addvisible = false;

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

@@ -3,67 +3,87 @@
    <div v-if="this.crudArrayFlag" class="app" style="display: flex;flex-wrap: wrap; display: inline-block">
      <el-button-group>
        <!--新增-->
        <el-button
          v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag &&  (!checkStatus || crudLCStatus=='Editing' )"
          icon="el-icon-plus" plain size="small" type="primary" @click="busineHandle">添加 {{ msg }}
        <span v-if="permissionList.busineStatus">
           <el-button
             v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag &&  (!checkStatus || crudLCStatus=='Editing' )"
             icon="el-icon-plus" plain size="small" type="primary" @click="busineHandle">添加 {{ msg }}
        </el-button>
        </span>
        <!--        全屏编辑-->
        <el-button
          v-if=" attrEditVisible == false && attrFlagChiledren==false && editOpenFlag&&(!checkStatus || crudLCStatus=='Editing')"
          icon="el-icon-full-screen" size="small" @click="fullscreenHandle">全屏编辑
        <span v-if="permissionList.fullscreenStatus">
            <el-button
              v-if=" attrEditVisible == false && attrFlagChiledren==false && editOpenFlag&&(!checkStatus || crudLCStatus=='Editing')"
              icon="el-icon-full-screen" size="small" @click="fullscreenHandle">全屏编辑
        </el-button>
        <!--        验证规则-->
        </span>
        <span v-if="permissionList.ruleStatus">
           <!--        验证规则-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing' )&& editOpenFlag" icon="el-icon-info" size="small"
                   @click="ruleAddHandler">验证规则
        </el-button>
        <!--        属性分组-->
        </span>
        <span v-if="permissionList.attrStatus">
          <!--        属性分组-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-menu" size="small"
                   @click="attrVisibleHandle">属性分组
        </el-button>
       </span>
      </el-button-group>
      <el-button-group>
        <!--    保存-->
        <span v-if="permissionList.saveStatus">
           <!--    保存-->
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain
                   size="small"
                   type="success" @click.prevent="addsHandler">保存
        </el-button>
        </span>
        <!--    预览排序-->
        <el-button icon="el-icon-arrow-down" size="small" @click="orderHandle">预览排序</el-button>
        <!--    删除-->
        <el-button v-if="permissionList.orderStatus" icon="el-icon-arrow-down" size="small" @click="orderHandle">预览排序
        </el-button>
        <span v-if="permissionList.removeStatus">
           <!--    删除-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-delete" size="small"
                   @click="CrudRemove">删除
        </el-button>
        </span>
        <!--    重置-->
        <el-button icon="el-icon-refresh-right" size="small" @click="reset">重置</el-button>
        <el-button v-if="permissionList.resetStatus" icon="el-icon-refresh-right" size="small" @click="resetHandler">
          重置
        </el-button>
      </el-button-group>
      <el-button-group>
        <!--新增-->
        <!--        分类注入-->
       <span v-if="permissionList.injectStatus"><!--        分类注入-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-magic-stick"
                   size="small" @click="injectBtn">分类注入
        </el-button>
        <!--    组合规则-->
        </el-button></span>
        <span v-if="permissionList.isShowStatus"> <!--    组合规则-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-film" size="small"
                   @click="isShowHandler">组合规则
        </el-button>
        <!--        枚举注入-->
        </el-button></span>
        <span v-if="permissionList.enumStatus"> <!--        枚举注入-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-c-scale-to-original"
                   size="small" @click="enmuVisHandle">枚举注入
        </el-button>
        <!--    级联属性-->
                   size="small" @click="enumVisHandle">枚举注入
        </el-button></span>

        <span v-if="permissionList.cascadStatus">
               <!--    级联属性-->
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-coin" size="small"
                   @click="CascadeHandle">级联属性
        </el-button>
        </span>
      </el-button-group>

      <el-button-group>
        <!--    同步到其他模板-->
        <el-button icon="el-icon-share" size="small" @click="syncHandle">同步到其他模板</el-button>
        <el-button v-if="permissionList.syncStatus" icon="el-icon-share" size="small" @click="syncHandle">同步到其他模板
        </el-button>
      </el-button-group>

      <el-button-group>
        <!--    编码申请预览-->
        <el-button icon="el-icon-view" size="small" style="" @click="applicationHandle">编码申请预览</el-button>
        <el-button v-if="permissionList.applicationStatus" icon="el-icon-view" size="small" style=""
                   @click="applicationHandle">编码申请预览
        </el-button>

      </el-button-group>
      <!-- 是否开启编辑     -->
@@ -292,7 +312,6 @@
          <el-button size="small" type="primary" @click="addVisible=false">取消</el-button>
        </div>
      </el-dialog>

      <!--      参照配置-->
      <refer-config-dialog
        :display="referConfigVisble"
@@ -304,9 +323,9 @@
    <el-table v-if="this.crudArrayFlag"
              ref="referAttrCrud"
              v-loading="loading"
              border
              :data="ProData"
              :height="this.tableHeight"
              border
              style="width: 100%"
              @select="selectHandle"
              @cell-click="handleCellClicks"
@@ -382,6 +401,7 @@
import {getList} from "@/api/refer/table";
import func from "@/util/func";
import {getCurrentInstance} from "vue";
import {mapGetters} from "vuex";

export default {
  name: "attrCrud .vue",
@@ -642,7 +662,7 @@
        addBtn: false,
        header: false,
        align: 'center',
        columnBtn:false,
        columnBtn: false,
        menuAlign: 'center',
        column: [{
          label: '',
@@ -1179,7 +1199,7 @@
      List: [],
      option: {
        index: false,
        columnBtn:false,
        columnBtn: false,
        border: true,
        editBtn: false,
        selection: true,
@@ -1530,6 +1550,25 @@
    }
  },
  computed: {
    ...mapGetters(["permission"]),
    permissionList() {
      return {
        busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
        fullscreenStatus: this.vaildData(this.permission.classifyTree.attr_view_edit, false),
        ruleStatus: this.vaildData(this.permission.classifyTree.attr_rule, false),
        attrStatus: this.vaildData(this.permission.classifyTree.attr_group, false),
        saveStatus: this.vaildData(this.permission.classifyTree.attr_save, false),
        resetStatus: this.vaildData(this.permission.classifyTree.attr_reset, false),
        injectStatus: this.vaildData(this.permission.classifyTree.attr_inject, false),
        isShowStatus: this.vaildData(this.permission.classifyTree.attr_formrule, false),
        enumStatus: this.vaildData(this.permission.classifyTree.attr_enum, false),
        cascadStatus: this.vaildData(this.permission.classifyTree.attr_parentcode, false),
        syncStatus: this.vaildData(this.permission.classifyTree.attr_sync, false),
        applicationStatus: this.vaildData(this.permission.classifyTree.attr_application, false),
        orderStatus: this.vaildData(this.permission.classifyTree.attr_sort, false),
        removeStatus: this.vaildData(this.permission.classifyTree.attr_delete, false),
      }
    },
    attrOids() {
      let oids = [];
      this.attrSelectList.forEach(ele => {
@@ -1921,7 +1960,7 @@
      this.tableData.splice(row.$index, 1)
    },
    //枚举注入按钮
    enmuVisHandle() {
    enumVisHandle() {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板属性')
      } else if (this.attrSelectList < 1) {
@@ -2091,7 +2130,7 @@
      })
    },
    //表格重置
    reset() {
    resetHandler() {
      this.CrudRend()
    },
    //同步到其他模板
@@ -2183,8 +2222,9 @@
<style lang="scss" scoped>
//固定列高度
/deep/ .el-table__fixed {
  height: calc(100vh - 612px)!important;
  height: calc(100vh - 612px) !important;
}

///deep/ .el-table__fixed[v-if='editStyleFlag'] {
//  height: calc(100vh - 152px)!important; // 编辑状态下的高度
//}
@@ -2197,6 +2237,7 @@
  width: 10px;

}

// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
  background-color: #ececec;

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

@@ -8,16 +8,16 @@
          <div>
            <div style="display: flex; flex-direction: column;">
              <div style="display: flex;">
                <el-button plain size="small" type="primary" @click="TreeAdd">添加</el-button>
                <el-button plain size="small" type="primary" @click="TreeEdit">修改</el-button>
                <el-button plain size="small" type="primary" @click="TreeDel">删除</el-button>
                <el-button plain size="small" type="primary" @click="flushed">刷新</el-button>
                <el-button plain size="small" type="primary" @click="TreeAdd" v-if="permissionList.TreeAddStatus">添加</el-button>
                <el-button plain size="small" type="primary" @click="TreeEdit" v-if="permissionList.TreeEditStatus">修改</el-button>
                <el-button plain size="small" type="primary" @click="TreeDel" v-if="permissionList.TreeDelStatus">删除</el-button>
                <el-button plain size="small" type="primary" @click="flushed" v-if="permissionList.flushedStatus">刷新</el-button>
              </div>
              <div style="display: flex; margin-top: 10px">
                <el-button plain size="small" type="primary" @click="Enable">启用</el-button>
                <el-button plain size="small" type="primary" @click="Deactivate">停用</el-button>
                <el-button plain size="small" type="primary" @click.native="ImportExcel">导入</el-button>
                <el-button plain size="small" type="primary" @click="ExportExcel">导出</el-button>
                <el-button plain size="small" type="primary" @click="Enable" v-if="permissionList.EnableStatus">启用</el-button>
                <el-button plain size="small" type="primary" @click="Deactivate" v-if="permissionList.DeactivateStatus">停用</el-button>
                <el-button plain size="small" type="primary" @click.native="ImportExcel" v-if="permissionList.ImportExcelStatus">导入</el-button>
                <el-button plain size="small" type="primary" @click="ExportExcel" v-if="permissionList.ExportExcelStatus">导出</el-button>
              </div>
            </div>
            <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -104,9 +104,9 @@
                  </template>

            <template slot="menuLeft">
              <el-button plain size="small" type="primary" @click="FindeHanler">查询</el-button>
              <el-button plain size="small" type="primary" @click="TemRefresh">刷新</el-button>
              <el-button plain size="small" type="primary" @click="CloneBtn">从其它模板克隆</el-button>
              <el-button plain size="small" type="primary" @click="FindeHanler" v-if="permissionList.FindStatus">查询</el-button>
              <el-button plain size="small" type="primary" @click="TemRefresh" v-if="permissionList.TemRefreshStatus">刷新</el-button>
              <el-button plain size="small" type="primary" @click="CloneBtn" v-if="permissionList.CloneBtnStuatus">从其它模板克隆</el-button>
              <!--              查询对话框-->
           <el-dialog :visible.sync="FindFormVisible" append-to-body title="高级查询">
              <div>
@@ -401,12 +401,9 @@
} from "@/api/template/templateAttr";
import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";

import {mapGetters} from "vuex";
export default {
  name: "classifyTrees.vue",
  //使用inject接收参数
  //Treeoption左侧树新增表单项 Treedata左侧树节点 配置项 crudTreeOption右侧表格配置项 crudTreeData右侧表格显示内容
  //Treeform右侧表单配置项
  inject: ["crudTreeData"],
  data() {
    return {
@@ -764,7 +761,6 @@
    }
  },
  watch: {},
  //tab栏默认是表格
  mounted() {
    this.type = this.tabOption.column[0];
    this.getAttr();
@@ -779,6 +775,22 @@
    }, true)
  },
  computed: {
    ...mapGetters(["permission"]),
    permissionList(){
      return{
        TreeAddStatus:this.vaildData(this.permission.classifyTree.tree_add,false),
        TreeEditStatus:this.vaildData(this.permission.classifyTree.tree_edit,false),
        TreeDelStatus:this.vaildData(this.permission.classifyTree.tree_delete,false),
        flushedStatus:this.vaildData(this.permission.classifyTree.tree_break,false),
        EnableStatus:this.vaildData(this.permission.classifyTree.tree_enable,false),
        DeactivateStatus:this.vaildData(this.permission.classifyTree.tree_stop,false),
        ImportExcelStatus:this.vaildData(this.permission.classifyTree.tree_import,false),
        ExportExcelStatus:this.vaildData(this.permission.classifyTree.tree_export,false),
        FindStatus:this.vaildData(this.permission.classifyTree.manage_search,false),
        TemRefreshStatus:this.vaildData(this.permission.classifyTree.manage_break,false),
        CloneBtnStuatus:this.vaildData(this.permission.classifyTree.manage_clone,false),
      }
    },
    crudTreeOption() {
      return {
        index: true,
@@ -837,7 +849,6 @@
    }
  },
  created() {

  },
  methods: {
    //存储的业务类型关闭

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

@@ -1,5 +1,5 @@
<template>
  <basic-container class="code-total" style="height: 100%">
  <basic-container class="code-total" style=" height: 100%">
    <!-- 编码规则信息展示区域 -->
    <basic-container class="code-rule-container">
      <p
@@ -2605,9 +2605,9 @@
    onLoad(page, params = {}) {
      this.loading = true;
      gridCodeRule(
        page.currentPage, 
        page.pageSize, 
        Object.assign({},params,this.query), 
        page.currentPage,
        page.pageSize,
        Object.assign({},params,this.query),
      ).then((res) => {
        //console.log(res.data);
        const data = res.data.data;

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

@@ -157,15 +157,6 @@
      // 进行表单校验
      const formValidate = await this.$refs.FormTemplate.validate();
      if (!formValidate) return;
      let codeValidate = true;
      // 进行码值申请校验
      // if (this.showCodeApply) {
      //   codeValidate = await this.$refs.CodeApply.validate();
      //   if (!codeValidate) {
      //     this.activeName = "codeApply";
      //     return false;
      //   }
      // }
      let resembleQueryList = [];
      if (this.showResembleQuery && this.$refs.resembleQueryRef) {
        // 进行相似项查询
@@ -226,6 +217,7 @@
      resForm.codeRuleOid = this.codeRuleOid;
      resForm.templateOid = this.templateOid;
      // this.$emit("submit", resForm);
      resForm.ts = resForm.ts.toISOString().replace("Z", "");
      addSaveCode(resForm).then(res => {
        this.$nextTick(() => {
          this.addvisible = false;
@@ -233,7 +225,7 @@
          this.onLoad()
        })
      })
      console.log(resForm)
      // console.log(resForm)
    },
    getDefaultValueAndFormValues(form) {
      let defaultValue = {};

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

@@ -127,6 +127,7 @@
            label: "菜单名称",
            prop: "name",
            search: true,
            width:220,
            rules: [
              {
                required: true,