From 8e832c69b20bd34f6da9ef25324ec690d1cccbe3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 一月 2024 11:30:32 +0800
Subject: [PATCH] 业务类型对象,分类授权，字符集相关代码修改
---
Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue | 121 +++++++++++-----------------------------
1 files changed, 33 insertions(+), 88 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index 44eb04b..d91ed31 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -1,6 +1,5 @@
<template>
<basic-container>
-
<el-header>
<div style="margin-bottom: 15px">
缂栫爜瑙勫垯锛�
@@ -8,7 +7,7 @@
@change="selectHandler">
<el-option v-for="(item,index) in queryReleasedList"
:key="item.oid"
- :label="item.name"
+ :label="item.name + ' (' + item.id + ')'"
:value="item.oid"></el-option>
</el-select>
</div>
@@ -19,85 +18,23 @@
:data="tableData"
:header-cell-style="{background:'#FAFAFA',color:'#505050'}"
border
- style="width: 100%;height: calc(100vh - 320px)"
+ style="width: 100%;height: calc(100vh - 315px)"
@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 +53,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>
@@ -132,7 +69,7 @@
<script>
import {getList, addSave, editSave, deleteSave} from "@/api/code/codeCharcter"
-import {gridCodeRule} from "@/api/code/codeCharcter"
+import {gridCodeRule} from "@/api/code/mdmrule"
export default {
name: "usableCharacter",
@@ -163,12 +100,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,14 +123,19 @@
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 {
// 缂栫爜瑙勫垯宸插彂甯冩暟鎹簮
- const res = await gridCodeRule({["conditionMap" + "[lcStatus_like]"]: "Released"});
+ const res = await gridCodeRule(1,-1);
this.characterReleasedList = res.data.data.records;
this.queryReleasedList = this.characterReleasedList;
this.select = this.characterReleasedList[0].oid;
@@ -225,7 +167,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 +177,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