From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Web/src/views/wcs/wcsTask/component/editDialog.vue | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/Web/src/views/wcs/wcsTask/component/editDialog.vue b/Web/src/views/wcs/wcsTask/component/editDialog.vue
index 7b112e6..cbfe135 100644
--- a/Web/src/views/wcs/wcsTask/component/editDialog.vue
+++ b/Web/src/views/wcs/wcsTask/component/editDialog.vue
@@ -14,7 +14,7 @@
</el-form-item>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="浠诲姟鍙�" prop="taskNo">
- <el-input v-model="ruleForm.taskNo" placeholder="璇疯緭鍏ヤ换鍔″彿" maxlength="20" show-word-limit clearable />
+ <el-input v-model="ruleForm.taskNo" placeholder="浠诲姟鍙疯嚜鍔ㄧ敓鎴�" maxlength="20" show-word-limit clearable readonly/>
</el-form-item>
@@ -95,6 +95,12 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎷嗗灈绠辨暟" prop="qty">
+ <el-input-number v-model="ruleForm.qty" placeholder="璇疯緭鍏ユ媶鍨涚鏁�" clearable />
+ </el-form-item>
+
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -172,6 +178,20 @@
ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
if (isValid) {
let values = ruleForm.value;
+ //鍏ュ簱浠诲姟
+ if(ruleForm.value.taskType==0){
+ if(ruleForm.value.startLocate==undefined || ruleForm.value.startLocate.length!=3){
+ ElMessage.error("鍏ュ簱浠诲姟鐨勮捣濮嬩綅缃瓧绗﹂暱搴﹀簲鏄�3浣�");
+ return;
+ }
+ }
+ //鍑哄簱浠诲姟
+ if(ruleForm.value.taskType==1){
+ if(ruleForm.value.endLocate==undefined || ruleForm.value.endLocate.length!=3){
+ ElMessage.error("鍑哄簱浠诲姟鐨勭粨鏉熶綅缃瓧绗﹂暱搴﹀簲鏄�3浣�");
+ return;
+ }
+ }
if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
await addWcsTask(values);
} else {
--
Gitblit v1.8.0