From 5999e9c77ee30a7090ed7f6cdd07d82fe9a4015b Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 11 九月 2024 08:44:06 +0800
Subject: [PATCH] Merge branch 'master' into liudl

---
 Web/src/views/device/wcsOderTask/component/editDialog.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Web/src/views/device/wcsOderTask/component/editDialog.vue b/Web/src/views/device/wcsOderTask/component/editDialog.vue
index 29bd0c4..d0d0468 100644
--- a/Web/src/views/device/wcsOderTask/component/editDialog.vue
+++ b/Web/src/views/device/wcsOderTask/component/editDialog.vue
@@ -71,7 +71,7 @@
 						</el-form-item>
 						
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="鐘舵��" prop="status">
 							<el-select clearable v-model="ruleForm.status" placeholder="璇烽�夋嫨鐘舵��">
 								<el-option v-for="(item,index) in dl('TaskStatusEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
@@ -80,7 +80,7 @@
 							
 						</el-form-item>
 						
-					</el-col>
+					</el-col> -->
 					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="鏄惁鍥為鎴愬姛" prop="isSuccess">
 							<el-select clearable v-model="ruleForm.isSuccess" placeholder="璇烽�夋嫨鏄惁鍥為鎴愬姛">

--
Gitblit v1.8.0