build for test

src/components/common/vueSelectStore.vue

@@ -167,6 +167,7 @@
                     let arr = [];
                     copyData.forEach(cG => {
                         cG.disableOpen = false;
+                        cG.disabled = (cG.hasPression != 1 || selType == "person" || selType == "store" || isForbiden);
                         if (cG.parentId == group.groupId) {
                             arr.push(cG);
                         }
@@ -178,7 +179,7 @@
                         group.isLast = true;
                     }
                     if (group.level == 0) {
-                        group.disabled = (group.childrens && group.childrens.length > 0);
+                        group.disabled = ((group.childrens && group.childrens.length > 0) || (group.hasPression != 1 || selType == "person" || selType == "store" || isForbiden));
                         group.hasLoad = true;
                         _this.brands.push(group);
                         if (group.childrens) _this.defaultOpen.push(group.id);

src/components/contacts/share/searchMenu.vue

@@ -4,42 +4,45 @@
             <el-input prefix-icon="el-icon-search" v-model="searchKey" placeholder="姓名/手机号/部门名称" clearable @clear="clearFn" @keyup.enter.native="searchFn"></el-input>
             <slot name="buttonBox"></slot>
         </div>
+        <template v-if="!searchResultShow">
             <p class="share-title">我方共享给对方的所有人员</p>
-        <div class="p-0-15">
-            <el-tree
-                v-if="!searchResultShow"
-                class="search-menu"
-                node-key="id"
-                :default-expanded-keys="defaultOpen"
-                :data="menuDataMine"
-                :highlight-current="true"
-                :expand-on-click-node="false"
-                :props="myProps"
-                @node-click="handleNodeClick">
-                <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
-                    <span>{{ node.label }}</span>
-                </span>
-            </el-tree>
-        </div>
+            <div class="p-0-15">
+                <el-tree
+                    class="search-menu"
+                    node-key="id"
+                    :default-expanded-keys="defaultOpen"
+                    :data="menuDataMine"
+                    :highlight-current="true"
+                    :expand-on-click-node="false"
+                    :props="myProps"
+                    @node-click="handleNodeClick">
+                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                        <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
+                        <span>{{ node.label }}</span>
+                    </span>
+                </el-tree>
+            </div>
+        </template>
+        <template v-if="!searchResultShow">
             <p class="share-title">对方共享给我方的所有人员<i class="el-icon-upload"></i></p>
-        <div class="p-0-15">
-            <el-tree
-                v-if="!searchResultShow"
-                class="search-menu"
-                node-key="id"
-                :default-expanded-keys="defaultOpen"
-                :data="menuData"
-                :highlight-current="true"
-                :expand-on-click-node="false"
-                :props="myProps"
-                @node-click="handleNodeClick">
-                <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
-                    <span>{{ node.label }}</span>
-                </span>
-            </el-tree>
-        </div>
+            <div class="p-0-15">
+                <el-tree
+                    v-if="!searchResultShow"
+                    class="search-menu"
+                    node-key="id"
+                    :default-expanded-keys="defaultOpen"
+                    :data="menuData"
+                    :highlight-current="true"
+                    :expand-on-click-node="false"
+                    :props="myProps"
+                    @node-click="handleNodeClick">
+                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                        <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
+                        <span>{{ node.label }}</span>
+                    </span>
+                </el-tree>
+            </div>
+        </template>
         <div class="search-result-container m-t-15" v-if="searchResultShow">
             <template v-if="storeFrame">
                 <template v-for="(brand, index) in brandList" v-if="brand.departmentList.length > 0 || brand.storeList.length > 0 || brand.searchList.length > 0">
@@ -207,15 +210,15 @@
         filter: {},
         computed: {
             employeeList() {
-                if (this.searchResult.searchList) {
-                    return this.searchResult.searchList;
+                if (this.searchResult.employeeStoreList) {
+                    return this.searchResult.employeeStoreList;
                 } else {
                     return [];
                 }
             },
             departmentList() {
-                if (this.searchResult.departmentList) {
-                    return this.searchResult.departmentList;
+                if (this.searchResult.groupList) {
+                    return this.searchResult.groupList;
                 } else {
                     return [];
                 }

src/views/contacts/shareContact.vue

@@ -307,6 +307,7 @@ export default {
       };
       getRequest("/haoban-manage-web/emp/searchpage", params)
         .then(res => {
+          console.log(res, "search result");
           this.searchResult = res.data.result;
         })
         .catch(e => {

src/views/contacts/storeFrame.vue

@@ -179,6 +179,7 @@ export default {
         },
         addSuccess() {
             this.getGroupData();
+            this.$refs.add_brand.dialogVisible = false;
         },
         /**
          * 树形搜索结果选门店处理

src/views/contacts/storeInfo.vue

@@ -315,6 +315,7 @@ export default {
       ths.imgs.forEach(img => {
           newImgs.push({ url: img });
       });
+      ths.storeInfo = obj;
     },
     uploadOnSuccess(res, list) {
         console.log(res);

src/views/contacts/storeIo.vue

@@ -63,7 +63,7 @@
           <div class="error-log import" v-else>
             <div class="title-area">
               <div class="tip">
-                导入总条数：0条，成功导入0条，<span class="red">错误导入0条</span>
+                <!-- 导入总条数：0条，成功导入0条，<span class="red">错误导入0条</span> -->
               </div>
               <a :href="'http://www.gicdev.com/haoban-manage-web/error-improt-log-export?importCode='+$route.query.importCode+'&departmentId='+$route.query.departmentId">
                           <el-button type="primary">导出错误记录</el-button>
@@ -161,11 +161,9 @@ export default {
       };
       getRequest("/haoban-manage-web/error-log-page", params)
         .then(res => {
-          console.log(res);
           if (res.data.errorCode == 1) {
-            console.log(res.data);
             ths.total = res.data.result.totalCount;
-            ths.logList = res.data.result.result;
+            ths.logList = res.data.result;
             ths.loading = false;
           } else {
             ths.$message.error({
@@ -224,11 +222,11 @@ export default {
     font-size: 13px;
     font-weight: 400;
     color: rgba(96, 98, 102, 1);
-
     .tip {
       line-height: 24px;
       position: relative;
       padding-left: 16px;
+      text-align: left;
 
       &:last-child {
         margin-bottom: 0;
@@ -264,7 +262,6 @@ export default {
 
       .tip {
         flex: 1;
-
         .red {
           color: red;
         }