From c56a6893b203f38b54311ec50d4a4bbaa16c67a0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 24 十月 2023 14:39:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index a961944..b29f9cf 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -12,7 +12,7 @@
<template slot="menu" slot-scope="{row,index}">
<el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" :disabled="row.usedFlag === 'true' ? false :true">缂栬緫</el-button>
<el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
- <el-button v-if="row.usedflag=='false'" icon="el-icon-position" size="small" type="text"
+ <el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small" type="text"
@click="ENABLE(row,index)">鍚敤
</el-button>
<el-button v-else icon="el-icon-finished" size="small" type="text" @click="DISABLE(row,index)">鍋滅敤
@@ -93,6 +93,7 @@
option: {
height: "auto",
calcHeight: 20,
+ columnBtn:false,
tip: false,
headerAlign: "center",
border: true,
@@ -109,7 +110,6 @@
addBtn: false,
editBtn: false,
delBtn: false,
- columnBtn: false,
column: [ {
label: '鏄惁鍚敤',
prop: 'usedFlag',
@@ -174,8 +174,9 @@
},{
label: 'soapAction',
prop: 'soapAction',
+ overHidden:true,
sortable: true,
- width: 150
+ width: 200
}, {
label: '璋冪敤鏂瑰紡',
prop: 'cxfaxis',
@@ -191,7 +192,8 @@
label: '璇锋眰鍦板潃',
prop: 'requestUrl',
sortable: true,
- width: 150
+ overHidden:true,
+ width: 200
}, {
label: '鎺ュ彛鍑芥暟',
prop: 'interfaceFunction',
@@ -263,7 +265,7 @@
//鍗曞厓鏍兼牱寮�
cellStyle(row,column,rowIndex,columnIndex){
if(row.columnIndex==2) {
- if(row.row.usedFlag == 'false'){
+ if(row.row.usedFlag == '' || row.row.usedFlag == 'false'){
return {
color: 'red',
fontWeight: 'bold',
@@ -324,10 +326,11 @@
this.editAttribute = row;
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
+ this.editAttribute.type = 'edit';
this.$refs.infoForm.formData = this.editAttribute;
this.$refs.infoForm.showSubmitDialog = true;
- console.log('row',row.dataFlowTypeText)
- console.log('editAttribute',this.editAttribute.dataFlowTypeText)
+ // console.log('row',this.editAttribute.pushType)
+ // console.log('editAttribute',this.editAttribute.dataFlowTypeText)
},
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -399,7 +402,7 @@
onLoad(page, params = {}) {
this.loading = true;
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
- console.log(res)
+ // console.log(res)
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -498,8 +501,24 @@
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.applyRangeTable > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
display: none !important;
}
+
+// 婊氬姩鏉℃牱寮忎慨鏀�
+// 婊氬姩鏉＄殑瀹藉害
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+
+}
+// 婊氬姩鏉＄殑婊戝潡
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+}
</style>
--
Gitblit v1.9.3