From 7e952a339cca0dd65e01f2d0b11fd27c570f6607 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 28 九月 2023 23:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 9caf94c..acfbe07 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)">鍋滅敤
@@ -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',
@@ -327,8 +329,8 @@
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("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -400,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;
--
Gitblit v1.9.3