From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
index b5e4f9d..02bd9e2 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
@@ -5,7 +5,7 @@
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
v-for="item in SelectOption"
- :key="item.value"
+ :key="item.key"
:label="item.label"
:value="item.value"
style="width: 150px">
@@ -16,7 +16,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="SelectSearchHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="TableData" :option="this.codeType === 'btmCode' ? this.btmOption : this.option" @row-click="rowHandlerClick">
+ <avue-crud :data="TableData" :option="this.codeType === 'btmCode' ? this.btmOption : this.option" @row-click="rowHandlerClick" :table-loading="loading">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="radioValue" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -74,6 +74,7 @@
crudName: '',
crudOid: '',
TableData: [],
+ loading:false,
option: {
addBtn: false,
index: true,
@@ -82,6 +83,7 @@
border: true,
menu: false,
height: 380,
+ rowKey: "oid",
column: [
{
label: '',
@@ -111,6 +113,7 @@
border: true,
menu: false,
height:380,
+ rowKey: "oid",
column:[
{
label: '',
@@ -135,6 +138,7 @@
}
},
created() {
+ this.loading = true;
},
mounted() {
},
@@ -162,13 +166,13 @@
},
// 妯＄硦鏌ヨ
SelectSearchHandler() {
- if (!this.SelectOption) {
- return; // 濡傛灉SelectOption鏁版嵁涓嶅瓨鍦ㄧ洿鎺ヨ繑鍥� 閬垮厤鎶ラ敊
+ this.loading = true;
+ if (!this.SelectOption || this.SelectOption.length === 0) {
+ this.loading = false;
+ return;
}
-
const Parameter = {};
Parameter[`conditionMap['${this.SelectValue}']`] = this.SelectSearchValue;
-
if(this.codeType === "btmCode"){
this.btmDefaultRend(Parameter)
}else {
@@ -205,11 +209,13 @@
...Parameter
}).then(res => {
this.TableData = res.data.records;
+ this.loading = false;
})
},
btmDefaultRend(Parameter) {
referDataGrid({valueField: 'id', isMuti: 'false', 'limit': '-1', ...Parameter}).then(res => {
- this.TableData = res.data.data.records
+ this.TableData = res.data.data.records;
+ this.loading = false;
})
},
}
--
Gitblit v1.9.3