From 6804f7887609dd881ed4b96a8acbb91524896a8d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 26 七月 2023 12:01:46 +0800
Subject: [PATCH] 取消模板状态验证
---
Source/UBCS-WEB/src/components/template/FlowPath.vue | 156 ++++++++++++++++++++------------------
Source/UBCS-WEB/src/components/template/Stage.vue | 20 ++--
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 8 +-
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 26 +++--
4 files changed, 113 insertions(+), 97 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index b030217..63588d6 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/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鏍忓垏鎹�
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index ec68c50..5322a01 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/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'
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index 24ccf03..d068154 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/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) {
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 8fe6216..7d01c68 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/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() {
--
Gitblit v1.9.3