From cd77dfb35a639ed5a7ab4635852635d797fc8461 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 12 Jan 2024 12:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/material/MaterialForm.vue  | 27 ++++++++++---------
 .../src/views/heli/material/index.vue         | 11 +++++---
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
index 02b487b6..78bd5d37 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
@@ -11,13 +11,13 @@
       <UploadImg v-model="formData.logo" />
     </el-form-item>
       <el-form-item label="物料编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入物料编码" />
+        <el-input v-model="formData.code" placeholder="请输入物料编码" class="!w-250px" />
       </el-form-item>
       <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="materialType">
-        <el-select v-model="formData.materialType" placeholder="请选择物料类型">
+        <el-select v-model="formData.materialType" placeholder="请选择物料类型" class="!w-250px">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)"
             :key="dict.value"
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="系统单位" prop="unit">
-        <el-select v-model="formData.unit" placeholder="请选择系统单位">
+        <el-select v-model="formData.unit" placeholder="请选择系统单位" class="!w-250px">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.HELI_MATERIAL_UNIT)"
             :key="dict.value"
@@ -37,16 +37,16 @@
         </el-select>
       </el-form-item>
       <el-form-item label="物料简称" prop="shortName">
-        <el-input v-model="formData.shortName" placeholder="请输入物料简称" />
+        <el-input v-model="formData.shortName" placeholder="请输入物料简称" class="!w-250px" />
       </el-form-item>
       <el-form-item label="规格/型号" prop="spec">
-        <el-input v-model="formData.spec" placeholder="请输入规格/型号" />
+        <el-input v-model="formData.spec" placeholder="请输入规格/型号" class="!w-250px" />
       </el-form-item>
       <el-form-item label="品牌" prop="brand">
-        <el-input v-model="formData.brand" placeholder="请输入品牌" />
+        <el-input v-model="formData.brand" placeholder="请输入品牌" class="!w-250px" />
       </el-form-item>
       <el-form-item label="物料主要来源" prop="mainFrom">
-        <el-select v-model="formData.mainFrom" placeholder="请选择物料主要来源">
+        <el-select v-model="formData.mainFrom" placeholder="请选择物料主要来源" class="!w-250px">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_ORIGINAL)"
             :key="dict.value"
@@ -64,6 +64,7 @@
                    reserve-keyword
                    filterable
                    :loading="supplierSelectLoading"
+                   class="!w-250px"
         >
           <el-option
             v-for="item in supplierSelectList"
@@ -73,13 +74,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="销项税率/进项税率" prop="outputInputTaxRate">
-        <el-input v-model="formData.outputInputTaxRate" placeholder="请输入销项税率/进项税率" >
+      <el-form-item label="销项/进项税率" prop="outputInputTaxRate">
+        <el-input v-model="formData.outputInputTaxRate" placeholder="请输入销项税率/进项税率" class="!w-250px" >
           <template #append>%</template>
         </el-input>
       </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" class="!w-500px" />
       </el-form-item>
       <el-form-item label="启用状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -93,10 +94,10 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="安全库存" prop="invSafe">
-        <el-input v-model="formData.invSafe" placeholder="请输入安全库存" />
+        <el-input v-model="formData.invSafe" placeholder="请输入安全库存" class="!w-250px" />
       </el-form-item>
       <el-form-item label="物料条码" prop="barcode">
-        <el-input v-model="formData.barcode" placeholder="请输入物料条码" />
+        <el-input v-model="formData.barcode" placeholder="请输入物料条码" class="!w-250px" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue
index c443a47f..acc33dd8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/index.vue
@@ -1,12 +1,14 @@
 <template>
-  <ContentWrap>
+<el-card class="hl-card">
+  <template #header>物料信息</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="code">
         <el-input
@@ -57,7 +59,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"
@@ -82,7 +84,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 fixed label="序号" type="index" width="100" />
       <el-table-column fixed label="物料编码" align="center" prop="code" />
       <el-table-column label="物料名称" align="center" prop="name" />
@@ -140,6 +142,7 @@
     />
   </ContentWrap>
 
+</el-card>
   <!-- 表单弹窗：添加/修改 -->
   <MaterialForm ref="formRef" @success="getList" />
 </template>