From 0502473f81181961ceb10ff4e593541bd8776690 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 16:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue | 2 +-
Source/UBCS-WEB/src/views/wel/index.vue | 19 +++++++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
index b2ada2b..aa87fb0 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ThemeChildren.vue
@@ -186,7 +186,7 @@
this.radioValue = row.$index;
this.LineParm = row;
this.crudName = row.name;
- this.crudOid = row.oid;
+ this.crudOid = this.codeType === 'btmCode' ? row.id : row.oid;
},
//纭畾
HandlerClickSave() {
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 3baf0e5..cd5bbbe 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -7,14 +7,14 @@
</el-row>
<el-row>
<el-col :span="24">
- <basic-container title="涓绘暟鎹粺璁�"style="height: 345px;">
+ <basic-container title="涓绘暟鎹粺璁�">
<Statistic></Statistic>
</basic-container>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <basic-container title="寰呭姙娴佺▼浠诲姟" style="margin-top: 18px" >
+ <basic-container title="寰呭姙娴佺▼浠诲姟">
<avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
:table-loading="loading"
@on-load="onLoad"
@@ -29,6 +29,18 @@
</avue-crud>
</basic-container>
</el-col>
+ <!-- <el-col :span="8">-->
+ <!-- <el-row>-->
+ <!-- <basic-container title="娑堟伅鍒楄〃">-->
+ <!-- <el-collapse v-model="logActiveNames" @change="handleChange">-->
+ <!-- <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">-->
+ <!-- <div>{{item.subtitle}}</div>-->
+ <!-- </el-collapse-item>-->
+ <!-- </el-collapse>-->
+ <!-- </basic-container>-->
+ <!-- </el-row>-->
+
+ <!-- </el-col>-->
</el-row>
<el-dialog :before-close="Xdelhandle" :close-on-press-escape="false" :visible.sync="dialogFormVisible"
append-to-body
@@ -77,8 +89,7 @@
todoData: [],
// 浠ｅ姙娴佺▼浠诲姟option
todoOption: {
- height: 'auto',
- calcHeight: 420,
+ height: 500,
addBtn: false,
header: false,
align: 'center',
--
Gitblit v1.9.3