From 8bfe5dcf83cdcaa90c45ad86a8b464238748de7c Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 16:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 5e346a1..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
@@ -68,6 +68,13 @@
</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>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="闀�" prop="length">
<el-input v-model="ruleForm.length" placeholder="璇疯緭鍏ラ暱" maxlength="53" show-word-limit clearable />
@@ -222,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 />
@@ -245,6 +245,16 @@
<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>
@@ -277,6 +287,7 @@
const getEnumAreaCodeData = ref<any>([]);
const getEnumUpiStatusData = ref<any>([]);
+ const getEnumUpiFlagData = ref<any>([]);
//鐖剁骇浼犻�掓潵鐨勫弬鏁�
var props = defineProps({
title: {
@@ -374,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