From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
index de2e56a..b3132b1 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -1,14 +1,13 @@
<template>
<basic-container>
-
<el-header>
<div style="margin-bottom: 15px">
缂栫爜瑙勫垯锛�
- <el-select v-model="select" :filter-method="filterValue" filterable placeholder="璇烽�夋嫨" size="small"
+ <el-select v-model="select" :filter-method="filterValue" filterable placeholder="璇烽�夋嫨" size="small" v-loading="selectLoading"
@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",
@@ -149,7 +148,8 @@
tableData: [],
select: "",
selectValue: "",
- editVisble: false
+ editVisble: false,
+ selectLoading:false,
}
},
watch: {
@@ -186,6 +186,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 +195,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;
@@ -224,7 +226,7 @@
this.loading = true;
// 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 => {
+ getList({codeRuleId: this.select, chartType: "separator", chartValue: this.characterValue}).then(res => {
console.log(res.data.data);
this.tableData = res.data.data;
this.loading = false;
--
Gitblit v1.9.3