From 59f27b9d35c904f6b070515e1e9bd643e9e769f2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Jun 2024 15:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/log/components/LogForm.vue | 14 ++++++-------
 src/views/system/log/index.vue              | 23 ++++++++++-----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/system/log/components/LogForm.vue b/src/views/system/log/components/LogForm.vue
index 6880cde4..2a3dc551 100644
--- a/src/views/system/log/components/LogForm.vue
+++ b/src/views/system/log/components/LogForm.vue
@@ -31,6 +31,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="发布日期">
+          <el-date-picker
+            v-model="form.PublishTime"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          />
+        </el-form-item>
         <el-form-item label="是否当前版本" prop="IsCurrentVersion">
           <el-select v-model="form.IsCurrentVersion" placeholder="请选择">
             <el-option
@@ -42,13 +49,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布日期">
-          <el-date-picker
-            v-model="form.PublishTime"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          />
-        </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 1bb8ce3f..0775865f 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -55,19 +55,9 @@
           prop="State"
           min-width="150"
           show-overflow-tooltip
-        >
-        <template slot-scope="scope">
-          <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
-        </template>
-        </el-table-column>
-        <el-table-column
-          label="是否当前版本"
-          prop="IsCurrentVersion"
-          min-width="150"
-          show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
+            <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -85,7 +75,16 @@
             }}
           </template>
         </el-table-column>
-
+        <el-table-column
+          label="是否当前版本"
+          prop="IsCurrentVersion"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           fixed="right"