From 4b96bdad5e1dde551161a9a357eddff067eea7e6 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Fri, 17 Jan 2025 16:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9E=8B=E5=8F=B7=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E6=A8=A1=E5=85=B7=E7=B1=BB=E5=9E=8B=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/plan/edit.vue              | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
index 0873770..782aec2 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
@@ -342,6 +342,18 @@ v-model="scope.row.mouldId" clearable placeholder="下拉选择" disabled
                       </el-form-item>
                     </template>
                   </el-table-column>
+                  <el-table-column prop="equipId" align="center" min-width="140px">
+                    <template #header> 设备型号 </template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
+                        <!-- <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">
+                          <el-option v-for="dict in scope.row.equipList" :key="dict.id" :label="dict.name"
+                            :value="dict.id" />
+                        </el-select> -->
+                        <EquipSelect v-model="scope.row.equipId" @update:new-value="handleSelectedequip(scope, $event)"  />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
                   <el-table-column min-width="180px" align="center">
                     <template #header>毛坯开始日期</template>
                     <template #default="{ row, $index }">
@@ -446,18 +458,6 @@ class="!w-265px" v-model="row.threeDimDate" type="date" value-format="x"
                     </template>
                   </el-table-column>
                   <el-table-column prop="compositionName" label="主要材质" min-width="100px" align="center" />
-                  <el-table-column prop="equipId" align="center" min-width="140px">
-                    <template #header> 设备型号 </template>
-                    <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
-                        <!-- <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">
-                          <el-option v-for="dict in scope.row.equipList" :key="dict.id" :label="dict.name"
-                            :value="dict.id" />
-                        </el-select> -->
-                        <EquipSelect v-model="scope.row.equipId" @update:new-value="handleSelectedequip(scope, $event)"  />
-                      </el-form-item>
-                    </template>
-                  </el-table-column>
                   <el-table-column prop="projectSubCode" label="子项目编号" min-width="180px" align="center" />
                   <el-table-column prop="unit" label="单位" min-width="90px" align="center">
                     <template #default="scope">