From 19d2c06b04aab6d21a36bd5b41c78cdea8ae58b7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 05 十一月 2024 17:41:15 +0800
Subject: [PATCH] 修改页面
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 635 +++++++++++++--------------------------------------------
1 files changed, 146 insertions(+), 489 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 ef8fede..70f5973 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
@@ -2,39 +2,11 @@
<el-container v-loading="createViewLoading">
<el-aside>
<basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <div class="headerCon">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
- </el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
- </el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎
- </el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆
- </el-button>
- <el-button class="miniBtn" icon="el-icon-circle-plus-outline" plain size="small"
- type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
- </el-button>
- <el-button class="miniBtn" icon="el-icon-circle-plus-outline" plain size="small"
- type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩
- </el-button>
- <el-button icon="el-icon-menu" plain size="small" style="width: 82px;text-align: center;padding-left: 1px"
- type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�
- </el-button>
- <el-button class="miniBtn" icon="el-icon-delete" plain size="small"
- type="danger" @click="checkClickHandler">鍒犻櫎鏁版嵁
- </el-button>
- <el-button class="smallBtn" plain size="small"
- type="danger" @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷
- </el-button>
- <el-button class="smallBtn" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
- </el-button>
- </div>
+ <div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
+
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 330px);">
- <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <div style="height: calc(100vh - 190px);">
+ <avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i class="el-icon-s-promotion"></i>
@@ -48,8 +20,21 @@
</el-aside>
<el-main>
<basic-container>
- <div style="display: flex;justify-content: center; height: 230px">
- <div class="descBox" style="max-height: 100px">
+ <div>
+ <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
+ <el-button icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘</el-button>
+ <el-button icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩</el-button>
+ <el-button icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鏁版嵁</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷</el-button>
+ <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿</el-button>
+ </div>
+ <div style="display: flex;justify-content:left;margin-top: 15px;">
+ <div class="descBox" style="width: 40%">
<el-descriptions :column="1" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -72,8 +57,7 @@
</template>
<el-tooltip v-if="nodeRow.implClass" :content="nodeRow.implClass" class="item" effect="dark"
placement="top-start">
- <el-tag style="max-width: 250px;overflow: hidden">{{ nodeRow.implClass }}
- </el-tag>
+ <el-tag style="max-width: 100%;overflow: hidden;display: block">{{ nodeRow.implClass }}</el-tag>
</el-tooltip>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
@@ -85,7 +69,7 @@
</el-descriptions-item>
</el-descriptions>
</div>
- <div class="descBox">
+ <div class="descBox" style="width: 25%;">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐗堟湰瑙勫垯">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -137,7 +121,7 @@
</el-descriptions>
</div>
- <div class="descBox">
+ <div class="descBox" style="width: calc(35% - 40px);margin-right: 0">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐢熷懡鍛ㄦ湡">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -149,8 +133,8 @@
</el-descriptions>
</div>
</div>
- <div style="margin-top: 30px">
- <h3>灞炴�у垪琛�</h3>
+ <div style="margin-top: 25px;position: relative">
+ <h3 style="margin: 0;position: absolute;top:0;z-index: 1000;">灞炴�у垪琛�</h3>
<avue-crud
:data="attrData"
:option="attrOption">
@@ -168,9 +152,9 @@
class="avue-dialog"
width="75%"
@close="addDialogClose">
- <el-form ref="form" :model="form" :rules="rules" label-width="95px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="95px" size="small">
<div class="dialogForm">
- <div class="leftForm">
+ <div class="leftForm" style="width: 40%">
<el-form-item label="绫诲瀷鍚嶇О锛�" prop="id">
<el-input v-model="form.id" :readOnly="title === 'edit'"></el-input>
</el-form-item>
@@ -178,13 +162,11 @@
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="缁ф壙鑷細">
- <div style="display: flex;gap: 5px;align-items: center">
- <el-input v-model="form.fName" :readOnly="true"></el-input>
- <el-button :disabled="title === 'add'" plain size="small" style="margin-left: 5px;height: 30px"
- type="success"
- @click="inheritClickHandler">閫夋嫨
- </el-button>
- </div>
+ <avue-input-tree :disabled="title === 'add'"
+ v-model="form.fName"
+ placeholder="璇烽�夋嫨涓氬姟绫诲瀷"
+ :props="{label: 'id', value: 'id',children: 'children'}"
+ :dic="inheritTreeData"></avue-input-tree>
</el-form-item>
<el-form-item label="瀹炵幇绫伙細">
<el-input v-model="form.implClass"></el-input>
@@ -193,93 +175,61 @@
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
- <div class="centerForm">
- <el-form-item label="鐗堟湰瑙勫垯锛�" label-width="110px" prop="revLevel">
- <el-select v-model="form.revLevel" @change="revLevelChange">
- <el-option label="涓嶅彲淇" value="0"></el-option>
- <el-option label="閲囩敤涓�绾х増鏈鐞�" value="1"></el-option>
- <el-option label="閲囩敤浜岀骇鐗堟湰绠＄悊" value="2"></el-option>
- </el-select>
+ <div class="centerForm" style="width: 26%">
+ <el-form-item label="鐗堟湰瑙勫垯锛�" label-width="100px" prop="revLevel" style="margin-bottom: 10px;">
+ <el-radio v-model="form.revLevel" label="0" @input="revLevelChange">涓嶅彲淇</el-radio><br>
+ <el-radio v-model="form.revLevel" label="1" @input="revLevelChange">閲囩敤涓�绾х増鏈鐞�</el-radio><br>
+ <el-radio v-model="form.revLevel" label="2" @input="revLevelChange">閲囩敤浜岀骇鐗堟湰绠＄悊</el-radio>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="110px" prop="revisionRuleId">
- <div style="display: flex;gap: 5px;align-items: center">
- <el-input v-model="form.revisionRuleId" :readOnly="true"></el-input>
- <el-button :disabled="form.inputRevisionFlag" plain size="small" style="margin-left: 5px;height: 30px"
- type="success"
- @click="versionAddHandler">娣诲姞
- </el-button>
- <el-switch
- v-model="form.inputRevisionFlag"
- active-text="鎵嬪伐杈撳叆"
- style="width: 300px"
- @change="form.revisionRuleId = ''">
- </el-switch>
- </div>
+ <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="100px" prop="revisionRuleId" style="margin-bottom: 5px;">
+ <avue-select v-model="form.revisionRuleId"
+ :disabled="form.inputRevisionFlag"
+ placeholder="璇烽�夋嫨鐗堟湰鍙疯鍒�"
+ :filterable="true"
+ :props="{label: 'id', value: 'id'}"
+ :dic="versionData"></avue-select>
+ <el-switch
+ v-model="form.inputRevisionFlag"
+ active-text="鎵嬪伐杈撳叆"
+ style="width: 300px"
+ @change="form.revisionRuleId = ''">
+ </el-switch>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="110px" prop="delimiter">
- <el-select v-model="form.delimiter" clearable>
- <el-option label="." value="."></el-option>
- <el-option label="-" value="-"></el-option>
- </el-select>
+ <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="100px" prop="delimiter" style="margin-bottom: 5px;">
+ <el-radio v-model="form.delimiter" label=""> </el-radio>
+ <el-radio v-model="form.delimiter" label=".">.</el-radio>
+ <el-radio v-model="form.delimiter" label="-">-</el-radio>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0' && form.revLevel !== '1'" label="鐗堟鍙疯鍒欙細" label-width="110px"
+ <el-form-item v-if="form.revLevel !== '0' && form.revLevel !== '1'" label="鐗堟鍙疯鍒欙細" label-width="100px"
prop="versionRule">
- <el-select v-model="form.versionRule" clearable>
- <el-option label="1.2.3..." value="0"></el-option>
- <el-option label="a.b.c..." value="1"></el-option>
- <el-option label="0.1.2..." value="2"></el-option>
- </el-select>
+ <el-radio v-model="form.versionRule" label="0">1.2.3...</el-radio>
+ <el-radio v-model="form.versionRule" label="1">a.b.c...</el-radio>
+ <el-radio v-model="form.versionRule" label="2">0.1.2...</el-radio>
</el-form-item>
</div>
- <div class="rightForm">
+ <div class="rightForm" style="width: 25%">
<el-form-item label="鐢熷懡鍛ㄦ湡锛�" label-width="138px" prop="lifeCycleId">
- <div style="display: flex;gap: 5px;align-items: center">
- <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>
+ <avue-select v-model="form.lifeCycleId"
+ placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
+ :filterable="true"
+ :props="{label: 'id', value: 'id'}"
+ :dic="lifeData"></avue-select>
</el-form-item>
<el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px">
- <div style="display: flex; align-items: center">
- <div style="height: 200px; width: 280px; border: 1px solid #bdbbbb;overflow-y: auto">
- <!-- 鍐呭 -->
- <el-table
- :data="dialogLifeTable"
- :show-header="false"
- style="width: 100%">
- <el-table-column
- align="center"
- prop="id">
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- width="60">
- <template slot-scope="scope">
- <el-button
- size="small"
- style="color:#F56C6C;"
- type="text"
- @click.native.prevent="dialogDeleteLifeTable(scope.$index)">
- 绉婚櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <el-button plain size="mini" style="margin-left: 5px" type="success"
- @click="lifeAddHandler('table')">娣诲姞
- </el-button>
-
- </div>
+ <avue-select multiple
+ :filterable="true"
+ v-model="form.subLifeCycleId"
+ placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
+ :props="{label: 'id', value: 'id'}"
+ type="tree"
+ :dic="lifeData"></avue-select>
</el-form-item>
</div>
</div>
</el-form>
<div class="bottomForm">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <h3 style="margin-bottom: 10px;">灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="dialogAttrData"
:option="dialogAttrOption"
@@ -289,9 +239,9 @@
</template>
</avue-crud>
</div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
+ <span slot="footer" class="dialog-footer avue-dialog__footer">
<el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button @click="addDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -323,87 +273,6 @@
<span slot="footer" class="dialog-footer">
<el-button @click="dialogAttrClose">鍙� 娑�</el-button>
<el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
- </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-dialog
- v-dialogDrag
- :visible.sync="dialogInheritVisible"
- append-to-body="true"
- class="avue-dialog"
- title="缁ф壙涓氬姟绫诲瀷"
- width="30%"
- @close="inheritClose"
- >
- <avue-tree ref="inheritTree" v-model="treeForm" :data="inheritTreeData" :option="inheritTreeOption"
- @node-click="inheritNodeClick">
- <span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
- {{ (node || {}).label }}
- </span>
- </span>
- </avue-tree>
- <span slot="footer" class="dialog-footer">
- <el-button @click="inheritClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="inheritSaveClickHandler">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -446,8 +315,8 @@
:table-loading="conCheckLoading">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="repairClickHandler">淇� 澶�</el-button>
+ <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -506,13 +375,13 @@
:option="indexAttrOption"
@row-click="indexAttrRowClick"></avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="indexAttrVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="indexAttrClickAddHandler">纭� 瀹�</el-button>
+ <el-button @click="indexAttrVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
- <el-button @click="indexDialogClose">鍙� 娑�</el-button>
<el-button type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
+ <el-button @click="indexDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -655,6 +524,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -682,73 +552,9 @@
fileUrl: 'api/linkTypeController/impData',
createViewLoading: false, // 鍒涘缓瑙嗗浘
versionAddFlag: false,
- treeForm: {},
- inheritNodeRow: {},
- inheritTreeOption: {
- height: 'auto',
- defaultExpandAll: false,
- menu: false,
- addBtn: false,
- props: {
- label: 'id',
- value: 'id',
- children: 'children'
- }
- },
inheritTreeData: [],
- dialogInheritVisible: false,
- 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,
+ lifeData: [],//鐢熷懡鍛ㄦ湡涓嬫媺鏁版嵁
+ versionData: [],//鐗堟湰瑙勫垯鏁版嵁
dialogAttrSelectList: [],
searchAttrParams: {},
dialogAttrLoading: false,
@@ -768,6 +574,7 @@
highlightCurrentRow: true,
height: 450,
searchMenuSpan: 8,
+ header: false,
column: [
{
label: '灞炴�у悕',
@@ -779,6 +586,7 @@
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
+ width:150,
},
{
label: '鍒濆鍊�',
@@ -815,6 +623,7 @@
selection: false,
height: 210,
addBtn: false,
+ menuWidth:100,
// index:false,
column: [
{
@@ -832,11 +641,13 @@
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
+ width:150,
},
{
label: '鍒濆鍊�',
prop: 'defaultValue',
sortable: true,
+ width:150,
},
{
label: '璇存槑',
@@ -890,13 +701,13 @@
fName: '', // 缁ф壙鑷�
implClass: '', // 瀹炵幇绫�
description: '', // 鎻忚堪
- revLevel: '', // 鐗堟湰瑙勫垯
+ revLevel: '2', // 鐗堟湰瑙勫垯
revisionRuleId: '',// 鐗堟湰鍙疯鍒�
inputRevisionFlag: false, // 鎵嬪伐杈撳叆,
delimiter: '', // 鍒嗛殧绗�
versionRule: '0', // 鐗堟鍙疯鍒�
lifeCycleId: '', // 鐢熷懡鍛ㄦ湡
- subLifeCycleId: '', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
+ subLifeCycleId: [], // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
apNameArray: "", // 灞炴�ф睜鍒楄〃鈥欙紝鈥樺垎闅�
},
nodeRow: {},
@@ -908,7 +719,8 @@
props: {
label: 'TreeName',
value: 'id',
- children: 'children'
+ children: 'children',
+ name: 'name'
}
},
treeData: [
@@ -927,16 +739,20 @@
name: 'el-icon-tickets',
desc: 'el-icon-chat-line-square'
},
+ treeLoading: false
}
},
created() {
this.getTreeList();
+ this.getVersionList();
+ this.getLifeCycle();
},
mounted() {
},
methods: {
//鏍戣〃鏌ヨ
getTreeList() {
+ this.treeLoading = true;
getBizTypes().then(res => {
const data = res.data.data.map(item => {
this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
@@ -944,8 +760,8 @@
return item.attributes; // 杩斿洖澶勭悊鍚庣殑 attributes
});
this.treeData[0].children = data;
- console.log(this.treeData);
this.inheritTreeData = data;
+ this.treeLoading = false;
});
},
@@ -965,7 +781,18 @@
this.attrData = row.attributes ? JSON.parse(row.attributes) : [];
this.nodeRow = row;
},
-
+ //鑾峰彇鐗堟湰瑙勫垯鏁版嵁
+ getVersionList(){
+ getVersionRuleAllList().then(res => {
+ this.versionData = res.data.data;
+ });
+ },
+ //鑾峰彇鐢熷懡鍛ㄦ湡鏁版嵁
+ getLifeCycle(){
+ gridLifeCycle().then(res => {
+ this.lifeData = res.data.data;
+ });
+ },
// 鍒涘缓鎸夐挳
addClickHandler() {
if (func.isEmptyObject(this.nodeRow)) {
@@ -974,31 +801,8 @@
}
this.title = 'add';
this.form.fName = this.nodeRow.id === 'topNode' ? "" : this.nodeRow.id;
- console.log(this.nodeRow);
this.form.inputRevisionFlag = JSON.parse(this.form.inputRevisionFlag); // 瀛楃涓瞗alse杞崲涓哄竷灏斿��
this.visible = true;
- },
-
- // 鍏抽棴缁ф壙瀵硅瘽妗�
- inheritClose() {
- this.dialogInheritVisible = false;
- this.$refs.inheritTree.setCurrentKey(null); // 鍙栨秷褰撳墠閫変腑鐨勮妭鐐�
- },
-
- // 缁ф壙鎸夐挳
- inheritClickHandler() {
- this.dialogInheritVisible = true;
- },
-
- // 缁ф壙鏍戣鐐瑰嚮
- inheritNodeClick(row) {
- this.inheritNodeRow = row;
- },
-
- // 缁ф壙鏍戜繚瀛�
- inheritSaveClickHandler() {
- this.form.fName = this.inheritNodeRow.id;
- this.dialogInheritVisible = false;
},
// 瀵硅瘽妗� 灞炴�ф睜鍒楄〃澧炲姞鎸夐挳
@@ -1118,136 +922,6 @@
this.dialogAttrData.splice(index, 1);
},
- // 鐗堟湰瑙勫垯绠＄悊娣诲姞
- 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.revisionRuleId = 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.lifeCycleId = 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;
- },
-
// 鍙兘杈撳叆鑻辨枃姝ｅ垯鏍￠獙
validateEnglishOnly(rule, value, callback) {
if (!value) {
@@ -1267,16 +941,16 @@
fName: '', // 缁ф壙鑷�
implClass: '', // 瀹炵幇绫�
description: '', // 鎻忚堪
- revLevel: '', // 鐗堟湰瑙勫垯
+ revLevel: '2', // 鐗堟湰瑙勫垯
revisionRuleId: '',// 鐗堟湰鍙疯鍒�
inputRevisionFlag: 'false', // 鎵嬪伐杈撳叆
delimiter: '', // 鍒嗛殧绗�
versionRule: '0', // 鐗堟鍙疯鍒�
lifeCycleId: '', // 鐢熷懡鍛ㄦ湡
- subLifeCycleId: '', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
+ subLifeCycleId: [], // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
+ lifeCycleIds:'',
apNameArray: "", // 灞炴�ф睜鍒楄〃鈥欙紝鈥樺垎闅�
};
- this.dialogLifeTable = []; // 灏嗙敓鍛藉懆鏈熻〃鏍肩疆绌�
this.dialogAttrData = []; // 灏嗗睘鎬ф睜琛ㄦ牸缃┖
this.form = {...form};
this.$refs.form.clearValidate();
@@ -1290,7 +964,6 @@
// 鐗堟湰瑙勫垯鍒囨崲 缃┖鍏朵粬鏉′欢
revLevelChange() {
- this.form.versionRule = "";
this.form.inputRevisionFlag = false;
this.form.delimiter = "";
this.form.versionRule = "0";
@@ -1299,11 +972,11 @@
// 鏂板缂栬緫淇濆瓨
addDialogSavaHandler() {
- if (!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
+ if (this.form.revLevel !== '0' &&!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
this.$message.error('璇锋鏌ョ増鏈彿瑙勫垯涓嶈兘涓虹┖');
return;
}
- this.form.subLifeCycleId = this.dialogLifeTable ? this.dialogLifeTable.map(item => item.id).join(',') : "";
+ this.form.lifeCycleIds=this.form.subLifeCycleId.join(',');
this.form.apNameArray = this.dialogAttrData ? this.dialogAttrData.map(item => item.id).join(',') : "";
this.$refs.form.validate((valid) => {
const saveFunction = this.title === 'add' ? addLifeCycle : updateLifeCycle;
@@ -1349,17 +1022,39 @@
if (this.nodeRow.id === 'topNode') {
this.$message.error('璇烽�夋嫨瀛愯妭鐐硅繘琛屼慨鏀�')
return;
- }
+ }debugger;
this.form = {...this.nodeRow};
this.form.inputRevisionFlag = JSON.parse(this.form.inputRevisionFlag); // 瀛楃涓瞗alse杞崲涓哄竷灏斿��
// this.form.fName = this.nodeRow.id === 'topNode' ? "" : this.nodeRow.id;
- this.dialogLifeTable = (this.nodeRow.lifeCycleIds && this.nodeRow.lifeCycleIds.trim())
+ this.form.subLifeCycleId = (this.nodeRow.lifeCycleIds && this.nodeRow.lifeCycleIds.trim())
? this.nodeRow.lifeCycleIds.split(',').map(item => ({id: item.trim()}))
: [];
this.dialogAttrData = this.nodeRow.attributes ? JSON.parse(this.nodeRow.attributes) : [];
+ function processChildren(item,fName) {
+ if (item.children && item.children.length > 0) {
+ item.children = item.children.map(child => {
+ processChildren(child,fName); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
+ if(fName==child.id){
+ child.disabled=true;
+ }else {
+ child.disabled=false;
+ }
+ return child;
+ });
+ }
+ };
+ const inheritTreeData=this.inheritTreeData.map(item => {
+ processChildren(item,this.form.id); // 澶勭悊姣忎釜鑺傜偣
+ if(this.form.id==item.id){
+ item.disabled=true;
+ }else {
+ item.disabled=false;
+ }
+ return item;
+ });
+ this.inheritTreeData=inheritTreeData
this.title = 'edit';
this.visible = true;
- console.log(this.form);
},
// 鍒犻櫎鎸夐挳
@@ -1368,7 +1063,7 @@
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
return;
}
- ;
+
this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1452,7 +1147,6 @@
this.checkViewData = this.checkViewDataSearch;
return done();
}
- ;
this.checkViewData = this.checkViewDataSearch.filter(item => {
return item.source && item.source.includes(source);
@@ -1635,7 +1329,6 @@
indexName: this.indexForm.name,
}
addIndex([params]).then(res => {
- console.log(res)
this.$message.success('鍒涘缓鎴愬姛');
this.indexDialogClose();
}).catch(err => {
@@ -1669,66 +1362,30 @@
width: 100%;
}
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
+ .el-tag{
+ line-height:22px;
+ height: 24px;
}
- .el-button {
- margin-top: 5px;
+ .el-radio{
+ margin-right: 20px;
}
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(10) {
- margin-left: 0;
-}
-
-.miniBtn {
- width: 82px;
- text-align: center;
- padding-left: 7px;
-}
-
-.smallBtn {
- width: 82px;
- text-align: center;
- padding-left: 4.5px;
}
.descBox {
- width: 32%;
- margin-left: 20px;
+ margin-right: 20px;
}
.dialogForm {
display: flex;
- justify-content: space-around;
+ justify-content: space-between;
}
.dialogForm > div {
- width: 29%;
- border: 1px solid #eee;
+ border: 1px solid #EBEEF5;
+ border-radius: 2px;
padding: 25px 20px 5px 10px; /* 涓� 鍙� 涓� 宸� */
- box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); /* 娣诲姞闃村奖鏁堟灉 */
+ box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); /* 娣诲姞闃村奖鏁堟灉 */
}
--
Gitblit v1.9.3