From 2596f7a9c843de0bd8adad2d7b0b5a68de7d0af8 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期四, 04 九月 2025 20:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

---
 src/views/flow/components/TodolistLeft.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index a195b40..6016d67 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -14,7 +14,7 @@
          <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸查攣瀹氾紝璇疯皑鎱庝娇鐢ㄣ�傞攣瀹氬師鍥狅細{{ remark }}</el-text>
          <el-text type="danger" v-if="row.processDefinitionKey === 'program-unlock'">绋嬪簭宸查攣瀹氾紝閿佸畾鍘熷洜锛歿{ remark }}</el-text>
          <el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">宸插浐鍖栫▼搴忓伐搴忕増娆′笉涓�鑷达紝娲惧伐鐗堟:{{row.variables.processEdition}},宸插浐鍖栫増娆★細{{row.variables.curedProcessEdition}}</el-text>
-        <el-table :data="tableData" border @row-click="showContent" max-height="200" highlight-current-row>
+        <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
             <!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
             </el-table-column> -->
            
@@ -109,7 +109,7 @@
             content1: '',
             content2: '',
             codeDiffFileName1: '鍥炰紶鐗堟湰',
-            codeDiffFileName2: '璇曞垏鐗堟湰',
+            codeDiffFileName2: '涓嬪彂鐗堟湰',
             showContentId: '',
             attForm: {
                 att: '',

--
Gitblit v1.9.3