From 853d05b11f3ecc0edb93494d42eba29e10248340 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 13 十一月 2023 18:20:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/warehouseManage/position/AddDialog.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index 30cdb4f..54147c9 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -19,7 +19,14 @@
<span>鍔ㄤ綔</span>
<!-- <el-button plain size="mini" style="margin-left: 15px" @click="deleteClick">鍒犻櫎</el-button> -->
</span>
- <el-button v-if="showEdit&&editConfig.infomation.type==3" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button
+ v-if="showEdit && editConfig.infomation.type == 3"
+ plain
+ size="mini"
+ style="margin-left: 15px"
+ @click="editClick"
+ >缂栬緫</el-button
+ >
</div>
</div>
<!-- 鍐呭 -->
@@ -53,7 +60,7 @@
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.jointName" :value="item.id">
@@ -68,7 +75,7 @@
<el-select
v-model="editConfig.infomation.type"
filterable
- :disabled="editCommonConfig.title!='鏂板缓'"
+ :disabled="editCommonConfig.title != '鏂板缓'"
placeholder="璇烽�夋嫨"
style="width: 90%"
no-data-text="鏆傛棤鏁版嵁"
@@ -202,7 +209,7 @@
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
- parentId: [{ required: true, message: "璇烽�夋嫨浣嶇疆绫诲瀷", trigger: "change" }],
+ // parentId: [{ required: true, message: "璇烽�夋嫨浣嶇疆绫诲瀷", trigger: "change" }],
type: [{ required: true, message: "璇烽�夋嫨涓婄骇浣嶇疆", trigger: "change" }],
countFrequency: [
{
@@ -222,6 +229,7 @@
}
},
created() {
+ console.log(this.editConfig.infomation)
this.setBottonView()
},
methods: {
@@ -256,7 +264,7 @@
productClick() {},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
- if (this.editConfig.title === "鏂板缓"||this.editConfig.title === "缂栬緫") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.title === "缂栬緫") {
this.showEdit = false
this.showFooter = true
} else if (this.editConfig.infomation.status === "瀹屾垚") {
@@ -305,8 +313,8 @@
notes: data.notes
}
if (data.id) {
- params.id = data.id;
- params.jointName=data.jointName;
+ params.id = data.id
+ params.jointName = data.jointName
}
return params
},
--
Gitblit v1.8.0