From 9e9adeb2711ce710c677f4653f12bc335c098737 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 20:30:40 +0800
Subject: [PATCH] 修改 上架规则 编辑状态和 不编辑状态的冲突
---
src/views/warehouseManage/listingRules/index.vue | 4 ++--
src/components/makepager/CommonFormTableView.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 6644d38..263508c 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -149,7 +149,7 @@
<!-- 浣嶇疆 -->
<el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
- <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop].label }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
diff --git a/src/views/warehouseManage/listingRules/index.vue b/src/views/warehouseManage/listingRules/index.vue
index a9ed679..78e234e 100644
--- a/src/views/warehouseManage/listingRules/index.vue
+++ b/src/views/warehouseManage/listingRules/index.vue
@@ -122,8 +122,8 @@
const list = res.data.map((item) => {
return {
...item,
- areaName: item.area.jointName,
- subLocation: item.location.jointName,
+ areaName: {label:item.area.jointName,value:item.area.id},
+ subLocation: {label:item.location.jointName,value:item.location.id},
productName: item.product.name,
productCategory: item.productCategory.name,
isSet: false,
--
Gitblit v1.8.0