From 8dab672f74f8caa891a818cffdb34488f2ec7dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E5=BA=86?= <18331150170@163.com>
Date: Thu, 6 Nov 2025 19:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E6=98=8E=E7=BB=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/taskdispatch/detailDialog.vue  | 99 ++++++++++++-------
 1 file changed, 65 insertions(+), 34 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
index 4ba8bcf5..9d2d8d50 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
@@ -194,39 +194,53 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
 				</template>
 				<el-row>
 					<el-col>
-            <el-checkbox-group  v-if="active != 'detail' && (formData.dispatchStatus == 1||formData.dispatchStatus == 0) " v-model="checkList" @change="onAddItem()">
-          <el-checkbox label="泡沫" size="large" border  :disabled="disabledLabels.includes('泡沫')"/>
-          <el-checkbox label="下料1" size="large" border  :disabled="disabledLabels.includes('下料1')"/>
-          <el-checkbox label="下料2" size="large" border  :disabled="disabledLabels.includes('下料2')"/>
-					<el-checkbox label="电焊" size="large" border :disabled="disabledLabels.includes('电焊')"/>
-					<el-checkbox label="编程" size="large" border :disabled="disabledLabels.includes('编程')"/>
-          <el-checkbox label="开粗1" size="large" border :disabled="disabledLabels.includes('开粗1')"/>
-          <el-checkbox label="开粗2" size="large" border :disabled="disabledLabels.includes('开粗2')"/>
-          <el-checkbox label="铣床1"  size="large" border :disabled="disabledLabels.includes('铣床1')"/>
-          <el-checkbox label="铣床2"  size="large" border :disabled="disabledLabels.includes('铣床2')"/>
-          <el-checkbox label="车床1" size="large" border  :disabled="disabledLabels.includes('车床1')"/>
-          <el-checkbox label="车床2" size="large" border  :disabled="disabledLabels.includes('车床2')"/>
-          <el-checkbox label="热处理1"  size="large" border :disabled="disabledLabels.includes('热处理1')" />
-          <el-checkbox label="热处理2"  size="large" border :disabled="disabledLabels.includes('热处理2')" />
-          <el-checkbox label="热处理3"  size="large" border :disabled="disabledLabels.includes('热处理3')" />
-          <el-checkbox label="磨床1" size="large" border :disabled="disabledLabels.includes('磨床1')"  />
-          <el-checkbox label="磨床2" size="large" border :disabled="disabledLabels.includes('磨床2')"  />
-          <el-checkbox label="数控1" size="large" border :disabled="disabledLabels.includes('数控1')"/>
-          <el-checkbox label="数控2"  size="large" border :disabled="disabledLabels.includes('数控2')"/>
-          <el-checkbox label="数控3"  size="large" border :disabled="disabledLabels.includes('数控3')"/>
-          <el-checkbox label="线切割1"  size="large" border :disabled="disabledLabels.includes('线切割1')"/>
-          <el-checkbox label="线切割2"  size="large" border :disabled="disabledLabels.includes('线切割2')"/>
-          <el-checkbox label="电极"  size="large" border :disabled="disabledLabels.includes('电极')"/>
-          <el-checkbox label="火花1" size="large" border :disabled="disabledLabels.includes('火花1')"/>
-          <el-checkbox label="火花2" size="large" border :disabled="disabledLabels.includes('火花2')"/>
-          <el-checkbox label="刻字" size="large" border :disabled="disabledLabels.includes('刻字')"/>
-					<el-checkbox label="网格1" size="large" border  :disabled="disabledLabels.includes('网格1')"/>
-					<el-checkbox label="网格2" size="large" border  :disabled="disabledLabels.includes('网格2')"/>
-          <el-checkbox label="深孔钻1" size="large" border :disabled="disabledLabels.includes('深孔钻1')" />
-          <el-checkbox label="深孔钻2" size="large" border :disabled="disabledLabels.includes('深孔钻2')" />
-					<el-checkbox label="钻孔1" size="large" border  :disabled="disabledLabels.includes('钻孔1')"/>
-					<el-checkbox label="钻孔2" size="large" border  :disabled="disabledLabels.includes('钻孔2')"/>
-					<el-checkbox label="定制" size="large" border  :disabled="disabledLabels.includes('定制')"/>
+            <el-checkbox-group class="checkGroup" v-if="active != 'detail' && (formData.dispatchStatus == 1||formData.dispatchStatus == 0) " v-model="checkList" @change="onAddItem()">
+							<el-row>
+								<el-checkbox label="泡沫" size="default" border  :disabled="disabledLabels.includes('泡沫')"/>
+								<el-checkbox label="电焊" size="default" border :disabled="disabledLabels.includes('电焊')"/>
+								<el-checkbox label="编程" size="default" border :disabled="disabledLabels.includes('编程')"/>
+							</el-row>
+							<el-row> 
+								<el-checkbox label="下料1" size="default" border  :disabled="disabledLabels.includes('下料1')"/>
+								<el-checkbox label="车床1" size="default" border  :disabled="disabledLabels.includes('车床1')"/>
+								<el-checkbox label="磨床1" size="default" border :disabled="disabledLabels.includes('磨床1')"  />
+								<el-checkbox label="线切割1"  size="default" border :disabled="disabledLabels.includes('线切割1')"/>
+								<el-checkbox label="开粗1" size="default" border :disabled="disabledLabels.includes('开粗1')"/>
+								<el-checkbox label="铣床1"  size="default" border :disabled="disabledLabels.includes('铣床1')"/>
+								<el-checkbox label="热处理1"  size="default" border :disabled="disabledLabels.includes('热处理1')" />
+								<el-checkbox label="数控1" size="default" border :disabled="disabledLabels.includes('数控1')"/>
+								<el-checkbox label="电极"  size="default" border :disabled="disabledLabels.includes('电极')"/>
+								<el-checkbox label="刻字" size="default" border :disabled="disabledLabels.includes('刻字')"/>
+								<el-checkbox label="网格1" size="default" border  :disabled="disabledLabels.includes('网格1')"/>
+								<el-checkbox label="深孔钻1" size="default" border :disabled="disabledLabels.includes('深孔钻1')" />
+								<el-checkbox label="钻孔1" size="default" border  :disabled="disabledLabels.includes('钻孔1')"/>
+						</el-row>
+						<el-row>
+							<el-checkbox label="下料2" size="default" border  :disabled="disabledLabels.includes('下料2')"/>
+							<el-checkbox label="车床2" size="default" border  :disabled="disabledLabels.includes('车床2')"/>
+							<el-checkbox label="磨床2" size="default" border :disabled="disabledLabels.includes('磨床2')"  />
+							<el-checkbox label="线切割2"  size="default" border :disabled="disabledLabels.includes('线切割2')"/>
+							<el-checkbox label="开粗2" size="default" border :disabled="disabledLabels.includes('开粗2')"/>
+							<el-checkbox label="铣床2"  size="default" border :disabled="disabledLabels.includes('铣床2')"/>
+							<el-checkbox label="热处理2"  size="default" border :disabled="disabledLabels.includes('热处理2')" />
+							<el-checkbox label="数控2"  size="default" border :disabled="disabledLabels.includes('数控2')"/>
+							<el-checkbox label="火花1" size="default" border :disabled="disabledLabels.includes('火花1')"/>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="网格2" size="default" border  :disabled="disabledLabels.includes('网格2')"/>
+							<el-checkbox label="深孔钻2" size="default" border :disabled="disabledLabels.includes('深孔钻2')" />
+							<el-checkbox label="钻孔2" size="default" border  :disabled="disabledLabels.includes('钻孔2')"/>
+
+						</el-row>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="定制" size="default" border  :disabled="disabledLabels.includes('定制')"/>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="占位" size="default" border  class="opacity-0"/>
+							<el-checkbox label="热处理3"  size="default" border :disabled="disabledLabels.includes('热处理3')" />
+							<el-checkbox label="数控3"  size="default" border :disabled="disabledLabels.includes('数控3')"/>
+							<el-checkbox label="火花2" size="default" border :disabled="disabledLabels.includes('火花2')"/>
+							
 
 						<!-- 2025 06 01 以下工序关闭 更新为上面的-->
 					<!-- <el-checkbox label="铣床" size="large" border />
@@ -241,7 +255,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
           <el-checkbox label="钻孔" size="large" border /> -->
           <!-- <el-checkbox label="编程" size="large" border  />
           <el-checkbox label="开粗" size="large" border  /> -->
-        </el-checkbox-group>
+        		</el-checkbox-group>
 						<!-- <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem">新增</el-button> -->
 					</el-col>
 					<el-col>
@@ -1973,4 +1987,21 @@ const printHandle = (id) => {
     top: 3px;
     width: 5px;
 } */
+.checkGroup{ 
+	white-space: nowrap;
+	overflow: auto;
+	.el-row{
+		display: block;
+	}
+	.el-checkbox.is-bordered{
+		width: 100px;
+		padding: 0 7px;
+		margin-right: 4px;
+		.el-checkbox__label{
+				padding-left: 5px;
+				font-size: 1rem;
+		}
+	}
+}
+
 </style>