From 67f2740a0b4f3e6d6acf0f8d8b93d76486dc7362 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 9 Dec 2022 13:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sylive/groups-user/index.js           | 12 ++++++
 src/api/sylive/organization/index.js          | 12 ++++++
 .../sylive/groups/components/gro-edit.vue     | 38 ++++++++++++++++-
 .../groups/components/gro-user-list.vue       | 41 +++++++++++++++----
 .../groups/components/gro-user-search.vue     |  4 +-
 src/views/sylive/groups/index.vue             |  4 +-
 6 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/src/api/sylive/groups-user/index.js b/src/api/sylive/groups-user/index.js
index 6a36887..6643193 100644
--- a/src/api/sylive/groups-user/index.js
+++ b/src/api/sylive/groups-user/index.js
@@ -152,3 +152,15 @@ export async function checkExistence(field, value, id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 同步原始门店用户
+ * @param groupsId 分组id
+ */
+export async function synchronousGroupsUser(groupsId) {
+  const res = await request.get('/sylive/groupsUser/synchronous/' + groupsId);
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/sylive/organization/index.js b/src/api/sylive/organization/index.js
index 77231da..bb969e4 100644
--- a/src/api/sylive/organization/index.js
+++ b/src/api/sylive/organization/index.js
@@ -77,3 +77,15 @@ export async function removeOrganization(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 机构详情
+ * @param id 机构id
+ */
+export async function infoOrganization(id) {
+  const res = await request.get('/sylive/organization/info/' + id);
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/views/sylive/groups/components/gro-edit.vue b/src/views/sylive/groups/components/gro-edit.vue
index abb3f34..00f267f 100644
--- a/src/views/sylive/groups/components/gro-edit.vue
+++ b/src/views/sylive/groups/components/gro-edit.vue
@@ -50,6 +50,26 @@
               <el-radio :label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item
+            v-if="form.userFrom == 0 && form.ifBiz == 1"
+            label="原始门店:"
+          >
+            <ele-tree-select
+              :data="organizationList"
+              label-key="organizationName"
+              value-key="organizationId"
+              v-model="form.originalBizId"
+              placeholder="请选择门店"
+              size="small"
+              :filterable="false"
+              :multiple="false"
+              :clearable="true"
+              :disabled="false"
+              :expand-on-click-node="true"
+              :check-strictly="false"
+              @change="onChange"
+            />
+          </el-form-item>
           <el-form-item
             label="统计类型:"
             v-if="!form.parentId"
@@ -84,6 +104,7 @@
 <script>
   import GroSelect from './gro-select.vue';
   import { addGroups, updateGroups } from '@/api/sylive/groups';
+  import { infoOrganization } from '@/api/sylive/organization';
 
   export default {
     components: { GroSelect },
@@ -99,7 +120,9 @@
       // 分组数据
       groupsList: Array,
       // 统计类型数据
-      statisticsTypeList: Array
+      statisticsTypeList: Array,
+      // 门店数据
+      organizationList: Array
     },
     data() {
       const defaultForm = {
@@ -109,7 +132,8 @@
         userFrom: 0,
         ifBiz: 0,
         statisticsType: null,
-        sortNumber: null
+        sortNumber: null,
+        originalBizId: null
       };
       return {
         defaultForm,
@@ -145,6 +169,16 @@
       }
     },
     methods: {
+      onChange(value) {
+        let organizationId = Number(value);
+        if (organizationId) {
+          infoOrganization(organizationId)
+            .then((re) => {
+              this.form.groupsName = re.organizationName;
+            })
+            .catch(() => {});
+        }
+      },
       /* 保存编辑 */
       save() {
         this.$refs.form.validate((valid) => {
diff --git a/src/views/sylive/groups/components/gro-user-list.vue b/src/views/sylive/groups/components/gro-user-list.vue
index 179bbd2..bd02453 100644
--- a/src/views/sylive/groups/components/gro-user-list.vue
+++ b/src/views/sylive/groups/components/gro-user-list.vue
@@ -14,6 +14,17 @@
       <template v-slot:toolbar>
         <gro-user-search @search="reload">
           <el-button
+            v-if="data.userFrom == 0 && data.ifBiz == 1"
+            size="small"
+            type="primary"
+            icon="el-icon-plus"
+            class="ele-btn-icon"
+            @click="synchronous()"
+          >
+            同步原始门店
+          </el-button>
+          <el-button
+            v-else
             size="small"
             type="primary"
             icon="el-icon-plus"
@@ -57,9 +68,9 @@
     <!-- 编辑弹窗 -->
     <gro-user-add
       :visible.sync="showAdd"
-      :user-from="userFrom"
+      :user-from="data.userFrom"
       :groups-id="groupsId"
-      :activity-id="activityId"
+      :activity-id="data.activityId"
       :organization-list="organizationList"
       :team-list="teamList"
       @done="reload"
@@ -73,18 +84,16 @@
   import {
     pageGroupsUser,
     removeGroupsUser,
+    synchronousGroupsUser,
     updateGroupsUserStatus
   } from '@/api/sylive/groups-user';
 
   export default {
     components: { GroUserSearch, GroUserAdd },
     props: {
+      data: Object,
       // 分组id
       groupsId: Number,
-      // 用户来源
-      userFrom: Number,
-      // 活动id
-      activityId: Number,
       // 全部分组
       groupsList: Array,
       // 全部团队
@@ -173,9 +182,27 @@
           page,
           limit,
           groupsId: this.groupsId,
-          activityId: this.activityId
+          activityId: this.data.activityId
         });
       },
+      /* 同步原始门店 */
+      synchronous() {
+        if (!this.data.originalBizId) {
+          this.$message.error('分组未选择原始门店');
+          return;
+        }
+        const loading = this.$loading({ lock: true });
+        synchronousGroupsUser(this.groupsId)
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+      },
       /* 刷新表格 */
       reload(where) {
         this.$refs.table.reload({ page: 1, where: where });
diff --git a/src/views/sylive/groups/components/gro-user-search.vue b/src/views/sylive/groups/components/gro-user-search.vue
index 65b6082..d2c050f 100644
--- a/src/views/sylive/groups/components/gro-user-search.vue
+++ b/src/views/sylive/groups/components/gro-user-search.vue
@@ -7,7 +7,7 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item>
           <el-input
             clearable
@@ -17,7 +17,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item>
           <el-input
             clearable
diff --git a/src/views/sylive/groups/index.vue b/src/views/sylive/groups/index.vue
index 2610d98..bec0536 100644
--- a/src/views/sylive/groups/index.vue
+++ b/src/views/sylive/groups/index.vue
@@ -57,9 +57,8 @@
         <template v-slot:content>
           <gro-user-list
             v-if="current"
-            :user-from="current.userFrom"
+            :data="current"
             :groups-id="current.groupsId"
-            :activity-id="activityId"
             :organization-list="organizationList"
             :team-list="teamList"
           />
@@ -74,6 +73,7 @@
       :parent-id="parentId"
       :groups-list="data"
       :statistics-type-list="statisticsTypeList"
+      :organization-list="organizationList"
       @done="query"
     />
   </div>