From 4066f7937ffe28a3aa97e766f2d269da48019d81 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 31 Jan 2024 13:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/hlvuestyle/userSelect.vue       |  2 +-
 .../src/views/heli/projectorder/index.vue          | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
index 14bba2c2..cca1495c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue
@@ -77,7 +77,7 @@ const gitlist = async () => {
     // loading.value = false
   }
   userSelectList.value = userList.value
-  console.log(userList.value);
+  // console.log(userList.value);
   loading.value = false
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
index 104f706c..82bb86bd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue
@@ -221,7 +221,8 @@
             <dict-tag :type="DICT_TYPE.HELI_DELIVERY_STATUS" :value="scope.row.deliveryStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" min-width="260">
+        <el-table-column align="right" fixed="right" min-width="240">
+          <template #header> <span style="margin-right:30%">操作</span> </template>
           <template #default="scope">
             <el-row>
               <el-col>
@@ -260,11 +261,9 @@
                       <el-dropdown-item v-if="scope.row.orderStatus == 32" command="alter"
                         >订单变更</el-dropdown-item
                       >
-                      <el-dropdown-item command="viewArchive"
-                        >查看归档日志</el-dropdown-item
-                      >
-<!--  临时隐藏，分阶段上线                    -->
-<!--                      <el-dropdown-item v-if="scope.row.orderStatus == 32" command="delivery"
+                      <el-dropdown-item command="viewArchive">查看归档日志</el-dropdown-item>
+                      <!--  临时隐藏，分阶段上线                    -->
+                      <!--                      <el-dropdown-item v-if="scope.row.orderStatus == 32" command="delivery"
                         >去发货</el-dropdown-item
                       >-->
                     </el-dropdown-menu>
@@ -294,7 +293,7 @@ import { dateFormatter, dateFormatter2, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ProjectOrderApi from '@/api/heli/projectorder'
 import Print from './startprint.vue' // 引入打印弹框
-import {ref} from "vue";
+import { ref } from 'vue'
 
 defineOptions({ name: 'ProjectOrder' })
 
@@ -447,7 +446,6 @@ onMounted(() => {
 onActivated(() => {
   getList()
 })
-
 </script>
 
 <style scoped>