From 03e08705a1a493394fffc14c9a9bd106760a4780 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 28 Feb 2024 10:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E3=80=91=E7=BC=96=E8=BE=91=E9=A1=B5=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=20=20=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/purchaseorder/detail.vue   | 20 +++++++++----------
 .../src/views/heli/purchaseorder/edit.vue     | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
index 7a7b4f4a..dfba7b11 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="hl-card" style="position: relative" >
     <template #header>
-      <span>编辑页</span>
+      <span>详情页</span>
     </template>
      <div class="abstatus">
       <img src="/src/assets/imgs/status/status8.png" v-if="formData.status == 2" alt="" />
@@ -159,8 +159,8 @@
               <el-form ref="subFormRef" :model="formData.matItemDOList" :rules="subFormRules"
                 v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
-                  <el-table-column type="index" label="序号" :width="80" />
-                  <el-table-column prop="matId" min-width="180" align="center">
+                 <el-table-column type="index" label="序号" fixed align="center" width="60" />
+                  <el-table-column prop="matId" min-width="200" fixed align="center">
                     <template #header> <span class="hl-table_header">*</span>物料编码/名称 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
@@ -182,13 +182,13 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
-                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                  <el-table-column prop="matUnit" label="系统单位" min-width="100" align="center">
                     <template #default="scope">
                       <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
                         v-if="scope.row.matUnit ? true : false" disabled/>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="purchaseAmount" min-width="120" align="center">
+                  <el-table-column prop="purchaseAmount" min-width="180" align="center">
                     <template #header><span class="hl-table_header">*</span>采购数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.purchaseAmount`" :rules="subFormRules.purchaseAmount" class="mb-0px!">
@@ -196,7 +196,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="estimatedPrice" min-width="120" align="center">
+                  <el-table-column prop="estimatedPrice" min-width="200" align="center">
                     <template #header><span class="hl-table_header">*</span>暂估价金额</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.estimatedPrice`" :rules="subFormRules.estimatedPrice" class="mb-0px!">
@@ -204,7 +204,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="actualPrice" min-width="120" align="center">
+                  <el-table-column prop="actualPrice" min-width="200" align="center">
                     <template #header>实际价金额</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.actualPrice`"  class="mb-0px!">
@@ -212,7 +212,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column min-width="150" align="center">
+                  <el-table-column min-width="180" align="center">
                     <template #header> <span class="hl-table_header">*</span>预计到货日期 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.arriveTime`"  class="mb-0px!">
@@ -223,10 +223,10 @@
                   </el-table-column>
                   <el-table-column prop="description" min-width="180" label="备注" align="center">
                     <template #default="scope">
-                      <el-input v-model="scope.row.description" disabled />
+                      <el-input v-model="scope.row.description" disabled class="!w-180px" />
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="240">
+                  <el-table-column label="操作" align="center" min-width="100" fixed="right">
                     <template #default="scope">
                       <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)" disabled>
                         删除
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
index 2a20ac8f..754ae5d2 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
@@ -153,8 +153,8 @@
               <el-form ref="subFormRef" :model="formData.matItemDOList" :rules="subFormRules"
                 v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
-                  <el-table-column type="index" label="序号" :width="80" />
-                  <el-table-column prop="matId" min-width="140" align="center">
+                  <el-table-column type="index" label="序号" fixed align="center" width="60" />
+                  <el-table-column prop="matId" fixed min-width="200" align="center">
                     <template #header> <span class="hl-table_header">*</span>物料编码/名称 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
@@ -163,7 +163,7 @@
                           @change="(val) => handleMatName(scope, val)" class="!w-180px">
                           <el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
                         </el-select> -->
-                         <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
+                         <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)"  />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -176,13 +176,13 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
-                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                  <el-table-column prop="matUnit" label="系统单位" min-width="100" align="center">
                     <template #default="scope">
                       <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
                         v-if="scope.row.matUnit ? true : false" />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="purchaseAmount" min-width="120" align="center">
+                  <el-table-column prop="purchaseAmount" min-width="180" align="center">
                     <template #header><span class="hl-table_header">*</span>采购数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.purchaseAmount`" :rules="subFormRules.purchaseAmount" class="mb-0px!">
@@ -190,7 +190,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="estimatedPrice" min-width="120" align="center">
+                  <el-table-column prop="estimatedPrice" min-width="200" align="center">
                     <template #header><span class="hl-table_header">*</span>暂估价金额</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.estimatedPrice`" :rules="subFormRules.estimatedPrice" class="mb-0px!">
@@ -198,7 +198,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column prop="actualPrice" min-width="120" align="center">
+                  <el-table-column prop="actualPrice" min-width="200" align="center">
                     <template #header>实际价金额</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.actualPrice`"  class="mb-0px!">
@@ -206,7 +206,7 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column min-width="150" align="center">
+                  <el-table-column min-width="180" align="center">
                     <template #header> <span class="hl-table_header">*</span>预计到货日期 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.arriveTime`"  class="mb-0px!">
@@ -217,10 +217,10 @@
                   </el-table-column>
                   <el-table-column prop="description" min-width="180" label="备注" align="center">
                     <template #default="scope">
-                      <el-input v-model="scope.row.description" />
+                      <el-input v-model="scope.row.description" class="!w-180px" />
                     </template>
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="240">
+                  <el-table-column label="操作" fixed="right" align="center"  min-width="100">
                     <template #default="scope">
                       <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)">
                         删除