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/components/PLT-basic-component/basicForm.vue | 6
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 218 +++++++++---------------------------------------------
2 files changed, 41 insertions(+), 183 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
index 7d15766..f1650ee 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
@@ -186,7 +186,8 @@
initItem(item){
const type=this.columnType[item.type] || item.type;
item.text=item.text || item.label;
- const col= {
+ let col= {
+ ...item,
label: item.text,
prop: item.field,
showProp:item.showField,
@@ -222,8 +223,7 @@
required: item.required|| false,
message: `璇疯緭鍏�${item.text}!`,
trigger: "submit"
- }]):[],
- ...item
+ }]):[]
};
if(!this.isEdit){
col.placeholder=col.label;
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 ff0774e..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
@@ -175,15 +175,13 @@
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
- <div class="centerForm" style="width: 24%">
- <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">
+ <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="璇烽�夋嫨鐗堟湰鍙疯鍒�"
@@ -197,63 +195,35 @@
@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" style="width: 26%">
+ <div class="rightForm" style="width: 25%">
<el-form-item label="鐢熷懡鍛ㄦ湡锛�" label-width="138px" prop="lifeCycleId">
<avue-select v-model="form.lifeCycleId"
placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
:filterable="true"
:props="{label: 'id', value: 'id'}"
- :dic="dialogLifeData"></avue-select>
+ :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>
@@ -304,32 +274,6 @@
<el-button @click="dialogAttrClose">鍙� 娑�</el-button>
<el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</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"
- @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>
<!-- 瀵煎叆 -->
@@ -609,32 +553,7 @@
createViewLoading: false, // 鍒涘缓瑙嗗浘
versionAddFlag: false,
inheritTreeData: [],
- 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,
+ lifeData: [],//鐢熷懡鍛ㄦ湡涓嬫媺鏁版嵁
versionData: [],//鐗堟湰瑙勫垯鏁版嵁
dialogAttrSelectList: [],
searchAttrParams: {},
@@ -782,13 +701,13 @@
fName: '', // 缁ф壙鑷�
implClass: '', // 瀹炵幇绫�
description: '', // 鎻忚堪
- revLevel: '', // 鐗堟湰瑙勫垯
+ revLevel: '2', // 鐗堟湰瑙勫垯
revisionRuleId: '',// 鐗堟湰鍙疯鍒�
inputRevisionFlag: false, // 鎵嬪伐杈撳叆,
delimiter: '', // 鍒嗛殧绗�
versionRule: '0', // 鐗堟鍙疯鍒�
lifeCycleId: '', // 鐢熷懡鍛ㄦ湡
- subLifeCycleId: '', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
+ subLifeCycleId: [], // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
apNameArray: "", // 灞炴�ф睜鍒楄〃鈥欙紝鈥樺垎闅�
},
nodeRow: {},
@@ -871,8 +790,7 @@
//鑾峰彇鐢熷懡鍛ㄦ湡鏁版嵁
getLifeCycle(){
gridLifeCycle().then(res => {
- this.dialogLifeData = res.data.data;
- this.dialogLifeDefalutData = res.data.data;
+ this.lifeData = res.data.data;
});
},
// 鍒涘缓鎸夐挳
@@ -1004,67 +922,6 @@
this.dialogAttrData.splice(index, 1);
},
- // 鐢熷懡鍛ㄦ湡鏂板
- lifeAddHandler(val) {
- this.dialogLfeVisible = true;
- this.dialogLifeKey = Math.random(); // 鎵撳紑鏃跺埛鏂拌〃鏍奸伩鍏嶈〃鏍奸敊琛�
- this.dialogLifeLoading = true;
- this.lifeType = val;
- },
-
- // 鐢熷懡鍛ㄦ湡琛岀偣鍑�
- 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) {
@@ -1084,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();
@@ -1107,7 +964,6 @@
// 鐗堟湰瑙勫垯鍒囨崲 缃┖鍏朵粬鏉′欢
revLevelChange() {
- this.form.versionRule = "";
this.form.inputRevisionFlag = false;
this.form.delimiter = "";
this.form.versionRule = "0";
@@ -1120,7 +976,7 @@
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;
@@ -1166,11 +1022,11 @@
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) : [];
@@ -1207,7 +1063,7 @@
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
return;
}
- ;
+
this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1291,7 +1147,6 @@
this.checkViewData = this.checkViewDataSearch;
return done();
}
- ;
this.checkViewData = this.checkViewDataSearch.filter(item => {
return item.source && item.source.includes(source);
@@ -1474,7 +1329,6 @@
indexName: this.indexForm.name,
}
addIndex([params]).then(res => {
- console.log(res)
this.$message.success('鍒涘缓鎴愬姛');
this.indexDialogClose();
}).catch(err => {
@@ -1512,6 +1366,10 @@
line-height:22px;
height: 24px;
}
+
+ .el-radio{
+ margin-right: 20px;
+ }
}
.descBox {
--
Gitblit v1.9.3