From 5948315e24e88cf5b87c0aefb12c51c886da7601 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 19:50:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/warehouseManage/position/AddDialog.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index 19ece9a..cdec43d 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -53,7 +53,7 @@
v-model="editConfig.infomation.parentId"
placeholder="璇烽�夋嫨"
size="mini"
- :disabled="!showFooter"
+ :disabled="editCommonConfig.title=='缂栬緫'"
style="width: 90%"
>
<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
@@ -68,7 +68,7 @@
<el-select
v-model="editConfig.infomation.type"
filterable
- :disabled="!showFooter"
+ :disabled="editCommonConfig.title=='缂栬緫'"
placeholder="璇烽�夋嫨"
style="width: 90%"
no-data-text="鏆傛棤鏁版嵁"
@@ -202,6 +202,7 @@
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+ parentId: [{ required: true, message: "璇烽�夋嫨涓婄骇浣嶇疆", trigger: "change" }],
countFrequency: [
{
required: false,
@@ -292,7 +293,8 @@
notes: data.notes
}
if (data.id) {
- params.id = data.id
+ params.id = data.id;
+ params.jointName=data.jointName;
}
return params
},
--
Gitblit v1.8.0