From a033706fb488540e4dc3042a94fdb6424d2f3077 Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Mon, 14 Oct 2024 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=B8=8E?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/model/CategoryDraggableModel.vue      | 49 ++++++++++++-------
 src/views/bpm/model/index_new.vue             |  8 +--
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index fa891e60..f118f9f7 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -9,7 +9,7 @@
         >
           <Icon icon="ep:arrow-down-bold" color="#999" />
         </div>
-        <div class="ml-auto mr-30px">
+        <div class="ml-auto mr-45px">
           <template v-if="!isSorting">
             <el-button link type="info" class="mr-10px" @click.stop="handleSort">
               <Icon icon="fa:sort-amount-desc" class="mr-5px" />
@@ -36,7 +36,8 @@
       <el-table
         :class="title"
         ref="tableRef"
-        :header-cell-style="{ backgroundColor: isDark ? '' : '#edeff0' }"
+        :header-cell-style="{ backgroundColor: isDark ? '' : '#edeff0', paddingLeft: '10px' }"
+        :cell-style="{ paddingLeft: '10px' }"
         :data="dataList"
       >
         <el-table-column label="流程名" prop="name" min-width="150">
@@ -48,7 +49,7 @@
                   class="drag-icon cursor-move text-#8a909c mr-10px"
                 />
               </el-tooltip>
-              <el-image :src="scope.row.icon" class="h-32px w-32px mr-10px rounded" />
+              <el-image :src="scope.row.icon" class="h-38px w-38px mr-10px rounded" />
               {{ scope.row.name }}
             </div>
           </template>
@@ -96,20 +97,22 @@
         </el-table-column>
         <el-table-column label="最后发布" prop="deploymentTime" min-width="250">
           <template #default="scope">
-            <span v-if="scope.row.processDefinition">
-              {{ formatDate(scope.row.processDefinition.deploymentTime) }}
-            </span>
-            <el-tag v-if="scope.row.processDefinition" class="ml-10px">
-              v{{ scope.row.processDefinition.version }}
-            </el-tag>
-            <el-tag v-else type="warning">未部署</el-tag>
-            <el-tag
-              v-if="scope.row.processDefinition?.suspensionState === 2"
-              type="warning"
-              class="ml-10px"
-            >
-              已停用
-            </el-tag>
+            <div class="flex items-center">
+              <span v-if="scope.row.processDefinition" class="w-150px">
+                {{ formatDate(scope.row.processDefinition.deploymentTime) }}
+              </span>
+              <el-tag v-if="scope.row.processDefinition">
+                v{{ scope.row.processDefinition.version }}
+              </el-tag>
+              <el-tag v-else type="warning">未部署</el-tag>
+              <el-tag
+                v-if="scope.row.processDefinition?.suspensionState === 2"
+                type="warning"
+                class="ml-10px"
+              >
+                已停用
+              </el-tag>
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
@@ -384,6 +387,9 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 :deep() {
+  .el-card {
+    border-radius: 8px;
+  }
   .el-form--inline .el-form-item {
     margin-right: 10px;
   }
@@ -400,5 +406,14 @@ onMounted(() => {
     font-size: 20px;
     font-weight: 500;
   }
+  .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+  .el-table__cell {
+    border-bottom: none !important;
+  }
+  .el-table__row {
+    height: 68px;
+  }
 }
 </style>
diff --git a/src/views/bpm/model/index_new.vue b/src/views/bpm/model/index_new.vue
index 2f2929ad..13cd765c 100644
--- a/src/views/bpm/model/index_new.vue
+++ b/src/views/bpm/model/index_new.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <div class="flex justify-between pl-20px items-center">
-      <h3 class="font-extrabold">表单管理</h3>
+      <h3 class="font-extrabold">流程模型</h3>
       <!-- 搜索工作栏 -->
       <el-form
         class="-mb-15px flex"
@@ -25,7 +25,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="openForm('create')" v-hasPermi="['bpm:model:create']">
-            <Icon icon="ep:plus" class="mr-5px" /> 新建流程
+            <Icon icon="ep:plus" class="mr-5px" /> 新建模型
           </el-button>
         </el-form-item>
 
@@ -38,11 +38,11 @@
               <el-dropdown-menu>
                 <el-dropdown-item>
                   <Icon icon="ep:circle-plus" :size="13" class="mr-5px" />
-                  新建分组
+                  新建分类
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <Icon icon="fa:sort-amount-desc" :size="13" class="mr-5px" />
-                  分组排序
+                  分类排序
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>