From 7407f7fd5b9d8e52edf4d1398eae710a0dd08ce9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 15 八月 2024 16:01:47 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 1
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 3
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 1
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 296 ++++++++++++++++++++++++++++++++++++++++++++++---
5 files changed, 282 insertions(+), 21 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index b5c03e9..5506afe 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -108,7 +108,7 @@
<template slot="label">
鐗堟湰鍙疯鍒�
</template>
- <el-tag v-if="nodeRow.revRuleName">{{ nodeRow.revRuleName }}</el-tag>
+ <el-tag v-if="nodeRow.revisionRuleId">{{ nodeRow.revisionRuleId }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="nodeRow.revLevel !== '0'" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -123,12 +123,12 @@
<template slot="label">
鐗堟鍙疯鍒�
</template>
- <el-tag v-if="nodeRow.verRuleName"
- :type="nodeRow.verRuleName === '0' ? 'warning' : nodeRow.revLevel === '1' ? '' : 'success'">
+ <el-tag v-if="nodeRow.revisionRuleId"
+ :type="nodeRow.revisionRuleId === '0' ? 'warning' : nodeRow.revisionRuleId === '1' ? '' : 'success'">
{{
- nodeRow.verRuleName === '0'
+ nodeRow.versionRule === '0'
? '1.2.3...'
- : nodeRow.revLevel === '1'
+ : nodeRow.versionRule === '1'
? 'a.b.c...'
: '0.1.2...'
}}
@@ -144,7 +144,7 @@
<template slot="label">
鐢熷懡鍛ㄦ湡
</template>
- <el-tag v-if="nodeRow.lifeCycle">{{ nodeRow.lifeCycle }}</el-tag>
+ <el-tag v-if="nodeRow.lifeCycleId">{{ nodeRow.lifeCycleId }}</el-tag>
</el-descriptions-item>
</el-descriptions>
</div>
@@ -178,7 +178,7 @@
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="缁ф壙鑷細">
- <el-input v-model="form.name" :readOnly="title === 'edit'"></el-input>
+ <el-input v-model="form.fName" :readOnly="title === 'edit'"></el-input>
</el-form-item>
<el-form-item label="瀹炵幇绫伙細">
<el-input v-model="form.implClass"></el-input>
@@ -195,13 +195,18 @@
<el-option label="閲囩敤浜岀骇鐗堟湰绠＄悊" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="100px" prop="revLevel">
+ <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="100px" prop="revisionRuleName">
<div style="display: flex;gap: 5px;align-items: center">
- <el-input v-model="form.revRuleName" :readOnly="true"></el-input>
+ <el-input v-model="form.revisionRuleId" :readOnly="true"></el-input>
<el-button plain size="small" style="margin-left: 5px;height: 30px" type="success" @click="versionAddHandler">娣诲姞</el-button>
+ <el-switch
+ style="width: 300px"
+ v-model="form.inputRevisionFlag"
+ active-text="鎵嬪伐杈撳叆">
+ </el-switch>
</div>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="100px" prop="revLevel">
+ <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="100px" prop="delimiter">
<el-select v-model="form.delimiter" clearable>
<el-option label="." value="."></el-option>
<el-option label="-" value="-"></el-option>
@@ -209,7 +214,7 @@
</el-form-item>
<el-form-item v-if="form.revLevel !== '0' && form.revLevel !== '1'" label="鐗堟鍙疯鍒欙細" label-width="100px"
prop="revLevel">
- <el-select v-model="form.verRuleName" clearable>
+ <el-select v-model="form.versionRule" clearable>
<el-option label="1.2.3..." value="1.2.3..."></el-option>
<el-option label="a.b.c..." value="a.b.c..."></el-option>
<el-option label="0.1.2..." value="0.1.2..."></el-option>
@@ -219,8 +224,8 @@
<div class="rightForm">
<el-form-item label="鐢熷懡鍛ㄦ湡锛�" label-width="138px" prop="revLevel">
<div style="display: flex;gap: 5px;align-items: center">
- <el-input v-model="form.lifeCycle" :readOnly="true"></el-input>
- <el-button plain size="small" style="margin-left: 5px;height: 30px" type="success">娣诲姞</el-button>
+ <el-input v-model="form.lifeCycleId" :readOnly="true"></el-input>
+ <el-button plain size="small" style="margin-left: 5px;height: 30px" type="success" @click="lifeAddHandler('input')">娣诲姞</el-button>
</div>
</el-form-item>
@@ -229,12 +234,12 @@
<div style="height: 200px; width: 280px; border: 1px solid #bdbbbb;overflow-y: auto">
<!-- 鍐呭 -->
<el-table
- :data="bizFormData"
+ :data="dialogLifeTable"
:show-header="false"
style="width: 100%">
<el-table-column
align="center"
- prop="name">
+ prop="id">
</el-table-column>
<el-table-column
fixed="right"
@@ -245,7 +250,7 @@
size="small"
style="color:#F56C6C;"
type="text"
- @click.native.prevent="bizTypeDeleteRow('form',scope.$index)">
+ @click.native.prevent="dialogDeleteLifeTable(scope.$index)">
绉婚櫎
</el-button>
</template>
@@ -253,7 +258,7 @@
</el-table>
</div>
<el-button plain size="mini" style="margin-left: 5px" type="success"
- @click="FormItemReferChange('form')">娣诲姞
+ @click="lifeAddHandler('table')">娣诲姞
</el-button>
</div>
@@ -276,6 +281,8 @@
<el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+ <!-- 灞炴�ф睜娣诲姞 -->
<el-dialog
v-dialogDrag
:visible.sync="attrPollDialogVisible"
@@ -306,6 +313,61 @@
</span>
</el-dialog>
+ <el-dialog
+ v-dialogDrag
+ :visible.sync="dialogVersionVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="鐗堟湰鍙疯鍒�"
+ width="60%"
+ >
+
+ <avue-crud
+ :key="dialogVersionKey"
+ ref="dialogAttrCrud"
+ :data="dialogVersionData"
+ :option="dialogVersionOption"
+ :table-loading="dialogVersionLoading"
+ @row-click="dialogVersionRowClick"
+ @search-change="versionHandleSearch"
+ @search-reset="versionHandleReset"
+ >
+ </avue-crud>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVersionVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVersionAddClickHandler">纭� 瀹�</el-button>
+ </span>
+
+ </el-dialog>
+
+ <!-- 鐢熷懡鍛ㄦ湡 -->
+ <el-dialog
+ v-dialogDrag
+ :visible.sync="dialogLfeVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="鐢熷懡鍛ㄦ湡妯℃澘"
+ width="60%"
+ >
+ <avue-crud
+ :key="dialogLifeKey"
+ ref="dialogAttrCrud"
+ :data="dialogLifeData"
+ :option="dialogLifeOption"
+ :table-loading="dialogLifeLoading"
+ @row-click="dialogLifeRowClick"
+ @search-change="lifeHandleSearch"
+ @search-reset="lifeHandleReset"
+ >
+ </avue-crud>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogLfeVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogLifeAddClickHandler">纭� 瀹�</el-button>
+ </span>
+
+ </el-dialog>
+
</el-container>
</template>
@@ -314,11 +376,65 @@
import {getBizTypes} from "@/api/modeling/businessType/api"
import {gridAttribute} from "@/api/modeling/attributePool/api";
import func from "@/util/func";
+import {getVersionRuleAllList} from "@/api/modeling/version/api";
+import {gridLifeCycle} from "@/api/modeling/lifeCycle/api";
export default {
name: "index",
data() {
return {
+ dialogLifeDefalutData:[], // 鏌ヨ閲嶇疆榛樿鏁版嵁
+ lifeType:'',
+ dialogLifeTable:[],
+ dialogLifeSaveRow:{},
+ dialogLifeKey:Math.random(),
+ dialogLifeData:[],
+ dialogLifeOption:{
+ ...basicOption,
+ addBtn:false,
+ selection:false,
+ refreshBtn:false,
+ menu:false,
+ height:450,
+ searchMenuSpan: 8,
+ highlightCurrentRow:true,
+ column:[
+ {
+ label:'鐢熷懡鍛ㄦ湡妯℃澘鍚�',
+ prop:'id',
+ searchLabelWidth:120,
+ search:true
+ }
+ ]
+ },
+ dialogLifeLoading:false,
+ dialogLfeVisible:false,
+ dialogVersionDefalutData:[], // 鏌ヨ閲嶇疆榛樿鏁版嵁
+ dialogSwitchValue:false,
+ dialogVersionSaveRow:{},
+ dialogVersionVisible:false,
+ dialogVersionKey:Math.random(),
+ dialogVersionData:[],
+ dialogVersionOption:{
+ ...basicOption,
+ addBtn:false,
+ selection:false,
+ refreshBtn:false,
+ menu:false,
+ height:450,
+ searchMenuSpan: 8,
+ highlightCurrentRow:true,
+ // calcHeight: 100,
+ column:[
+ {
+ label:'鐗堟湰鍙疯鍒�',
+ prop:'id',
+ searchLabelWidth:110,
+ search:true
+ }
+ ]
+ },
+ dialogVersionLoading:false,
dialogAttrSelectList: [],
searchAttrParams: {},
dialogAttrLoading: false,
@@ -331,7 +447,6 @@
},
dialogAttrSaveOption: {
...basicOption,
- calcHeight: -60,
addBtn: false,
menu: false,
refreshBtn: false,
@@ -438,7 +553,19 @@
}
]
},
- form: {},
+ form: {
+ id:'', // 绫诲瀷鍚嶇О
+ name:'', // 鏍囩
+ fName:'', // 缁ф壙鑷�
+ implClass:'', // 瀹炵幇绫�
+ description:'', // 鎻忚堪
+ revLevel:'', // 鐗堟湰瑙勫垯
+ revisionRuleId:'',// 鐗堟湰鍙疯鍒�
+ inputRevisionFlag:'', // 鎵嬪伐杈撳叆
+ versionRule:'', // 鐗堟鍙疯鍒�
+ lifeCycleId:'', // 鐢熷懡鍛ㄦ湡
+ subLifeCycleId:'', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�
+ },
nodeRow: {},
treeOption: {
height: 'auto',
@@ -603,8 +730,139 @@
// 鐗堟湰瑙勫垯绠＄悊娣诲姞
versionAddHandler(){
+ this.dialogVersionVisible = true;
+ this.dialogVersionKey = Math.random(); // 鎵撳紑鏃跺埛鏂拌〃鏍奸伩鍏嶈〃鏍奸敊琛�
+ this.dialogVersionLoading = true;
+ getVersionRuleAllList().then(res => {
+ const data = res.data.data.map(item => {
+ return {
+ id:item.id
+ }
+ });
+ this.dialogVersionData = data;
+ this.dialogVersionDefalutData = data;
+ this.dialogVersionLoading = false;
+ }).catch(err => {
+ this.$message.error(err)
+ });
+ },
+ // 鐗堟湰瑙勫垯琛岀偣鍑�
+ dialogVersionRowClick(row){
+ this.dialogVersionSaveRow = row;
+ },
+
+ // 鐗堟湰瑙勫垯鎼滅储
+ versionHandleSearch(params,done){
+ const {id} = params;
+
+ if (!params.id) {
+ this.dialogVersionData = this.dialogVersionDefalutData;
+ return done();
+ }
+ ;
+
+ this.dialogVersionData = this.dialogVersionDefalutData.filter(item => {
+ return item.id && item.id.includes(id);
+ });
+
+ done();
+
+ },
+
+ // 鐗堟湰绠＄悊缃┖
+ versionHandleReset(){
+ this.dialogVersionData = this.dialogVersionDefalutData;
+ },
+
+ // 鐗堟湰瑙勫垯淇濆瓨
+ dialogVersionAddClickHandler(){
+ if(func.isEmptyObject(this.dialogVersionSaveRow)){
+ this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
+ return;
+ }
+ this.form.revRuleName = this.dialogVersionSaveRow.id;
+ this.dialogVersionVisible = false;
+ },
+
+ // 鐢熷懡鍛ㄦ湡鏂板
+ lifeAddHandler(val){
+ this.dialogLfeVisible = true;
+ this.dialogLifeKey = Math.random(); // 鎵撳紑鏃跺埛鏂拌〃鏍奸伩鍏嶈〃鏍奸敊琛�
+ this.dialogLifeLoading = true;
+ this.lifeType = val;
+ gridLifeCycle().then(res => {
+ const data = res.data.data.map(item => {
+ return {
+ id:item.id
+ }
+ });
+ this.dialogLifeData = data;
+ this.dialogLifeDefalutData = data;
+ this.dialogLifeLoading = false
+ }).catch(err => {
+ this.$message.error(err)
+ });
+ },
+
+ // 鐢熷懡鍛ㄦ湡琛岀偣鍑�
+ dialogLifeRowClick(row){
+ this.dialogLifeSaveRow = row;
+ },
+
+ // 鐢熷懡鍛ㄦ湡淇濆瓨
+ dialogLifeAddClickHandler(){
+ if(func.isEmptyObject(this.dialogLifeSaveRow)){
+ this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
+ return;
+ }
+ if(this.lifeType === 'input'){
+ this.form.lifeCycle = this.dialogLifeSaveRow.id;
+ }else {
+ const flag = this.dialogLifeTable.some(item => item.id === this.dialogLifeSaveRow.id);
+
+ if (flag) {
+ this.$message.error('宸插瓨鍦ㄧ浉鍚岀殑鏁版嵁锛岃娣诲姞鍏朵粬鏁版嵁');
+ return;
+ }
+ this.dialogLifeTable.push(this.dialogLifeSaveRow);
+ }
+ this.dialogLfeVisible = false;
+ },
+
+ // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛ㄧЩ闄�
+ dialogDeleteLifeTable(index){
+ this.dialogLifeTable.splice(index,1)
+ },
+
+ // 鐢熷懡鍛ㄦ湡鎼滅储
+ lifeHandleSearch(params,done){
+ const {id} = params;
+
+ if (!params.id) {
+ this.dialogLifeData = this.dialogLifeDefalutData;
+ return done();
+ }
+ ;
+
+ this.dialogLifeData = this.dialogLifeDefalutData.filter(item => {
+ return item.id && item.id.includes(id);
+ });
+
+ done();
+
+ },
+
+ // 鐢熷懡鍛ㄦ湡閲嶇疆
+ lifeHandleReset(){
+ this.dialogLifeData = this.dialogLifeDefalutData;
+ },
+
+ // 鏂板缂栬緫淇濆瓨
+ addDialogSavaHandler(){
+ console.log(this.form)
}
+
}
}
</script>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index 48f06c3..1fb7931 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -243,6 +243,7 @@
dialogData: [],
dialogOption: {
...basicOption,
+ calcHeight:50,
refreshBtn: false,
selection: false,
column: [
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index 9d717d3..b4c4e52 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -445,6 +445,7 @@
highlightCurrentRow: true,
searchMenuSpan: 8,
searchLabelWidth: 100,
+ calcHeight:30,
column: [
{
label: '涓氬姟绫诲瀷鍚�',
@@ -575,7 +576,7 @@
editBtn: false,
refreshBtn: false,
selection: false,
- height: 300,
+ height: 200,
addBtn: false,
// index:false,
column: [
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
index 14234ef..5b03358 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
@@ -441,7 +441,7 @@
}
;
- this.checkViewData = this.checkViewData.filter(item => {
+ this.checkViewData = this.checkViewDataSearch.filter(item => {
return item.source && item.source.includes(source);
});
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index a87fcba..c8f755e 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -115,6 +115,7 @@
refreshBtn: false,
addBtn: false,
menu: false,
+ calcHeight:80,
column: [
{
label: '閮ㄩ棬',
--
Gitblit v1.9.3