From 10a65bdb100ea964d5eff3b67198c89c6c3ba9e7 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 11 九月 2024 16:15:05 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Web/src/views/device/wcsOderTask/component/editDialog.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Web/src/views/device/wcsOderTask/component/editDialog.vue b/Web/src/views/device/wcsOderTask/component/editDialog.vue
index 29bd0c4..652ccb2 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="璇烽�夋嫨鏄惁鍥為鎴愬姛">
@@ -115,7 +115,7 @@
</template>
</el-dialog>
- <!-- 缁戝畾浠诲姟寮规 -->
+ <!-- 閫夋嫨鐗╂枡寮规 -->
<el-dialog v-model="bindDialogVisible" title="閫夋嫨鏁版嵁">
<el-table
:data="bindBoxData"
--
Gitblit v1.8.0