From 5677cf19400eca6985fb9cd5d501b35691cdf193 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 10 三月 2024 20:18:04 +0800
Subject: [PATCH] 集成相关代码更改
---
Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
index edecfe5..fc3b236 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.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: {
@@ -194,8 +194,8 @@
},
async getCodeRule() {
try {
- // 缂栫爜瑙勫垯宸插彂甯冩暟鎹簮
- const res = await gridCodeRule({["conditionMap" + "[lcStatus_like]"]: "Released"});
+ // 缂栫爜瑙勫垯宸插彂甯冿紙TODO:2024/1/22鏀癸細鎸夌収闇�姹傚簲璇ユ槸閮芥煡璇級鏁版嵁婧�
+ const res = await gridCodeRule(1,-1);
this.characterReleasedList = res.data.data.records;
this.queryReleasedList = this.characterReleasedList;
this.select = this.characterReleasedList[0].oid;
@@ -203,6 +203,7 @@
const res2 = await getList({codeRuleId: this.select, chartType: "prefix", chartValue: this.characterValue});
this.tableData = res2.data.data;
this.loading = false;
+ this.selectLoading = false;
} catch (error) {
this.$message.warning(error)
}
@@ -227,7 +228,7 @@
// const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue);
// const chartValue = targetObject.name;
getList({codeRuleId: this.select, chartType: "prefix", 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