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 +++++++-------
src/views/operate/baseSetting/illegalBuild/index.vue | 2
src/views/operate/viewEvent/index.vue | 85 +++++++++++++-------
src/views/operate/baseSetting/violation/index.vue | 2
src/views/layout/components/Header/index.vue | 6 +
src/views/operate/fivepack/threepack/components/content.vue | 66 ++++++++++------
6 files changed, 132 insertions(+), 89 deletions(-)
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 7e8c740..1fa1ed9 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -153,6 +153,12 @@
url: '',
id: '3f',
},
+ {
+ label: '娌圭儫妫�娴�',
+ checked: false,
+ url: '',
+ id: '4f',
+ },
],
flag: {
user: false,
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index d5c7037..31b77c5 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -43,7 +43,7 @@
:row-class-name="tableRowClassName"
@selection-change="tableChange"
>
- <el-table-column type="selection" min-width="5"> </el-table-column>
+ <!-- <el-table-column type="selection" min-width="5"> </el-table-column> -->
<el-table-column prop="number" label="缂栧彿" min-width="5">
</el-table-column>
<el-table-column prop="typeFirst" label="鎵�灞炵被鍨�" min-width="10">
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index f5b758f..843d837 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -43,7 +43,7 @@
:row-class-name="tableRowClassName"
@selection-change="tableChange"
>
- <el-table-column type="selection" min-width="5"> </el-table-column>
+ <!-- <el-table-column type="selection" min-width="5"> </el-table-column> -->
<el-table-column prop="number" label="杩濊浜嬮」缂栧彿" min-width="10">
</el-table-column>
<el-table-column prop="typeThird" label="鎵�灞炵被鍨�" min-width="10">
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index 6c7019f..33ea1a9 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -6,8 +6,7 @@
<div class="search-item">
<span>杈撳叆鏌ヨ:</span>
<el-input
-
- style="flex: 1;margin-left: 15px"
+ style="flex: 1; margin-left: 15px"
:placeholder="
isStorePage() ? '搴楅摵锛堥棬搴楋級鍚嶇О' : '璇疯緭鍏ュ簵閾虹紪鍙�'
"
@@ -16,7 +15,11 @@
</div>
<div class="search-item">
<span>搴楅摵鐘舵��:</span>
- <el-select v-model="storeStatus" style="margin-left: 15px" placeholder="閫夋嫨搴楅摵鐘舵��">
+ <el-select
+ v-model="storeStatus"
+ style="margin-left: 15px"
+ placeholder="閫夋嫨搴楅摵鐘舵��"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -261,40 +264,51 @@
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
- <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
+ <el-checkbox v-model="unsame" @change="disSame(tableData)"
+ >鍙嶉��</el-checkbox
+ >
</div>
<div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
- <el-option v-for="item in options" :key="item.value" :label="item.label"
- :value="item.value" :disabled="item.disabled">
+ <el-select
+ v-model="myIdx"
+ placeholder="鎵归噺鎿嶄綔"
+ @change="selectChange"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ :disabled="item.disabled"
+ >
</el-option>
</el-select>
</div>
</div>
<div class="pagination">
<el-pagination
- background
- :current-page="currentPage"
- layout="prev, pager, next"
- :total="totalNum"
- :page-size="pageSize"
- @current-change="changeCurrentPage"
+ background
+ :current-page="currentPage"
+ layout="prev, pager, next"
+ :total="totalNum"
+ :page-size="pageSize"
+ @current-change="changeCurrentPage"
>
</el-pagination>
</div>
</div>
<!-- 鍒嗛〉 -->
-<!-- <div class="pagination">-->
-<!-- <el-pagination-->
-<!-- background-->
-<!-- :current-page="currentPage"-->
-<!-- layout="prev, pager, next"-->
-<!-- :total="totalNum"-->
-<!-- :page-size="pageSize"-->
-<!-- @current-change="changeCurrentPage"-->
-<!-- >-->
-<!-- </el-pagination>-->
-<!-- </div>-->
+ <!-- <div class="pagination">-->
+ <!-- <el-pagination-->
+ <!-- background-->
+ <!-- :current-page="currentPage"-->
+ <!-- layout="prev, pager, next"-->
+ <!-- :total="totalNum"-->
+ <!-- :page-size="pageSize"-->
+ <!-- @current-change="changeCurrentPage"-->
+ <!-- >-->
+ <!-- </el-pagination>-->
+ <!-- </div>-->
</main>
</div>
</template>
@@ -348,6 +362,9 @@
dialogType: "",
isShowDialog: false,
storeInfo: null,
+ all: false,
+ unsame: false,
+ myIdx: null,
storeInfoScoreView: {},
role: {
messageType: "",
@@ -505,7 +522,6 @@
getStoreInfoList({ keyword: this.storeCode, status })
.then(({ list, pageSize, totalPage }) => {
this.tableData = list;
- console.log(list);
this.pageSize = pageSize;
this.totalNum = totalPage;
})
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() {
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index e7e39ce..bee1938 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="userList">
<header>
-<!-- <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>-->
+ <!-- <div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>-->
<div class="headerContent">
<div class="contentItem">
<div style="width: 80px">鎸夌紪鍙�:</div>
@@ -15,15 +15,30 @@
<div class="contentItem">
<div style="width: 80px">鎸夌被鍨�:</div>
<div class="search">
- <el-select clearable v-model="searchData.categories" placeholder=" 璇烽�夋嫨绫诲瀷">
- <el-option v-for="option in categoryOptions" :key="option.id" :label="option.label" :value="option.value"></el-option>
+ <el-select
+ clearable
+ v-model="searchData.categories"
+ placeholder=" 璇烽�夋嫨绫诲瀷"
+ >
+ <el-option
+ v-for="option in categoryOptions"
+ :key="option.id"
+ :label="option.label"
+ :value="option.value"
+ ></el-option>
</el-select>
</div>
</div>
<div class="contentItem">
<div style="width: 80px">鎸夌ぞ鍖�:</div>
<div class="search">
- <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="璇烽�夋嫨绀惧尯">
+ <el-cascader
+ clearable
+ v-model="searchData.community"
+ :props="communityProps"
+ :options="communityOptions"
+ placeholder="璇烽�夋嫨绀惧尯"
+ >
</el-cascader>
</div>
</div>
@@ -63,11 +78,11 @@
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
<el-table
- border
- stripe
+ border
+ stripe
ref="multipleTable"
:header-cell-style="{
- 'background':'#F5F5F5',
+ background: '#F5F5F5',
background: '#fff',
'font-weight': '650',
'line-height': '45px',
@@ -75,12 +90,14 @@
:data="tableData"
style="width: 100%"
:row-class-name="tableRowClassName"
- @selection-change="tableChange"
+ @selection-change="tableChange"
>
<el-table-column type="selection" min-width="5"> </el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-link @click="handleView(scope.row)">{{ scope.row.code }}</el-link>
+ <el-link @click="handleView(scope.row)">{{
+ scope.row.code
+ }}</el-link>
</template>
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
@@ -163,26 +180,26 @@
<div class="funs">
<div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()"
- >鍏ㄩ��</el-checkbox
+ >鍏ㄩ��</el-checkbox
>
</div>
<div class="funsItem">
<el-checkbox v-model="unsame" @change="disSame(tableData)"
- >鍙嶉��</el-checkbox
+ >鍙嶉��</el-checkbox
>
</div>
<div class="funsItem">
<el-select
- v-model="myIdx"
- placeholder="鎵归噺鎿嶄綔"
- @change="selectChange"
+ v-model="myIdx"
+ placeholder="鎵归噺鎿嶄綔"
+ @change="selectChange"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- :disabled="item.disabled"
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ :disabled="item.disabled"
>
</el-option>
</el-select>
@@ -261,8 +278,8 @@
categoryOptions: CATEGOTY,
communityOptions: [],
communityProps: {
- label: 'regionName',
- value: 'id'
+ label: "regionName",
+ value: "id",
},
myproblem: 1,
number: "",
@@ -339,11 +356,12 @@
// 鑾峰彇绀惧尯鍜岃閬�
getCommunityOptions() {
- department.getDepartmentList()
- .then(res => {
- this.communityOptions = res;
- })
- .catch(err => this.$message.error(err))
+ department
+ .getDepartmentList()
+ .then((res) => {
+ this.communityOptions = res;
+ })
+ .catch((err) => this.$message.error(err));
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
@@ -361,11 +379,16 @@
},
datepickChange() {
- this.searchData.startTime = this.datepick[0];
- this.searchData.endTime = this.datepick[1].replace(
- "00:00:00",
- "23:59:59"
- );
+ if (this.datepick) {
+ this.searchData.startTime = this.datepick[0];
+ this.searchData.endTime = this.datepick[1].replace(
+ "00:00:00",
+ "23:59:59"
+ );
+ } else {
+ this.searchData.startTime = null;
+ this.searchData.endTime = null;
+ }
},
handleClose(done) {
--
Gitblit v1.8.0