feat: 增加绑定详情组件

cc2b5e05 · 无尘 · a81a8f0b · cc2b5e05 · cc2b5e05 · cc2b5e05
Commit cc2b5e05 authored Jul 24, 2020 by 无尘
19 changed files
--- a/src/components/company/add-depart.vue
+++ b/src/components/company/add-depart.vue
@@ -3,8 +3,8 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-04-22 09:37:45
- * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-depart.vue
+ * @LastEditTime: 2020-07-24 09:30:42
+ * @FilePath     :\haoban-4\src\components\company\add-depart.vue
 -->
 <!--


--- a/src/components/company/add-enterprise.vue
+++ b/src/components/company/add-enterprise.vue
@@ -3,8 +3,8 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-20 11:03:10
- * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-enterprise.vue
+ * @LastEditTime: 2020-07-24 09:30:55
+ * @FilePath     : \haoban-4\src\components\company\add-enterprise.vue
 -->
 <!--


--- a/src/components/company/add-member.vue
+++ b/src/components/company/add-member.vue
@@ -3,8 +3,8 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-20 11:01:43
- * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-member.vue
+ * @LastEditTime: 2020-07-24 09:30:31
+ * @FilePath     :\haoban-4\src\components\company\add-member.vue
 -->
 <!--

@@ -14,7 +14,7 @@

 <template>
  <el-dialog width="600px" :title="partForm.staffId ? '成员详情' : '新增成员'" :visible.sync="memberVisible" append-to-body :before-close="handleClose">
-    <div class="add-title m-b-20 font-14 color-303133 font-w-500">基本信息</div>
+    <!-- <div class="add-title m-b-20 font-14 color-303133 font-w-500">基本信息</div> -->
    <el-form :model="partForm" :rules="rules" ref="form" label-width="100px" class="dialog-form">
      <el-form-item label="姓名" prop="">
        {{ partForm.staffName || '--' }}
@@ -22,7 +22,7 @@
      <el-form-item label="昵称">
        {{ partForm.nickName || '--' }}
      </el-form-item>
-      <el-form-item label="微信账号">
+      <el-form-item label="账号">
        {{ partForm.wxUserId || '--' }}
      </el-form-item>
      <el-form-item label="性别" prop="">

--- a/src/components/company/add-relate.vue
+++ b/src/components/company/add-relate.vue
@@ -3,8 +3,8 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-20 11:03:02
- * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-relate.vue
+ * @LastEditTime: 2020-07-24 09:31:07
+ * @FilePath     : \haoban-4\src\components\company\add-relate.vue
 -->
 <!--


--- a/src/components/company/auth-commit-success.vue
+++ b/src/components/company/auth-commit-success.vue
@@ -3,8 +3,8 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:40
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 16:21:49
- * @FilePath     : j:\公司\haoban-3\src\components\company\auth-commit-success.vue
+ * @LastEditTime: 2020-07-24 09:31:16
+ * @FilePath     : j:\公司\haoban-4\src\components\company\auth-commit-success.vue
 -->
 <!--


--- a/src/components/company/contact-tree-filter.vue
+++ b/src/components/company/contact-tree-filter.vue
@@ -3,12 +3,12 @@
 * @Author       : 无尘
 * @Date         : 2020-02-27 13:53:03
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-25 14:32:57
- * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\contact-tree-filter.vue
+ * @LastEditTime: 2020-07-24 09:32:30
+ * @FilePath     : \haoban-4\src\components\company\contact-tree-filter.vue
 -->

 <!--
-  设置成员所在部门（回收站）
+  部门树形过滤
  <contact-tree-filter :searchSelect="" @resetCheckData="resetCheckData"></contact-tree-filter>
  import contactTreeFilter from '@/components/company/contact-tree-filter.vue';
  -->

--- a/src/components/company/contact-tree-search.vue
+++ b/src/components/company/contact-tree-search.vue
@@ -3,10 +3,11 @@
 * @version: 1.0.0
 * @Author: 无尘
 * @Date: 2019-08-14 16:51:07
- * @LastEditors  : 无尘
- * @LastEditTime : 2020-02-24 20:31:03
+ * @LastEditors: 无尘
+ * @LastEditTime: 2020-07-24 09:32:45
 -->
 <!--
+部门搜索
 <contact-tree-search :itemData="itemData" v-model="itemData" @getSearchSelectData="getSearchSelectData"></contact-tree-search>

 import contactTreeSearch from '@/components/company/contact-tree-search.vue';

--- a/src/components/company/contact-tree.vue
+++ b/src/components/company/contact-tree.vue
@@ -4,9 +4,10 @@
 * @Author: 无尘
 * @Date: 2019-08-14 16:51:07
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-20 09:59:50
+ * @LastEditTime: 2020-07-24 09:32:55
 -->
 <!--
+通讯录部门
 <contact-tree :itemData="itemData" v-model="itemData" ></contact-tree>

 import contactTree from '/components/company/contact-tree.vue';

--- a/src/components/company/expired-dialog.vue
+++ b/src/components/company/expired-dialog.vue
@@ -4,9 +4,10 @@
 * @Author: 无尘
 * @Date: 2020-04-14 09:50:16
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-13 14:17:07
+ * @LastEditTime: 2020-07-24 09:38:33
 -->
 <!--
+  到期提醒
  <expired-dialog ></expired-dialog>
  import expiredDialog from '@/components/company/expired-dialog.vue';
 -->

--- a/src/components/company/fail-log.vue
+++ b/src/components/company/fail-log.vue
 <!--
+ 查看失败日志
  <fail-log  @closeHelp="closeHelp"></fail-log>
  import failLog from '@/components/company/fail-log.vue';
 -->

--- a/src/components/company/help-dialog.vue
+++ b/src/components/company/help-dialog.vue
@@ -4,9 +4,10 @@
 * @Author: 无尘
 * @Date: 2020-04-14 09:50:16
 * @LastEditors: 无尘
- * @LastEditTime: 2020-04-16 23:03:35
+ * @LastEditTime: 2020-07-24 09:38:55
 -->
 <!--
+  使用帮助
  <help-dialog  @closeHelp="closeHelp"></help-dialog>
  import helpDialog from '@/components/company/help-dialog.vue';
 -->

--- a/src/components/company/help-tip.vue
+++ b/src/components/company/help-tip.vue
@@ -4,9 +4,10 @@
 * @Author: 无尘
 * @Date: 2020-04-14 09:50:16
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 11:33:17
+ * @LastEditTime: 2020-07-24 09:39:03
 -->
 <!--
+  帮助提示
  <help-tip : @toCloseTip="toCloseTip"></help-tip>
  import helpTip from '@/components/company/help-tip.vue';
 -->

--- a/src/components/company/mod-depart.vue
+++ b/src/components/company/mod-depart.vue
@@ -2,12 +2,12 @@
 * @Descripttion : 当前组件信息
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
- * @LastEditors  : 无尘
- * @LastEditTime : 2020-02-24 14:56:16
+ * @LastEditors: 无尘
+ * @LastEditTime: 2020-07-24 09:39:13
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\mod-depart.vue
 -->
 <!--
-
+  调整所在部门
  <mod-depart :selectObj="selectObj" @modDepartData="modDepartData"></mod-depart>
  import modDepart from '@/components/company/mod-depart.vue';
  -->

--- a/src/components/company/new-depart-member.vue
+++ b/src/components/company/new-depart-member.vue
@@ -3,11 +3,11 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:40
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 11:29:39
+ * @LastEditTime: 2020-07-24 09:39:32
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\new-depart-member.vue
 -->
 <!--
-
+  部门成员
  <new-depart-member :departObj="departObj"></new-depart-member>
  import newDepartMember from '@/components/company/new-depart-member.vue';
 -->

--- a/src/components/company/org-tree.vue
+++ b/src/components/company/org-tree.vue
@@ -2,11 +2,12 @@
 * @Descripttion: 当前组件信息
 * @version: 1.0.0
 * @Author: 无尘
- * @Date: 2019-08-14 16:51:07
+ * @Date: 2020-07-14 16:51:07
 * @LastEditors: 无尘
- * @LastEditTime: 2020-06-19 10:26:32
+ * @LastEditTime: 2020-07-24 09:40:17
 -->
 <!--
+gic部门
 <org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>

 import orgTree from './org-tree.vue';

--- a/src/components/company/related-table.vue
+++ b/src/components/company/related-table.vue
 <!--
+  关联详情
  <related-table :relateRow="relateRow"  @closeTable="closeTable"></related-table>
  import relatedTable from '@/components/company/related-table.vue';
 -->

--- a/src/components/company/search-select.vue
+++ b/src/components/company/search-select.vue
@@ -3,11 +3,11 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-23 09:26:30
+ * @LastEditTime: 2020-07-24 09:41:04
 * @FilePath     : j:\公司\haoban-4\src\components\company\search-select.vue
 -->
 <!--
-
+  新增关联（搜索下拉单选）
  <search-select :departObj="departObj" @refreshData="refreshData"></search-select>
  import searchSelect from '@/components/company/search-select.vue';
  -->

--- a/src/components/company/store-auth-detail.vue
+++ b/src/components/company/store-auth-detail.vue
 <!--
+  绑定详情-变更
  <store-auth-detail  @closeLog="closeLog"></store-auth-detail>
  import storeAuthDetail from '@/components/company/store-auth-detail.vue';
 -->
 <template>
-  <el-dialog title="绑定详情" :visible.sync="dialogVisible" width="995px" :before-close="handleClose">
+  <el-dialog title="绑定详情" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
    <div class="">
-      <el-table class="select-table" ref="multipleTable" height="450" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
-        <el-table-column label="操作" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.dataName }}</template>
-        </el-table-column>
-        <el-table-column prop="" label="变更前" >
-          <template slot-scope="scope">
-            {{ scope.row.dataCode }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="" label="变更后">
-          <template slot-scope="scope">
-            {{ scope.row.chainName }}
-          </template>
-        </el-table-column>
-      </el-table>
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="绑定门店" name="first"></el-tab-pane>
+        <el-tab-pane label="共享门店" name="second"></el-tab-pane>
+      </el-tabs>
+     <div class="store-change-body">
+       <div class="flex ">
+         <div class="change-stores flex-1">
+           <div class="font-14 color-303133 text-center">变更前</div>
+           <ul class="store-cell-ul bg-f5f7fa">
+             <li class="text-center">
+               <el-tag type="info">标签三</el-tag>
+             </li>
+           </ul>
+         </div>
+         <div class="change-stores flex-1 m-l-10">
+           <div class="font-14 color-303133">变更后</div>
+           <ul class="store-cell-ul bg-f5f7fa">
+             <li class="text-center">
+               <el-tag type="info">标签三</el-tag>
+             </li>
+           </ul>
+         </div>
+       </div>
+     </div>
    </div>
  </el-dialog>
 </template>
@@ -40,11 +50,22 @@ export default {
  data() {
    return {
      dialogVisible: true,
+      activeName: 'first',
      tableData: []
    };
  },
  computed: {},
  methods: {
+    /**
+     * 改变 tab
+     */
+    handleClick(tab, event) {
+      const that = this;
+      that.getTableList()
+    },
+    /**
+     * 关闭
+     */
    handleClose() {
      const that = this;
      that.tableData = [];
@@ -107,4 +128,11 @@ export default {
 .line-h-18 {
  line-height: 18px;
 }
+.bg-f5f7fa {
+  background: #f5f7fa;
+}
+.store-cell-ul {
+  height: 289px;
+  overflow-y: auto;
+}
 </style>
--- a/src/views/business/contacts.vue
+++ b/src/views/business/contacts.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 11:37:49
+ * @LastEditTime: 2020-07-24 09:28:06
 -->
 <template>
  <div class="contacts-wrap common-set-wrap">
@@ -36,7 +36,7 @@
                      </div>
                    </li>
                  </ul>
-                  <div class="no-search-data font-14 color-909399">无结果</div>
+                  <div class="no-search-data font-14 color-909399">暂无搜索结果</div>
                </div>
              </div>
            </div>