Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS-WEB/src/api/work/process.js

@@ -23,13 +23,13 @@
  })
}

export const leaveDetail = (businessId) => {
export const leaveDetail = (businessId,processInstanceId) => {
  return request({
    url: '/api/ubcs-desk/process/leave/detail',
    method: 'get',
    params: {
      businessId

      businessId,
      processInstanceId
    }
  })
}

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -558,6 +558,7 @@
          value: formItem.defaultValue,
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
          display: !formItem.hidden,
          maxlength: formItem.maxlength,
          filterable: true,

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

@@ -15,12 +15,18 @@
                  item.name
                }}
              </el-button>
              <span v-if="tableHeadFindData.length > 0">
              <el-select v-model="keyWordFind" slot="prepend" placeholder="请选择" size="small">
                <el-option v-for="item in tableHeadFindData" :label="item.label" :value="item.prop"></el-option>
              </el-select>
              <el-input v-model="WupinFindValue" placeholder="请输入关键字按回车查询"
                        size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
                        @keyup.enter.native="tableFindInp"  v-if="tableData.length != 0"></el-input>
              <span style="margin-left: 10px" v-if="tableData.length != 0">
                        @keyup.enter.native="tableFindInp"></el-input>
              </span>
              <span v-if="tableHeadFindData.length > 0" style="margin-left: 10px">
               <p style="font-size: 13px;display: inline-block;"> 状态：</p>
                <el-select v-model="statusSelect" slot="prepend" placeholder="请选择" size="small" @change="cellSelectHandler">
                <el-select slot="prepend" v-model="statusSelect" placeholder="请选择" size="small"
                           @change="cellSelectHandler">
                <el-option label="全部" value="all"></el-option>
                <el-option label="已发布" value="Released"></el-option>
                <el-option label="编辑中" value="Editing"></el-option>
@@ -28,13 +34,13 @@
                <el-option label="审核中" value="Auditing"></el-option>
              </el-select></span>
            </div>
            <el-table  ref="dataTable" v-loading="isLoading" :data="tableData"
            <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
                      :height="tableHeight"
                      @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
                      @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
                      @sort-change="sortChange">
              <el-table-column fixed type="selection" width="55" v-if="tableData.length != 0"></el-table-column>
              <el-table-column fixed label="序号" type="index" width="55" v-if="tableData.length != 0">
              <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
              <el-table-column v-if="tableData.length != 0" 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"
@@ -63,19 +69,24 @@
                              :type="edit"
                              :visible.sync="DataVisible"></FormTemplateDialog>
          <!--          发布-->
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow" @onLoad="onLoad"></set-personnel>
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"
                         @onLoad="onLoad"></set-personnel>
          <!--          停用-->
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleDeactivate" @onLoad="onLoad"></set-personnel>
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleDeactivate"
                         @onLoad="onLoad"></set-personnel>
          <!--          启用-->
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleEnable" @onLoad="onLoad"></set-personnel>
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleEnable"
                         @onLoad="onLoad"></set-personnel>
          <!--          回收-->
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleRecovery" @onLoad="onLoad"></set-personnel>
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleRecovery"
                         @onLoad="onLoad"></set-personnel>
          <!--          高级查询-->
          <advanced-query :options="this.options" :visible.sync="findvisible"
                          @echoContion="echoContion"></advanced-query>
          <!--          导出-->
          <MasterTransfer :codeClassifyOid="codeClassifyOid" :limit="page.pageSize" :templateOid="templateOid" :selectRow="selectRow"
                          :tableData="tableData" :tableHeadData="tableHeadFindData"
          <MasterTransfer :codeClassifyOid="codeClassifyOid" :limit="page.pageSize" :selectRow="selectRow"
                          :tableData="tableData"
                          :tableHeadData="tableHeadFindData" :templateOid="templateOid"
                          :visible.sync="dialogPush"></MasterTransfer>
          <!--          相似项-->
          <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
@@ -90,7 +101,8 @@
        </div>
      </div>
      <div>
        <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible" :resetTable="CrudRend">
        <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
                     :visible.sync="batchImportData.visible">
        </BatchImport>
      </div>
      <div class="bottom">
@@ -104,8 +116,8 @@
  </basic-container>
</template>
<script>
import {MasterTable, TableData, FindData, addSaveCode, editSaveCode,deleteCode} from "@/api/GetItem";
import {processTS,changeStatus} from "@/api/template/setPersonnel"
import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
@@ -165,7 +177,10 @@
  },
  data() {
    return {
      statusSelect:"",
      // 状态搜索
      statusSelect: "all",
      // 关键字查询
      keyWordFind:"",
      searchResults: [],
      //首页右侧搜索
      WupinFindValue: "",
@@ -245,18 +260,18 @@
        hasUpload: true,
        height: 100
      },
      result:''
      result: ''
    };
  },
  computed: {},
  created() {
   const index = this.$route.query.id.indexOf('@');
   this.result = this.$route.query.id.substring(0, index);
    const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
    this.result = this.$route.query.id.substring(index);
  },
  mounted() {
  },
  activated() {
   this.doLayout()
    this.doLayout()
  },
  updated() {
    this.doLayout()
@@ -276,7 +291,8 @@
    },
    tableDataArray: {
      handler(newval, oldval) {
        this.statusSelect=''
        this.keyWordFind='';
        this.WupinFindValue=''
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout()
@@ -326,8 +342,24 @@
  },
  methods: {
    //状态搜索
    cellSelectHandler(row){
      console.log(row)
    cellSelectHandler(row) {
      if (row === 'all') {
        this.cellStatusFind()
      } else {
        this.cellStatusFind(row)
      }
    },
    cellStatusFind(lcstatus) {
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
        page: this.page.currentPage,
        limit: this.page.pageSize,
        'conditionMap[lcstatus]': lcstatus
      }).then(res => {
        console.log(res)
        this.tableData = res.data.data
      })
    },
    //展开附件
    handleCollapse(activeNames) {
@@ -402,11 +434,11 @@
            showMessage = false;
          } else if (showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.data.records && res.data.data.records.length!=0)  {
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-发布['+this.result+'-' + this.selectRow[0].name + ']';
                this.parameter.template = this.userName + '-申请[' + this.result + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'PUBLIC';
                this.parameter.code=this.templateOid
                this.parameter.code = this.templateOid
                this.title = '流程审批'
                this.visibleFlow = true;
              } else {
@@ -416,8 +448,8 @@
                  type: 'warning'
                }).then(() => {
                  const oid = this.selectRow.map(obj => obj.oid).join(",");
                  changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Released' }).then(res => {
                    if(res.data.code == 200 ){
                  changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
                    if (res.data.code == 200) {
                      this.$message.success('发布成功')
                      this.onLoad()
                    }
@@ -447,16 +479,16 @@
          if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) {
            this.$message.warning('选择的数据中状态无需再执行当前操作');
            showMessage = false;
          }  else if (this.selectRow.length >=1 && !hasEditing  && showMessage) {
          } else if (this.selectRow.length > 1 && !hasEditing && showMessage) {
            this.$message.warning('您选择的数据全部为【发布状态】才可以发起流程');
            showMessage = false;
          } else if (this.selectRow.length > 1 && hasEditing && showMessage) {
            processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
              if (res.data.records != [] && res.data.data.records.length!=0) {
          } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-停用['+this.result+'-' + this.selectRow[0].name + ']';
                this.parameter.template = this.userName + '-停用[' + this.result + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'DISABLE';
                this.parameter.code=this.templateOid
                this.parameter.code = this.templateOid
                this.title = '停用（冻结）编码数据'
                this.visibleDeactivate = true;
              } else {
@@ -468,12 +500,12 @@
                    type: 'warning'
                  }).then(() => {
                    const oid = this.selectRow.map(obj => obj.oid).join(",");
                      changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Disabled' }).then(res => {
                        if(res.data.code == 200 ){
                          this.$message.success('停用成功')
                          this.onLoad()
                        }
                      });
                    changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Disabled'}).then(res => {
                      if (res.data.code == 200) {
                        this.$message.success('停用成功')
                        this.onLoad()
                      }
                    });
                  }).catch(() => {
                    this.$message({
                      type: 'info',
@@ -483,7 +515,7 @@
                }
              }
            });
          }else {
          } else if(this.selectRow.length == 1 && !hasEditing && showMessage ) {
            this.$message.warning('您选择的数据为【发布状态】才可以发起流程')
          }
        });
@@ -500,14 +532,14 @@
          if (this.selectRow.length === 1 && item.lcstatus !== "Disabled" && showMessage) {
            this.$message.warning('选择的数据中状态无需再执行当前操作');
            showMessage = false;
          } else if (this.selectRow.length >=1 && hasEditing && showMessage) {
            processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
              if (res.data.data.records && res.data.data.records.length!=0)  {
                this.parameter=res.data.data.records[0]
          } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.parameter = res.data.data.records[0]
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-启用['+this.result+'-' + this.selectRow[0].name + ']';
                this.parameter.template = this.userName + '-启用[' + this.result + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'Released';
                this.parameter.code=this.templateOid
                this.parameter.code = this.templateOid
                this.title = '启用编码数据'
                this.visibleDeactivate = true;
              } else {
@@ -519,8 +551,8 @@
                    type: 'warning'
                  }).then(() => {
                    const oid = this.selectRow.map(obj => obj.oid).join(",");
                    changeStatus({ oid: oid, btmname: this.result, lcStatus: 'Released' }).then(res => {
                      if(res.data.code == 200 ){
                    changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
                      if (res.data.code == 200) {
                        this.$message.success('启用成功')
                        this.onLoad()
                      }
@@ -534,7 +566,7 @@
                }
              }
            });
          } else if (this.selectRow.length >1 && !hasEditing  && showMessage) {
          } else if (this.selectRow.length > 1 && !hasEditing && showMessage) {
            this.$message.warning('您选择的数据全部为【停用状态】才可以发起流程');
            showMessage = false;
          }
@@ -557,14 +589,14 @@
          if (this.selectRow.length === 1 && item.lcstatus == "TakeBack" && showMessage) {
            this.$message.warning('选择的数据中状态无需再执行当前操作');
            showMessage = false;
          } else if (this.selectRow.length >=1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
          } else if (this.selectRow.length >= 1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
            //disabledCount 和 releasedCount 中任意一个等于 this.selectRow 数组的长度则表示全部是同一种状态，返回 true 如果disabledCount 和 releasedCount 都大于0，则表示既有Disabled也有Released返回 true
            processTS({ templateId: this.templateOid, buttonTypeKey: 'PUBLIC' }).then(res => {
              if (res.data.records != [] && res.data.data.records.length!=0) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + '-回收['+this.result+'-' + this.selectRow[0].name + ']';
                this.parameter.template = this.userName + '-回收[' + this.result + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'TakeBack';
                this.parameter.code=this.templateOid
                this.parameter.code = this.templateOid
                this.title = '回收编码数据'
                this.visibleDeactivate = true;
              } else {
@@ -576,8 +608,8 @@
                    type: 'warning'
                  }).then(() => {
                    const oid = this.selectRow.map(obj => obj.oid).join(",");
                    changeStatus({ oid: oid, btmname: this.result, lcStatus: 'TakeBack' }).then(res => {
                      if(res.data.code == 200 ){
                    changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'TakeBack'}).then(res => {
                      if (res.data.code == 200) {
                        this.$message.success('回收成功')
                        this.onLoad()
                      }
@@ -591,10 +623,10 @@
                }
              }
            });
          } else if (showMessage && this.selectRow.length >1 && !(disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0)) {
          } else if (showMessage && this.selectRow.length > 1 && !(disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0)) {
            this.$message.warning('您选择的数据全部为【停用状态或发布状态】才可以发起流程');
            showMessage = false;
          }else if(showMessage){
          } else if (showMessage) {
            this.$message.warning('您选择的数据为【停用状态或发布状态】才可以发起流程')
          }
        });
@@ -634,11 +666,13 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        const list=[];
        this.selectRow.forEach((item)=>{list.push(item.oid)})
        deleteCode({codeClassifyOid:this.codeClassifyOid,oidList:list}).then(res=>{
        const list = [];
        this.selectRow.forEach((item) => {
          list.push(item.oid)
        })
        deleteCode({codeClassifyOid: this.codeClassifyOid, oidList: list}).then(res => {
          console.log(res)
          if(res.data.code === 200){
          if (res.data.code === 200) {
            this.$message({
              type: 'success',
              message: '删除成功!'
@@ -740,6 +774,7 @@
    //多选
    handleSelectionChange(list) {
      this.selectRow = list;
      console.log(this.selectRow)
      this.parameter.ids = [];
      list.forEach((item) => {
        this.parameter.ids.push(item.oid);
@@ -834,13 +869,16 @@
        this.$message.warning('输入值不能为空')
        return;
      }
      this.tableData = this.searchResults.filter(item => {
        if (typeof item.name === 'string') {
          return item.name.includes(this.WupinFindValue);
        } else {
          return false; // item.name不是字符串类型，返回false
        }
      });
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
        page: this.page.currentPage,
        limit: this.page.pageSize,
        [ 'conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
      }).then(res => {
        console.log(res)
        this.tableData = res.data.data
      })
    }

  }

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

@@ -332,6 +332,7 @@
<script>
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
import {getList} from "@/api/refer/table";
import func from "@/util/func";

export default {
  name: "attrCrud .vue",
@@ -1686,14 +1687,63 @@
    },
    //保存
    addsHandler(event) {
      batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
        this.$message.success('保存成功')
        this.editOpenFlag=false;
        // 调用父组件修改按钮状态
        this.$emit('editCloseChildren')
      }).catch(()=>{
        this.$message.warning('保存失败，请查看控制台输出！')
      this.$refs.referAttrCrud.sort("orderNum");
      var ischeck = true;
      console.log(this.ProData)
      this.ProData.forEach((item,index)=>{
        if((item.requireFlag && item.requireFlag.toString()=='true') && (item.readOnlyFlag && item.readOnlyFlag.toString()=='true')){
          this.$message.warning(item.name+"("+item.id+")必输的属性不能是只读");
          console.log(item)
          ischeck=false;
          return;
        }
        var num=0;
        if(item.componentRule){
          //组合规则
          num++
        }
        if(item.enumString || item.enumId){
          //枚举
          num++
        }
        if(item.referConfig || item.referBtmId){
          //参照
          num++
        }
        if(item.codeDateFormat){
          //时间格式
          num++
        }
        if(item.classifyInvokeLevel){
          //分类注入
          num++
        }
        if(num>1 && ischeck){
          this.$message({
            showClose: true,
            message: item.name+"("+item.id+") 属性只能是组合规则，枚举，参照，时间格式，分类注入中的一种",
            type: 'warning'
          });
          ischeck=false;
          return;
        }
      })
      if(!ischeck){
        return ;
      }
      // 新函数用于执行batchAddSave方法
      const executeBatchAddSave = () => {
        batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
          this.$message.success('保存成功')
          this.editOpenFlag=false;
          // 调用父组件修改按钮状态
          this.$emit('editCloseChildren')
        }).catch(()=>{
          this.$message.warning('保存失败，请查看控制台输出！')
        });
      }
      // 所有if条件和逻辑通过后调用executeBatchAddSave函数
      executeBatchAddSave();
    },
    //表格行编辑
    handleCellClicks(row, column) {

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

@@ -24,7 +24,7 @@
          </div>
        </div>
        <!--        树节点添加对话框-->
        <el-dialog :title="this.TreeFlag ? '添加分类' :'添加主题库'" :visible.sync="TreeAddFormVisible"  v-loading="AddLoading" append-to-body
        <el-dialog :title="this.TreeFlag ? '添加分类' :'添加主题库'" :before-close="TreeEscHandler" :visible.sync="TreeAddFormVisible"  v-loading="AddLoading" append-to-body
                   style="width: 1700px;margin: auto">
          <el-form :model="TreeAddform" :rules="rules">
            <el-form-item :label="this.TreeFlag ? '分类编号：' :'主题库编号：'" label-width="150px" style="display: inline-block" prop="id">
@@ -52,7 +52,7 @@
            </el-form-item>
          </el-form>
          <div slot="footer" class="dialog-footer">
            <el-button @click="TreeAddFormVisible = false">取 消</el-button>
            <el-button @click="TreeEscHandler">取 消</el-button>
            <el-button type="primary" @click="TreeAddHandler">确 定</el-button>
          </div>
        </el-dialog>
@@ -354,10 +354,10 @@
  inject: ["crudTreeData"],
  data() {
    return {
      masterRow:0,
      masterRow:null,
      AddLoading:false,
      // 定义一个变量来保存树请求的数量
      requestCount:0,
      requestCount:null,
      //导入状态框
      ThemeImportVisible:false,
      selectRow:'',
@@ -965,6 +965,7 @@
    },
    //业务类型多选
    btmSelect(row){
      this.masterRow=row.$index;
      this.btmSelectList=row;
      this.btmName=row.name;
      this.btmOid=row.id;
@@ -1041,6 +1042,11 @@
        loading.close();
      }
    },
    //树节点取消事件
    TreeEscHandler(){
      this.TreeAddform={};
      this.TreeAddFormVisible=false
    },
    //树节点添加事件
    TreeAddHandler() {
      const data = this.TreeAddform;
@@ -1057,6 +1063,9 @@
          });
          this.getAttr();
          this.TreeAddFormVisible = false;
          //添加完成后右侧清空
          this.ProData=[];
          this.Formlist=[];
        })
        .catch((res) => {
          this.$message({

 Source/UBCS-WEB/src/router/views/index.js

@@ -80,7 +80,7 @@
  redirect: '/work/process/leave/form',
  children: [{
    path: 'form/:processDefinitionId',
    name: '请假流程',
    name: '发布流程',
    meta: {
      i18n: 'work'
    },
@@ -88,7 +88,7 @@
      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
  }, {
    path: 'handle/:taskId/:processInstanceId/:businessId',
    name: '处理请假流程',
    name: '处理发布流程',
    meta: {
      i18n: 'work'
    },
@@ -96,7 +96,7 @@
      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
  }, {
    path: 'detail/:processInstanceId/:businessId',
    name: '请假流程详情',
    name: '发布流程详情',
    meta: {
      i18n: 'work'
    },

 Source/UBCS-WEB/src/views/work/process/leave/detail.vue

@@ -91,7 +91,7 @@
            this.flowList = data.data;
          }
        })
        leaveDetail(this.businessId).then(res => {
        leaveDetail(this.businessId,this.processInstanceId).then(res => {
          const data = res.data;
          if (data.success) {
            this.form = data.data;