wangting
2023-07-26 6804f7887609dd881ed4b96a8acbb91524896a8d
取消模板状态验证
已修改4个文件
210 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Tree/attrCrud.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/template/FlowPath.vue 156 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/template/Stage.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -2,10 +2,10 @@
  <basic-container>
    <avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
    <span v-if="type.prop==='tab1'">
      <attrCrud :ProData="ProData" :crudOid="crudOid" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
      <attrCrud :ProData="ProData" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
    </span>
    <span v-else-if="type.prop==='tab2'">
       <FlowPath :code="this.crudOid" :crudLCStatus="crudLCStatus"></FlowPath>
       <FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
    </span>
    <span v-else-if="type.prop==='tab3'">
@@ -34,13 +34,13 @@
          prop: 'tab3',
        }]
      },
      checkStatus:false //是否需要验证模板状态
    }
  },
  created() {
    // 进入页面默认是模板属性
    this.type = this.Taboption.column[0];
    this.type.prop = "tab1"
    this.type.prop = "tab1";
  },
  methods: {
    // Tab栏切换
Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -3,31 +3,31 @@
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag"class="app">
      <!--新增-->
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false && crudLCStatus=='Editing'" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">添加 {{ msg }}</el-button>
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false && (!checkStatus || crudLCStatus=='Editing')" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">添加 {{ msg }}</el-button>
      <!--        全屏编辑-->
      <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false && crudLCStatus=='Editing'" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">全屏编辑</el-button>
      <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false && (!checkStatus || crudLCStatus=='Editing')" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">全屏编辑</el-button>
      <!--        验证规则-->
      <el-button v-if="crudLCStatus=='Editing'" icon="el-icon-info" size="small" @click="ruleAddHandler">验证规则</el-button>
      <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-info" size="small" @click="ruleAddHandler">验证规则</el-button>
      <!--        属性分组-->
      <el-button v-if="crudLCStatus=='Editing'" icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      <!--        分类注入-->
      <el-button v-if="crudLCStatus=='Editing'" icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
      <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-magic-stick" size="small" @click="injectBtn">分类注入</el-button>
        <!--    组合规则-->
        <el-button v-if="crudLCStatus=='Editing'" size="small" @click="isShowHandler">组合规则</el-button>
        <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="isShowHandler">组合规则</el-button>
      <!--        枚举注入-->
      <el-button v-if="crudLCStatus=='Editing'" size="small" @click="enmuVisHandle">枚举注入</el-button>
      <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="enmuVisHandle">枚举注入</el-button>
      <!--    级联属性-->
      <el-button v-if="crudLCStatus=='Editing'" size="small" @click="CascadeHandle">级联属性</el-button>
      <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="CascadeHandle">级联属性</el-button>
      <!--    预览排序-->
        <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
      <!--    保存-->
      <el-button v-if="crudLCStatus=='Editing'" size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <!--    删除-->
      <el-button v-if="crudLCStatus=='Editing'" size="small" @click="CrudRemove" icon="el-icon-delete">删除</el-button>
      <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="CrudRemove" icon="el-icon-delete">删除</el-button>
      <!--    重置-->
      <el-button size="small" @click="reset" icon="el-icon-refresh-right">重置</el-button>
      <!--    同步到其他模板-->
@@ -240,7 +240,7 @@
    </div>
    <el-table :data="ProData"
              style="width: 100%"
              height="750"
              height="400"
              @cell-click="handleCellClicks"
              @select="selectHandle"
              @selection-change="selectionChange"
@@ -314,6 +314,10 @@
      type: String,
      default: ''
    },
    checkStatus:{
      type: Boolean,
      default: false
    },
    crudLCStatus: {
      type: String,
      default: 'Editing'
Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -11,11 +11,19 @@
export default {
    name: 'FlowPath',
    props: {
        code: {
            typeof: String,
            required: true,
            default: ""
        }
      checkStatus: {
        type: Boolean,
        default: false
      },
      crudLCStatus: {
        type: String,
        default: 'Editing'
      },
      code: {
        typeof: String,
        required: true,
        default: ""
      }
    },
    data() {
        return {
@@ -31,68 +39,69 @@
            startData: [],
            form: {},
            option: {
                height: "auto",
                border: true,
                align: 'center',
                menuAlign: 'center',
                index: true,
                searchMenuSpan: 8,
                searchBtn: false,
                emptyBtn: false,
                columnBtn: false,
                defaultSort: {
                    prop: 'id,name,description,version',
                    order: 'descending'
              height: "auto",
              border: true,
              align: 'center',
              menuAlign: 'center',
              index: true,
              searchMenuSpan: 8,
              searchBtn: false,
              emptyBtn: false,
              columnBtn: false,
              addBtn: !this.checkStatus || this.crudLCStatus == 'Editing',
              defaultSort: {
                prop: 'id,name,description,version',
                order: 'descending'
              },
              column: [
                {
                  label: '模板key',
                  prop: 'modelKey',
                  width: 120,
                  sortable: true,
                  type: 'tree',
                  dicData: [],
                  props: {
                    label: "key",
                    value: "key"
                  },
                  rules: [{
                    required: true,
                    message: '模板key不能为空',
                    trigger: 'blur'
                  }],
                  nodeClick: (data) => {
                    console.log(data)
                    // 节点点击的时候会获取到数据
                    this.form.modelName = data.name
                  }
                }, {
                  label: '模板名称',
                  prop: 'modelName',
                  sortable: true,
                  width: 220,
                  addDisabled: true,
                  editDisabled: true,
                },
                column: [
                    {
                        label: '模板key',
                        prop: 'modelKey',
                        width:120,
                        sortable: true,
                        type: 'tree',
                        dicData: [],
                        props: {
                            label: "key",
                            value: "key"
                        },
                        rules: [{
                            required: true,
                            message: '模板key不能为空',
                            trigger: 'blur'
                        }],
                        nodeClick: (data) => {
                            console.log(data)
                            // 节点点击的时候会获取到数据
                            this.form.modelName = data.name
                        }
                    }, {
                        label: '模板名称',
                        prop: 'modelName',
                        sortable: true,
                        width:220,
                        addDisabled: true,
                        editDisabled: true,
                    },
                    {
                        label: '模板用途',
                        prop: 'buttonTypeKey',
                        type: 'tree',
                        width:120,
                        dicUrl: '/api/ubcs-flow/processTS/tt',
                        dicMethod: 'post',
                        props: {
                            value: "codee",
                            label: "namee",
                        },
                    },
                    {
                        label: '模板描述',
                        prop: 'description',
                        type:'textarea'
                    },
                ]
            },
                {
                  label: '模板用途',
                  prop: 'buttonTypeKey',
                  type: 'tree',
                  width: 120,
                  dicUrl: '/api/ubcs-flow/processTS/tt',
                  dicMethod: 'post',
                  props: {
                    value: "codee",
                    label: "namee",
                  },
                },
                {
                  label: '模板描述',
                  prop: 'description',
                  type: 'textarea'
                },
              ]
            }
        }
    },
    created() {
@@ -114,18 +123,19 @@
        },
        // 获取列表
        async getDataList() {
            this.loading = false
            console.log(this.search)
          this.loading = false
          if(this.code){
            const { pageSize, currentPage } = this.page
            let param = { size: pageSize, current: currentPage }
            const response = await getFlowpathList({ ...param, ...{ templateId: this.code } })
            if (response.status === 200) {
                console.log(response)
                this.loading = false
                const data = response.data.data
                this.data = data.records
                this.page.total = data.total
              this.loading = false
              const data = response.data.data
              this.data = data.records
              this.page.total = data.total
            } else this.loading = false
          }
        },
        // 新增
        async handleSave(row, done, loading) {
Source/UBCS-WEB/src/components/template/Stage.vue
@@ -127,17 +127,19 @@
        },
        // 获取列表
        async getDataList() {
            this.loading = false
            const { pageSize, currentPage } = this.page
            let param = { size: pageSize, current: currentPage }
            const response = await getFlowpathList({ ...param, ...{ templateId: this.code } })
          this.loading = false
          if (this.code) {
            const {pageSize, currentPage} = this.page
            let param = {size: pageSize, current: currentPage}
            const response = await getFlowpathList({...param, ...{templateId: this.code}})
            if (response.status === 200) {
                console.log(response)
                this.loading = false
                const data = response.data.data
                this.data = data.records
                this.page.total = data.total
              console.log(response)
              this.loading = false
              const data = response.data.data
              this.data = data.records
              this.page.total = data.total
            } else this.loading = false
          }
        },
        // 获取阶段列表
        async getStagelist() {