From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 三月 2024 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 4a6681e..08f7265 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -110,7 +110,7 @@
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}],
page: {
- pageSize: 10,
+ pageSize: 20,
currentPage: 1,
total: 100
},
@@ -162,7 +162,7 @@
prop: 'isGroupCodeFlag',
sortable: true,
width: 150,
- formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+ formatter: res => res.isGroupCodeFlag === 'true' ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
}, {
label: '鎺ュ彛绫诲瀷',
prop: 'dataFlowTypeText',
@@ -378,7 +378,8 @@
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
this.editAttribute.type = 'edit';
- this.$refs.infoForm.formData = this.editAttribute;
+ this.$refs.infoForm.formData = row;
+ this.$refs.infoForm.groupCode = row.isGroupCodeFlag === 'true' ? true : false;
this.$refs.infoForm.showSubmitDialog = true;
//header瀵硅薄
HeaderRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
--
Gitblit v1.10.0