From df81835dd02eee62527997adf5a4ea2039b51fa4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 12:14:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/FlowPath.vue | 5 +
Source/UBCS-WEB/src/components/template/Stage.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 98 +++++++++++++++++++++++++++++++-
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 6 +-
Source/UBCS-WEB/src/views/wel/index.vue | 19 +-----
Source/UBCS-WEB/src/api/template/templateAttr.js | 12 ++++
6 files changed, 117 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/template/templateAttr.js b/Source/UBCS-WEB/src/api/template/templateAttr.js
index 95fcb69..f0b1f13 100644
--- a/Source/UBCS-WEB/src/api/template/templateAttr.js
+++ b/Source/UBCS-WEB/src/api/template/templateAttr.js
@@ -253,5 +253,17 @@
responseType: 'blob'
})
}
+//杩戜箟璇嶆煡璇㈣鍒�
+export const codeSynonym = (current,size,lcStatus) => {
+ return request({
+ url: '/api/ubcs-code/codeSynonym/list',
+ method: 'get',
+ params:{
+ current,
+ size,
+ lcStatus
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 982fa57..27e9fda 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div v-if="this.crudArrayFlag" class="app" style="display: flex;flex-wrap: wrap; display: inline-block">
+ <div v-if="this.crudArrayFlag" class="app" style="display: flex;flex-wrap: wrap; display: inline-block;height: 80px">
<el-button-group>
<!--鏂板-->
<span v-if="permissionList.busineStatus">
@@ -318,6 +318,19 @@
:referConfigOption="referConfigOption"
@setReferConfigValue="setReferConfigValue"
></refer-config-dialog>
+ <!--杩戜箟璇嶆煡璇㈣鍒� -->
+ <el-dialog :visible.sync="synonymVisible" append-to-body title="杩戜箟璇嶆煡璇㈣鍒�">
+ <avue-crud :data="synonymData" :option="synonymOption" v-loading="sysonymLoading" @selection-change="sysChange">
+ <template slot="lcStatus" slot-scope="{row}">
+ <el-tag v-if="row.lcStatus === 'Released'" type="success">鍚敤</el-tag>
+ <el-tag v-else type="danger">鍋滅敤</el-tag>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="sysnonymSubmit">纭畾</el-button>
+ <el-button @click="sysnonymCancel">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
</div>
@@ -401,7 +414,7 @@
</template>
<script>
-import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto, listByFlag} from '@/api/template/templateAttr'
+import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto, listByFlag,codeSynonym} from '@/api/template/templateAttr'
import {getList} from "@/api/refer/table";
import func from "@/util/func";
import {getCurrentInstance} from "vue";
@@ -519,6 +532,48 @@
},
data() {
return {
+ sysSelectData:[],
+ sysonymLoading:false,
+ synonymOption:{
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
+ refreshBtn:false,
+ columnBtn:false,
+ menu:false,
+ selection:true,
+ column:[
+ {
+ label:'缂栫爜',
+ prop:'id',
+ align:'center'
+ },
+ {
+ label:'鍚嶇О',
+ prop:'name',
+ align:'center'
+ },
+ {
+ label:'婧愬��',
+ prop:'sourceValue',
+ align:'center'
+ },
+ {
+ label:'鍚屼箟璇�',
+ prop:'synonymValue',
+ align:'center'
+ },
+ {
+ label:'鍚仠鐘舵��',
+ prop:'lcStatus',
+ align:'center',
+ slot: true
+ },
+ ]
+ },
+ synonymData:[],
+ //杩戜箟璇嶆煡璇㈣鍒�
+ synonymVisible:false,
//琛ㄦ牸楂樺害
dynamicHeight: '',
// 淇濆瓨鍗曞厓鏍肩姸鎬�
@@ -1290,6 +1345,12 @@
edit: "switch"
},
{
+ label:'杩戜箟璇嶆煡璇㈣鍒�',
+ prop:'sysonymRuleOids',
+ cell: false,
+ edit: 'refer'
+ },
+ {
label: "鐩镐技鏌ラ噸灞炴��",
prop: "sameRepeatAttrFlag",
width: 110,
@@ -1598,7 +1659,7 @@
if (this.editStyleFlag) {
return '800px'
} else {
- return 'calc(100vh - 565px)'
+ return 'calc(100vh - 602px)'
}
}
},
@@ -1612,6 +1673,25 @@
})
},
methods: {
+ //杩戜箟璇嶆煡璇㈣鍒欏彇娑�
+ sysnonymCancel(){
+ this.synonymVisible = false;
+ },
+ //杩戜箟璇嶆煡璇㈣鍒欑‘瀹�
+ sysnonymSubmit(){
+ if(this.sysSelectData.length <= 0){
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+ }else {
+ const newArray = this.sysSelectData.map(obj => obj.oid);
+ const newString = newArray.join(',');
+ this.$set(this.CurrentCell, 'sysonymRuleOids', newString)
+ this.AddCellFlag = true;
+ this.synonymVisible = false;
+ }
+ },
+ sysChange(row){
+ this.sysSelectData = row;
+ },
//鏂板鎼滅储
AddFindHandler() {
if (this.SelectValue == 'id') {
@@ -1941,6 +2021,16 @@
if (this.CurrentCell.attributeGroup !== '') {
this.attrModel = this.CurrentCell.attributeGroup
}
+ },
+ sysonymRuleOids: () =>{
+ this.sysonymLoading = true
+ codeSynonym('1','-1','Released').then(res=>{
+ this.synonymData = res.data.data.records;
+ this.sysonymLoading = false;
+ }).catch(()=>{
+ this.$message.error('璇锋鏌ユ帶鍒跺彴閿欒淇℃伅锛�')
+ })
+ this.synonymVisible = true;
}
};
@@ -2246,7 +2336,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 584px) !important;
+ height: calc(100vh - 618px) !important;
}
///deep/ .el-table__fixed[v-if='editStyleFlag'] {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 992178f..dd00bd6 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -4,7 +4,7 @@
<!-- 宸︿晶鑿滃崟-->
<el-aside>
<basic-container>
- <div style="height: calc(100vh - 142px);!important;">
+ <div style="height: calc(100vh - 144px);!important;">
<div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px">
<el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
</el-button>
@@ -136,7 +136,7 @@
</basic-container>
</el-aside>
<el-main>
- <basic-container style="height: calc(100vh - 150px);">
+ <basic-container>
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
@@ -1170,7 +1170,7 @@
this.crudArray = []
try {
this.requestCount += 1;
- const [res1, res2, res3] = await Promise.all([
+ const [res1, res2] = await Promise.all([
getObjectByOid(data.oid),
gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}),
]);
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index dd5cdac..1ffafd7 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -1,5 +1,5 @@
<template>
- <div style="height: calc(100vh - 553px)">
+ <div>
<avue-crud v-if="Formlist.length>0" ref="crud" v-model="form" :data="data" :option="option" :page.sync="page"
:search.sync="search" :table-loading="loading" @on-load="getDataList" @row-save="handleSave"
@row-del="handleDelete" @row-update="handleEdit" @refresh-change="handleRefresh"
@@ -47,7 +47,8 @@
startData: [],
form: {},
option: {
- height: 285,
+ height: 'auto',
+ calcHeight: 20,
border: true,
align: 'center',
menu: !this.checkStatus || this.crudLCStatus == 'Editing',
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 3d897db..f2b9603 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -55,6 +55,7 @@
},
data() {
const options = {
+ height:'auto',
border: true,
addBtn: false,
align: 'center',
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index cd5bbbe..3baf0e5 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="涓绘暟鎹粺璁�">
+ <basic-container title="涓绘暟鎹粺璁�"style="height: 345px;">
<Statistic></Statistic>
</basic-container>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <basic-container title="寰呭姙娴佺▼浠诲姟">
+ <basic-container title="寰呭姙娴佺▼浠诲姟" style="margin-top: 18px" >
<avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
:table-loading="loading"
@on-load="onLoad"
@@ -29,18 +29,6 @@
</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
@@ -89,7 +77,8 @@
todoData: [],
// 浠ｅ姙娴佺▼浠诲姟option
todoOption: {
- height: 500,
+ height: 'auto',
+ calcHeight: 420,
addBtn: false,
header: false,
align: 'center',
--
Gitblit v1.9.3