From 5a877284e06eb1cfe5d862ff755ad105fc6a7c3c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 31 八月 2023 10:57:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 43ccb07..eb7c585 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -200,7 +200,7 @@
width: 150
}, {
label: '鍙傛暟鍚嶇О',
- prop: 'targName',
+ prop: 'targetName',
sortable: true,
width: 150
},{
@@ -263,7 +263,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 +324,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("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -417,7 +418,7 @@
// interfaceFunction:'',
// nameSpace:'',
// soapAction:'',
- // targName:'',
+ // targetName:'',
// cxfaxis:''
// };
// this.pushTypeList.forEach(item => {
@@ -467,7 +468,7 @@
fieldType: 'text'
}, {
title: '鍙傛暟鍚嶇О',
- queryField: 'targName',
+ queryField: 'targetName',
fieldType: 'text'
}, {
title: '璋冪敤鏂瑰紡',
--
Gitblit v1.10.0