From d6669fa87601b306cd63303902729ecf0ef311a8 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 12 Jan 2024 12:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E8=B4=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/composition/CompositionForm.vue  | 10 +++++-----
 .../src/views/heli/composition/index.vue            | 13 +++++++++----
 .../src/views/heli/procedure/index.vue              |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue
index f78fbc56..fa6f0f5f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue
@@ -4,18 +4,18 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="108px"
       v-loading="formLoading"
     >
       <el-form-item label="材质名" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入材质名" />
+        <el-input v-model="formData.name" placeholder="请输入材质名" class="!w-250px" />
       </el-form-item>
       <el-form-item label="主要来源" prop="original">
         <el-select
           v-model="formData.original"
           placeholder="请选择主要来源"
           clearable
-          class="!w-240px"
+          class="!w-250px"
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMPOSITION_ORIGINAL)"
@@ -26,10 +26,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="密度" prop="density">
-        <el-input v-model="formData.density" placeholder="请输入密度" />
+        <el-input v-model="formData.density" placeholder="请输入密度" class="!w-250px" />
       </el-form-item>
       <el-form-item label="描述" prop="description">
-        <el-input type="textarea" v-model="formData.description" height="150px" />
+        <el-input type="textarea" v-model="formData.description" height="150px"  />
       </el-form-item>
       <el-form-item label="启用状态" prop="status">
         <el-radio-group v-model="formData.status">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
index 2a87680f..b9180fe4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
@@ -1,12 +1,16 @@
 <template>
-  <ContentWrap>
+<el-card class="hl-card">
+  <template #header>
+    <span>材质信息</span>
+  </template>
+    <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="108px"
     >
       <el-form-item label="材质名称" prop="name">
         <el-input
@@ -48,7 +52,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
           type="primary"
@@ -73,7 +77,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <el-table-column label="序号" type="index" width="100" />
       <el-table-column label="材质名称" align="center" prop="name" />
       <el-table-column label="主要来源" align="center" prop="original" >
@@ -125,6 +129,7 @@
     />
   </ContentWrap>
 
+</el-card>
   <!-- 表单弹窗：添加/修改 -->
   <CompositionForm ref="formRef" @success="getList" />
 </template>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
index d33154f1..c9ac6411 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue
@@ -1,7 +1,7 @@
 <template>
 <el-card class="hl-card">
   <template #header>
-    工序信息
+    <span>工序信息</span>
   </template>
     <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
@@ -42,7 +42,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
       <el-table-column label="工序编号" align="center" prop="code" />
       <el-table-column label="工序名称" align="center" prop="name" />