From b09ebfb0bc5fc72af0b58bb29764ee89afceff97 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 01 12月 2024 15:59:06 +0800
Subject: [PATCH] 1

---
 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue |  128 ++++++++++++++++++------------------------
 1 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
index 9b00e9f..6dccf1b 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -13,6 +13,34 @@
 						<el-input v-model="ruleForm.id" />
 					</el-form-item>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="閮ㄤ欢鏉$爜" prop="upi">
+							<el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鎵规鍙�" prop="planNo">
+							<el-input v-model="ruleForm.planNo" placeholder="璇疯緭鍏ユ壒娆″彿" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="璁㈠崟鍙�" prop="orderId">
+							<el-input v-model="ruleForm.orderId" placeholder="璇疯緭鍏ヨ鍗曞彿" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鐢熶骇鍗曞彿" prop="info5">
+							<el-input v-model="ruleForm.info5" placeholder="璇疯緭鍏ョ敓浜у崟鍙�" maxlength="60" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="鎵�鍦ㄥ尯鍩�" prop="areaCode">
 							<el-select clearable v-model="ruleForm.areaCode" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�">
 								<el-option v-for="(item,index) in  getEnumAreaCodeData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
@@ -33,29 +61,15 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="鎵规鍙�" prop="planNo">
-							<el-input v-model="ruleForm.planNo" placeholder="璇疯緭鍏ユ壒娆″彿" maxlength="50" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="璁㈠崟鍙�" prop="orderId">
-							<el-input v-model="ruleForm.orderId" placeholder="璇疯緭鍏ヨ鍗曞彿" maxlength="50" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閮ㄤ欢鏉$爜" prop="upi">
-							<el-input v-model="ruleForm.upi" placeholder="璇疯緭鍏ラ儴浠舵潯鐮�" maxlength="50" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="閮ㄤ欢鍚嶇О" prop="detailName">
 							<el-input v-model="ruleForm.detailName" placeholder="璇疯緭鍏ラ儴浠跺悕绉�" maxlength="50" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鏉愭枡" prop="info18">
+							<el-input v-model="ruleForm.info18" placeholder="璇疯緭鍏ユ潗鏂�" maxlength="50" show-word-limit clearable />
 							
 						</el-form-item>
 						
@@ -82,36 +96,8 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閮ㄤ欢绾圭悊" prop="matgrid">
-							<el-input v-model="ruleForm.matgrid" placeholder="璇疯緭鍏ラ儴浠剁汗鐞�" maxlength="50" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="鏄惁灏佽竟" prop="isEB">
-							<el-input-number v-model="ruleForm.isEB" placeholder="璇疯緭鍏ユ槸鍚﹀皝杈�" clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="鎵撳瓟璁惧缂栧彿" prop="dRNum">
-							<el-input-number v-model="ruleForm.dRNum" placeholder="璇疯緭鍏ユ墦瀛旇澶囩紪鍙�" clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="鏄惁浼樺寲鍖呰" prop="isPA">
 							<el-input-number v-model="ruleForm.isPA" placeholder="璇疯緭鍏ユ槸鍚︿紭鍖栧寘瑁�" clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閿垏鍥惧彿" prop="materialIndeX">
-							<el-input-number v-model="ruleForm.materialIndeX" placeholder="璇疯緭鍏ラ敮鍒囧浘鍙�" clearable />
 							
 						</el-form-item>
 						
@@ -159,13 +145,6 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="杞悜瑙掑害" prop="rotation">
-							<el-input v-model="ruleForm.rotation" placeholder="璇疯緭鍏ヨ浆鍚戣搴�" maxlength="53" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="绾哥闀�" prop="info1">
 							<el-input v-model="ruleForm.info1" placeholder="璇疯緭鍏ョ焊绠遍暱" maxlength="53" show-word-limit clearable />
 							
@@ -189,13 +168,6 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="閿�鍞悎鍚屽崟鍙�" prop="info4">
 							<el-input v-model="ruleForm.info4" placeholder="璇疯緭鍏ラ攢鍞悎鍚屽崟鍙�" maxlength="60" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="鐢熶骇鍗曞彿" prop="info5">
-							<el-input v-model="ruleForm.info5" placeholder="璇疯緭鍏ョ敓浜у崟鍙�" maxlength="60" show-word-limit clearable />
 							
 						</el-form-item>
 						
@@ -257,13 +229,6 @@
 						
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="閮ㄤ欢鍚嶇О" prop="info14">
-							<el-input v-model="ruleForm.info14" placeholder="璇疯緭鍏ラ儴浠跺悕绉�" maxlength="60" show-word-limit clearable />
-							
-						</el-form-item>
-						
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="閮ㄤ欢鏁伴噺" prop="info15">
 							<el-input-number v-model="ruleForm.info15" placeholder="璇疯緭鍏ラ儴浠舵暟閲�" clearable />
 							
@@ -273,6 +238,23 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="閮ㄤ欢灏哄" prop="info16">
 							<el-input v-model="ruleForm.info16" placeholder="璇疯緭鍏ラ儴浠跺昂瀵�" maxlength="60" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鏈烘鑷傛槸鍚︽棆杞�" prop="info17">
+							<el-input v-model="ruleForm.info17" placeholder="璇疯緭鍏ユ満姊拌噦鏄惁鏃嬭浆" maxlength="60" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="鏍囪" prop="upiFlag">
+							<el-select clearable v-model="ruleForm.upiFlag" placeholder="璇烽�夋嫨鏍囪">
+								<el-option v-for="(item,index) in  getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
+								
+							</el-select>
 							
 						</el-form-item>
 						
@@ -305,6 +287,7 @@
 
 	const getEnumAreaCodeData = ref<any>([]);
 	const getEnumUpiStatusData = ref<any>([]);
+	const getEnumUpiFlagData = ref<any>([]);
 	//鐖剁骇浼犻�掓潵鐨勫弬鏁�
 	var props = defineProps({
 		title: {
@@ -321,10 +304,10 @@
 	const ruleForm = ref<any>({});
 	//鑷娣诲姞鍏朵粬瑙勫垯
 	const rules = ref<FormRules>({
-		upiStatus: [{required: true, message: '璇烽�夋嫨鏉挎枡鐘舵�侊紒', trigger: 'change',},],
+		upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
 		planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
 		orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
-		upi: [{required: true, message: '璇疯緭鍏ラ儴浠舵潯鐮侊紒', trigger: 'blur',},],
+		upiStatus: [{required: true, message: '璇烽�夋嫨鏉挎枡鐘舵�侊紒', trigger: 'change',},],
 		detailName: [{required: true, message: '璇疯緭鍏ラ儴浠跺悕绉帮紒', trigger: 'blur',},],
 		length: [{required: true, message: '璇疯緭鍏ラ暱锛�', trigger: 'blur',},],
 		width: [{required: true, message: '璇疯緭鍏ュ锛�', trigger: 'blur',},],
@@ -402,6 +385,7 @@
 	onMounted(async () => {
 			getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
 			getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
+			getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
 	});
 
 	//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�

--
Gitblit v1.9.3