From 1bc96f6e6fea265782967ecfbfc165046f4473cf Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 23 Feb 2024 12:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9C=80=E6=B1=82=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/materialplan/detail.vue    |  4 +-
 .../src/views/heli/materialplan/index.vue     | 45 +++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
index 70d3d701..f985181e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="hl-card" style="position: relative">
     <template #header>
-      <span>编辑页</span>
+      <span>详情页</span>
     </template>
     <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
       <!--  基础信息   -->
@@ -591,4 +591,4 @@ onMounted(async () => {
   //用户信息，用于底部数据展示
   userList.value = await UserApi.getSimpleUserList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/index.vue
index 40f3babc..f219c43a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/index.vue
@@ -1,5 +1,9 @@
 <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="130px">
       <el-form-item label="物料计划单号" prop="projectMaterialPlanNo">
@@ -24,8 +28,8 @@
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery">
+      <el-form-item style="margin-left:15px">
+        <el-button @click="handleQuery" type="primary">
           <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
         <el-button @click="resetQuery">
@@ -40,42 +44,43 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="物料需求计划单号" align="center" prop="projectMaterialPlanNo" width="180" fixed>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+      <el-table-column label="序号" type="index" align="center" fixed min-width="70px" />
+      <el-table-column label="物料需求计划单号" align="center" prop="projectMaterialPlanNo" min-width="180" fixed>
         <template #default="scope">
-          <el-button text type="primary" @click="openForm('review', scope.row.id)">
+          <el-button text type="primary" @click="openForm('detail', scope.row.id)">
             {{ scope.row.projectMaterialPlanNo }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" width="180px" fixed>
+      <el-table-column label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" min-width="180px" fixed>
         <template #default="scope">
           {{
             formatDate(scope.row.createTime, 'YYYY-MM-DD')
           }}
         </template>
       </el-table-column>
-      <el-table-column label="生产计划单号" align="center" prop="planNo" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="创建人" align="center" prop="creator" >
+      <el-table-column label="生产计划单号" align="center" prop="planNo" min-width="180px" />
+      <el-table-column label="项目名称" align="center" prop="projectName" min-width="180px" />
+      <el-table-column label="备注" align="center" prop="description" min-width="180px" />
+      <el-table-column label="创建人" align="center" min-width="120px" prop="creator" >
         <template #default="scope">
             {{ userInit.find((user) => user.id == scope.row.creator)?.nickname }}
           </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="220" />
-      <el-table-column label="送审人" align="center" prop="submitUserId" />
-      <el-table-column label="送审时间" align="center" prop="submitTime" :formatter="dateFormatter" width="220" />
-      <el-table-column label="审核人" align="center" prop="auditor" />
-      <el-table-column label="审核时间" align="center" prop="auditTime" :formatter="dateFormatter" width="220" />
-      <el-table-column label="单据状态" align="center" prop="status" fixed="right">
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" min-width="220" />
+      <el-table-column label="送审人" align="center" prop="submitUserId" min-width="120" />
+      <el-table-column label="送审时间" align="center" prop="submitTime" :formatter="dateFormatter" min-width="220" />
+      <el-table-column label="审核人" align="center" prop="auditor" min-width="120" />
+      <el-table-column label="审核时间" align="center" prop="auditTime" :formatter="dateFormatter" min-width="220" />
+      <el-table-column label="单据状态" align="center" prop="status" fixed="right" min-width="150">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
 
 
-      <el-table-column label="操作" align="center" fixed="right">
+      <el-table-column label="操作" align="center" fixed="right" min-width="180">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row.id)" v-if="scope.row.status !== 2 && scope.row.status !==3">
             编辑
@@ -93,6 +98,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <MaterialPlanForm ref="formRef" @success="getList" />
+</el-card>
+
 </template>
 
 <script setup lang="ts">
@@ -208,4 +215,4 @@ onMounted(async () => {
   userInit.value = await UserApi.getSimpleUserList()
   getList()
 })
-</script>
\ No newline at end of file
+</script>