From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/fivepack/threepack/components/updateUser/index.vue | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/views/operate/fivepack/threepack/components/updateUser/index.vue b/src/views/operate/fivepack/threepack/components/updateUser/index.vue
index be21408..2717eb6 100644
--- a/src/views/operate/fivepack/threepack/components/updateUser/index.vue
+++ b/src/views/operate/fivepack/threepack/components/updateUser/index.vue
@@ -206,15 +206,22 @@
const result = await getVideoPoint({ current: 1, size: 1000 });
this.relationVideoList = result.records;
- if (this.storeInfo) {
- this.$set(this, "store", this.storeInfo);
- if (this.storeInfo && this.isStorePage) {
- this.store.relationVideo = this.store.videoPoint.name;
- }
- }
-
if (!this.isView()) {
await this.getShopTypeList();
+ }
+
+ if (this.storeInfo) {
+ this.$set(this, "store", this.storeInfo);
+ if (this.storeInfo && this.isStorePage && this.store.videoPoint) {
+ this.store.relationVideo = this.store.videoPoint.name;
+ }
+
+ const selectedStoreType = this.getSelectedStoreType(this.shopTypeList);
+
+ this.$set(this.store, "type", [
+ selectedStoreType.parentId,
+ selectedStoreType.id,
+ ]);
}
},
@@ -243,20 +250,6 @@
}
});
},
-
- async created() {
- if (this.storeInfo) {
- this.$set(this, 'store', this.storeInfo);
- const result = await getVideoPoint({ current: 1, size: 100 });
- this.relationVideoList = result.records;
- if (this.storeInfo && this.isStorePage) {
- this.store.relationVideo = this.store.videoPoint.name;
- }
- if (!this.isView()) {
- await this.getShopTypeList();
- }
- }
- },
isView() {
return this.dialogType === "view";
@@ -270,16 +263,6 @@
async getShopTypeList() {
let arr = await getCodeList("16");
this.shopTypeList = this.createShopTypeTree(arr);
-
- if (this.dialogType === "update") {
- const selectedStoreType = arr.find(
- (item) => item.name === this.store.typeName
- );
- this.$set(this.store, "type", [
- selectedStoreType.parentId,
- selectedStoreType.id,
- ]);
- }
},
// 鍒涘缓鍟嗛摵绫诲瀷鏍�
@@ -303,6 +286,21 @@
return treeRoot;
}
},
+ getSelectedStoreType(shopTypeList) {
+ let selectedItem = null;
+ shopTypeList.forEach((item) => {
+
+ if (item.name === this.store.typeName) {
+ selectedItem = item;
+ } else if (item.children) {
+ let selected = this.getSelectedStoreType(item.children);
+ if (selected) {
+ selectedItem = selected;
+ }
+ }
+ });
+ return selectedItem;
+ },
},
beforeDestroy() {
--
Gitblit v1.8.0