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

 Source/UBCS-WEB/src/api/modeling/cycle.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
import request from '@/router/axios';



export const getList = (params) => {

    return request({

        url: '/api/ubcs-omd/lifeCycle/page',

        method: 'get',

        params

    })

}

export default {

  getList

}


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

@@ -1,6 +1,7 @@
<template>
  <div>
    <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>
      <!--        å…¨å±ç¼–辑-->
@@ -9,16 +10,8 @@
      <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">验证规则</el-button>
      <!--        å±žæ€§åˆ†ç»„-->
      <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
        <!--        åˆ†ç±»æ³¨å…¥-->
        <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
          <!--    ç»„合规则-->
          <el-button size="small" @click="isShowHandler">组合规则</el-button>
        <!--        æžšä¸¾æ³¨å…¥-->
        <el-button size="small" @click="enmuVisHandle">枚举注入</el-button>
        <!--    çº§è”属性-->
        <el-button size="small" @click="CascadeHandle">级联属性</el-button>
        <!--    é¢„览排序-->
        <el-button size="small" icon="el-icon-arrow-down">预览排序</el-button>
      </el-button-group>
      <el-button-group>
      <!--        åˆ†ç±»æ³¨å…¥-->
      <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
        <!--    ç»„合规则-->
@@ -28,7 +21,9 @@
      <!--    çº§è”属性-->
      <el-button size="small" @click="CascadeHandle">级联属性</el-button>
      <!--    é¢„览排序-->
      <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
        <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
      </el-button-group>
      <el-button-group>
      <!--    ä¿å­˜-->
      <el-button size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <!--    åˆ é™¤-->
@@ -36,7 +31,8 @@
      <!--    é‡ç½®-->
      <el-button size="small" @click="reset" icon="el-icon-refresh-right">重置</el-button>
      <!--    åŒæ­¥åˆ°å…¶ä»–模板-->
      <el-button size="small" @click="syncHandle">同步到其他模板</el-button>
      <el-button size="small"@click="syncHandle" icon="el-icon-share">同步到其他模板</el-button>
      </el-button-group>
      <!--    ç¼–码申请预览-->
      <el-button size="small" @click="applicationHandle" style="">编码申请预览</el-button>
      <!--        éªŒè¯è§„则-->
@@ -241,6 +237,7 @@
              @select="selectHandle"
              @selection-change="selectionChange"
              v-if="this.crudArrayFlag"
              ref="referAttrCrud"
    >
      <el-table-column
        type="selection"
@@ -259,8 +256,8 @@
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
                    @blur="saveRows"></el-input>
          <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows"></el-input-number>
          <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
          <el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat'  && row[item.prop] ==''" @focus="DataChangeHandler">
            <el-option label="餐厅名" value="1"></el-option>
            <el-option label="订单号" value="2"></el-option>
@@ -270,7 +267,7 @@
            v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
            inactive-value="false">
          </el-switch>
          <span v-else >{{ row[item.prop] }}</span>
          <span v-else>{{ row[item.prop] }}</span>
        </template>
      </el-table-column>
      <el-table-column
@@ -1424,6 +1421,10 @@
      this.selectRow = row.$index;
      this.selectRowArr=row
    },
    // æŽ’序预览按钮
    orderHandle(){
      this.$refs.referAttrCrud.sort("orderNum");
    },
    //表格单选
    selectHandle(selection, row) {
      this.attrOid = row.oid;
@@ -1557,7 +1558,9 @@
    },
    //表格删除
    CrudRemove() {
      this.ProData.splice(this.attrRow.$index, 1)
      this.attrSelectList.forEach((item)=>{
        this.ProData.splice(item.$index, 1)
      })
    },
    //表格重置
    reset() {

 Source/UBCS-WEB/src/views/modeling/cycle.vue

@@ -1,6 +1,6 @@
<template>
  <basic-container class="">
    <avue-crud :data="data" :option="option" @refresh-change="gettableList" :table-loading="loading">
    <avue-crud :data="data" :option="option" @refresh-change="search" :table-loading="loading">
      <template slot-scope="scope" slot="menuLeft">
        <el-button
          type="primary"
@@ -54,12 +54,17 @@
</template>

<script>
import API from '@/api/modeling/cycle'
import CycleFlow from "@/components/flow-cycle/flowchartEditor.vue";
export default {
  name: "cycle.vue",
  components: { CycleFlow },
  data() {
    return {
      form: {
        page: 1,
        limit: 10
      },
      option: {
        border: true,
        align: "center",
@@ -152,11 +157,19 @@
      rowData: {},
      dialogWidth: "50%",
      type: "detail",
      loading: false
    };
  },
  created() {
    this.search()
  },
  methods: {
    gettableList() {
    search() {
      this.loading = true
      API.getList(this.form).then(res => {
        this.loading = false
        this.data = res.data.data
      })
    },
    openDialog(type, row) {
      if (type === "detail") {