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/paddingCharacter.vue | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue index 5285185..b50fec3 100644 --- a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue +++ b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.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,7 +18,7 @@ :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" @@ -132,7 +131,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", @@ -186,6 +185,8 @@ 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]); } @@ -193,7 +194,7 @@ 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 +226,7 @@ // const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue); // const chartValue = targetObject.name; getList({codeRuleId: this.select, chartType: "fillerChar", chartValue: this.characterValue}).then(res => { - console.log(res.data.data); + // console.log(res.data.data); this.tableData = res.data.data; this.loading = false; }); -- Gitblit v1.9.3