From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/warehouseManage/position/AddDialog.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index b9955ec..dba6cb2 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -53,10 +53,10 @@
v-model="editConfig.infomation.parentId"
placeholder="璇烽�夋嫨"
size="mini"
- :disabled="editCommonConfig.title=='缂栬緫'"
+ :disabled="editCommonConfig.title!='鏂板缓'"
style="width: 90%"
>
- <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in positionList" :key="item.id" :label="item.jointName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -68,7 +68,7 @@
<el-select
v-model="editConfig.infomation.type"
filterable
- :disabled="editCommonConfig.title=='缂栬緫'"
+ :disabled="editCommonConfig.title!='鏂板缓'"
placeholder="璇烽�夋嫨"
style="width: 90%"
no-data-text="鏆傛棤鏁版嵁"
@@ -245,7 +245,7 @@
productClick() {},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓"||this.editConfig.title === "缂栬緫") {
this.showEdit = false
this.showFooter = true
} else if (this.editConfig.infomation.status === "瀹屾垚") {
--
Gitblit v1.8.0