From 9b51b2a07769ee049937e16dd45d8c36c87dcc3c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十二月 2023 17:13:01 +0800
Subject: [PATCH] 主数据 枚举配置模板配置 参照配置表格显示问题处理
---
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 112 ++++++++++++++-----------------------------------------
1 files changed, 29 insertions(+), 83 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index 44eb04b..32997d5 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -21,83 +21,21 @@
border
style="width: 100%;height: calc(100vh - 320px)"
@cell-click="cellClickHandler">
- <el-table-column
- align="center"
- label="1"
- prop="1"
- >
- </el-table-column>
- <el-table-column
- align="center"
- label="2"
- prop="2"
- >
- </el-table-column>
- <el-table-column
- align="center"
- label="3"
- prop="3">
- </el-table-column>
- <el-table-column
- align="center"
- label="4"
- prop="4">
- </el-table-column>
- <el-table-column
- align="center"
- label="5"
- prop="5">
- </el-table-column>
- <el-table-column
- align="center"
- label="6"
- prop="6">
- </el-table-column>
- <el-table-column
- align="center"
- label="7"
- prop="7">
- </el-table-column>
- <el-table-column
- align="center"
- label="8"
- prop="8">
- </el-table-column>
- <el-table-column
- align="center"
- label="9"
- prop="9">
- </el-table-column>
- <el-table-column
- align="center"
- label="10"
- prop="10">
- </el-table-column>
- <el-table-column
- align="center"
- label="11"
- prop="11">
- </el-table-column>
- <el-table-column
- align="center"
- label="12"
- prop="12">
- </el-table-column>
- <el-table-column
- align="center"
- label="13"
- prop="13">
- </el-table-column>
- <el-table-column
- align="center"
- label="14"
- prop="14">
- </el-table-column>
- <el-table-column
- align="center"
- label="15"
- prop="15">
- </el-table-column>
+ <el-table-column align="center" label="1" prop="1"></el-table-column>
+ <el-table-column align="center" label="2" prop="2"></el-table-column>
+ <el-table-column align="center" label="3" prop="3"></el-table-column>
+ <el-table-column align="center" label="4" prop="4"></el-table-column>
+ <el-table-column align="center" label="5" prop="5"></el-table-column>
+ <el-table-column align="center" label="6" prop="6"></el-table-column>
+ <el-table-column align="center" label="7" prop="7"></el-table-column>
+ <el-table-column align="center" label="8" prop="8"></el-table-column>
+ <el-table-column align="center" label="9" prop="9"></el-table-column>
+ <el-table-column align="center" label="10" prop="10"></el-table-column>
+ <el-table-column align="center" label="11" prop="11"></el-table-column>
+ <el-table-column align="center" label="12" prop="12"></el-table-column>
+ <el-table-column align="center" label="13" prop="13"></el-table-column>
+ <el-table-column align="center" label="14" prop="14"></el-table-column>
+ <el-table-column align="center" label="15" prop="15"></el-table-column>
</el-table>
</el-main>
<el-footer>
@@ -116,8 +54,8 @@
</div>
</el-footer>
<el-dialog :visible.sync="editVisble" append-to-body title="淇敼鍙敤瀛楃" width="40%">
- <el-input v-model="characterValue" size="small"></el-input>
- <span slot="footer" class="dialog-footer">
+ <el-input v-model="characterValue" size="small"></el-input>
+ <span slot="footer" class="dialog-footer">
<el-button @click="editVisble = false">鍙� 娑�</el-button>
<el-button type="primary" @click="editSaveHandler">纭� 瀹�</el-button>
</span>
@@ -163,12 +101,12 @@
this.getCodeRule();
},
methods: {
- editDialog(){
- if(this.editValueList.length > 1){
+ editDialog() {
+ if (this.editValueList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹紒');
return;
}
- if(this.editValueList.length === 0){
+ if (this.editValueList.length === 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
return;
}
@@ -186,9 +124,14 @@
this.characterEditOldValue = row[column.property];
if (this.editValueList.includes(row[column.property])) {
this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夐噸澶嶏紒')
+ } else if (row[column.property] === undefined || row[column.property] === null) {
+ this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
} else {
this.editValueList.push(row[column.property]);
}
+ // else if (this.editValueList.some(value => value.trim() === '')) {
+ // this.$message.warning('璇锋鏌ュ瓧绗﹂泦鏄惁鏈夌┖鍊硷紒');
+ // }
},
async getCodeRule() {
try {
@@ -225,7 +168,7 @@
// const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue);
// const chartValue = targetObject.name;
getList({codeRuleId: this.select, chartType: "charset", chartValue: this.characterValue}).then(res => {
- console.log(res.data.data);
+ // console.log(res.data.data);
this.tableData = res.data.data;
this.loading = false;
});
@@ -235,14 +178,17 @@
this.$message.warning('璇峰～鍐欒娣诲姞鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
+ ;
if (this.editValueList.length != 0) {
this.$message.warning('璇峰厛鍙栨秷宸查�夋嫨鐨勫�硷紒');
return; // 鍒ゆ柇杈撳叆鍊�
}
+ ;
const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
if (!targetObject) {
return; // 鏌ユ壘瀵瑰簲typeText
}
+ ;
const codeRuleCharacterVO = {
codeRuleId: this.select,
chartType: "charset",
--
Gitblit v1.9.3