Merge branch 'feature/九月迭代' into master

src/components/app/card/select-card.vue

@@ -31,7 +31,7 @@
           </template>
         </el-table-column>
         <el-table-column label="" show-overflow-tooltip>
-          <template slot="header">
+          <template #header>
             <span style="width: 69px; display: inline-block;line-height: 18px;">卡券模板投放期限</span>
           </template>
           <template slot-scope="scope">
@@ -39,7 +39,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="" label="" show-overflow-tooltip>
-          <template slot="header">
+          <template #header>
             <span style="width: 69px; display: inline-block;line-height: 18px;">用户使用有效期</span>
           </template>
           <template slot-scope="scope">

src/components/company/new-depart-member.vue

@@ -48,7 +48,7 @@
             <template slot-scope="scope">{{ scope.row.nationCode }}-{{ scope.row.phoneNumber }}</template>
           </el-table-column>
           <el-table-column prop="" label="导购ID">
-            <template slot="header">
+            <template #header>
               <el-tooltip class="item" effect="dark" placement="right">
                 <div slot="content">
                   是否使用好办3.0小程序
@@ -61,7 +61,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="" label="关联详情" show-overflow-tooltip>
-            <template slot="header">
+            <template #header>
               <el-tooltip class="item" effect="dark" placement="right">
                 <div slot="content">员工关联导购详情，因只能识别企业微信用户usrid且门店与部门不相关联，<br />所以虽然在一个部门下，但是可能出现一个人关联多个导购code。<br />即一个用户对应多个导购code</div>
                 <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">关联详情</span>

src/components/set/file-table.vue

@@ -14,18 +14,6 @@
   <div class="text-table-body">
     <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45"> </el-table-column>
-      <!-- <el-table-column class-name="hide-ellipsis" width="25">
-        <template slot="header" slot-scope="scope">
-          <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-            <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-              <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-        <template slot-scope="scope"> </template>
-      </el-table-column> -->
       <el-table-column label="标题" width="120" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.materialTitle }} </template>
       </el-table-column>

src/components/set/image-table.vue

@@ -14,18 +14,6 @@
   <div class="text-table-body">
     <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45"> </el-table-column>
-      <!-- <el-table-column width="25">
-        <template slot="header" slot-scope="scope">
-          <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-            <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-              <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-        <template slot-scope="scope"> </template>
-      </el-table-column> -->
       <el-table-column label="标题" width="120" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.materialTitle }} </template>
       </el-table-column>

src/components/set/text-table.vue

@@ -14,18 +14,6 @@
   <div class="text-table-body">
     <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45"> </el-table-column>
-      <!-- <el-table-column class-name="hide-ellipsis" width="25">
-        <template slot="header" slot-scope="scope">
-          <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-            <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-              <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-        <template slot-scope="scope"> </template>
-      </el-table-column> -->
       <el-table-column label="标题" width="120" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.materialTitle }} </template>
       </el-table-column>

src/components/set/video-table.vue

@@ -14,18 +14,6 @@
   <div class="text-table-body">
     <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45"> </el-table-column>
-      <!-- <el-table-column width="25">
-        <template slot="header" slot-scope="scope">
-          <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-            <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-              <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-        <template slot-scope="scope"> </template>
-      </el-table-column> -->
       <el-table-column label="标题" width="120" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.materialTitle }} </template>
       </el-table-column>

src/components/set/web-table.vue

@@ -14,18 +14,6 @@
   <div class="text-table-body">
     <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45"> </el-table-column>
-      <!-- <el-table-column class-name="hide-ellipsis" width="25">
-        <template slot="header" slot-scope="scope">
-          <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-            <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-              <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-        <template slot-scope="scope"> </template>
-      </el-table-column> -->
       <el-table-column label="标题" width="120" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.materialTitle }} </template>
       </el-table-column>

src/views/apps/cloudDaily/dailyDetail.vue

@@ -22,8 +22,8 @@
       </div>
       <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="45"> </el-table-column>
-        <el-table-column width="25">
-          <template slot="header" slot-scope="scope">
+        <!-- <el-table-column width="25">
+          <template #header >
             <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
               <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
               <el-dropdown-menu slot="dropdown">
@@ -33,7 +33,7 @@
             </el-dropdown>
           </template>
           <template slot-scope="scope"> </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="指派对象">
           <template slot-scope="scope">
             <div class="flex flex-pack-center flex-start">

src/views/apps/cloudDaily/dailyRecord.vue

@@ -30,8 +30,8 @@
       </div>
       <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="45"> </el-table-column>
-        <el-table-column width="25">
-          <template slot="header" slot-scope="scope">
+        <!-- <el-table-column width="25">
+          <template #header >
             <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
               <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
               <el-dropdown-menu slot="dropdown">
@@ -41,7 +41,7 @@
             </el-dropdown>
           </template>
           <template slot-scope="scope"> </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="门店名称" width="120" show-overflow-tooltip>
           <template slot-scope="scope"
             ><div style="width: 100%; overflow:hidden;text-overflow: ellipsis;">{{ scope.row.storeName }}</div></template

src/views/apps/customerApp/memberGroupSet.vue

@@ -65,16 +65,6 @@
                   <div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div>
                 </template>
               </el-table-column>
-              <!-- <el-table-column>
-                <template slot="header" slot-scope="scope">
-                  <el-tooltip class="item" effect="dark" content="仅可编辑能在好办展示的分组" placement="right">
-                    <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">操作</span>
-                  </el-tooltip>
-                </template>
-                <template slot-scope="scope">
-                  <el-button type="text" @click="toEditGroup(scope.$index, scope.row)">编辑分组可见范围</el-button>
-                </template>
-              </el-table-column> -->
             </el-table>
             <div class="block common-wrap__page text-right m-t-24" v-if="groupListData.length != 0">
               <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>

src/views/apps/customerApp/myCustomerList.vue

@@ -39,8 +39,8 @@
             <div class="table-body  m-t-20">
               <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="45"> </el-table-column>
-                <el-table-column width="25">
-                  <template slot="header">
+                <!-- <el-table-column width="25">
+                  <template #header >
                     <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
                       <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
                       <el-dropdown-menu slot="dropdown">
@@ -50,7 +50,7 @@
                     </el-dropdown>
                   </template>
                   <template slot-scope="{ $index }"><p :key="$index"></p></template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="会员姓名" width="120" show-overflow-tooltip>
                   <template slot-scope="scope">{{ scope.row.memberName || '--' }}</template>
                 </el-table-column>

src/views/apps/quota/monthTaskDetail.vue

@@ -25,8 +25,8 @@
       </div>
       <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="45" :selectable="selectInit"> </el-table-column>
-        <el-table-column width="25">
-          <template slot="header">
+        <!-- <el-table-column width="25">
+          <template #header >
             <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
               <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
               <el-dropdown-menu slot="dropdown">
@@ -38,7 +38,7 @@
           <template slot-scope="scope"
             ><p style="display:none">{{ scope.$index }}</p></template
           >
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="指派对象" width="260">
           <template slot-scope="scope">
             <div class="flex flex-pack-center flex-start">

src/views/enterprise/enterpriseSet.vue

@@ -156,7 +156,7 @@
               <template slot-scope="scope">{{ scope.row.miniprogramName || '--' }}</template>
             </el-table-column>
             <el-table-column prop="" label="AppID" width="239">
-              <template slot="header">
+              <template #header>
                 <el-tooltip class="item" effect="dark" placement="top">
                   <div slot="content">如何查看AppId：<a href="https://jingyan.baidu.com/article/95c9d20d0545f9ec4e75612d.html" target="blank">https://jingyan.baidu.com/article/95c9d20d0545f9ec4e75612d.html</a></div>
                   <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">AppId</span>
@@ -167,7 +167,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="miniprogramType" label="类型" width="239">
-              <template slot="header">
+              <template #header>
                 <el-tooltip class="item" effect="dark" placement="top">
                   <div slot="content">①默认：用于欢迎语&小程序素材<br />②自定义：用于小程序素材</div>
                   <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">类型</span>

src/views/enterpriseData/activeDetail.vue

@@ -37,19 +37,6 @@
             </div>
             <div class="m-t-20">
               <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
-                <!-- <el-table-column type="selection" width="45"> </el-table-column>
-                <el-table-column width="25">
-                  <template slot="header" slot-scope="scope">
-                    <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-                      <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-                      <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-                        <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-                      </el-dropdown-menu>
-                    </el-dropdown>
-                  </template>
-                  <template slot-scope="scope"> </template>
-                </el-table-column> -->
                 <el-table-column prop="" label="员工信息" show-overflow-tooltip>
                   <template slot-scope="scope">
                     <div class="ul-li-cell ">

src/views/enterpriseData/areaLoginDetail.vue

@@ -39,19 +39,6 @@
             </div>
             <div class="m-t-20">
               <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
-                <!--  <el-table-column type="selection" width="45"> </el-table-column>
-                <el-table-column width="25">
-                  <template slot="header" slot-scope="scope">
-                    <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-                      <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-                      <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-                        <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-                      </el-dropdown-menu>
-                    </el-dropdown>
-                  </template>
-                  <template slot-scope="scope"> </template>
-                </el-table-column> -->
                 <el-table-column prop="" label="门店名称" show-overflow-tooltip>
                   <template slot-scope="scope">
                     {{ scope.row.xName || '--' }}

src/views/enterpriseData/loginDetail.vue

@@ -61,19 +61,6 @@
             <div class="m-t-20">
               <div v-if="activeName == 'first'">
                 <el-table class="select-table" ref="multipleTable" :data="tableData" @sort-change="sortChangeLogin" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
-                  <!-- <el-table-column type="selection" width="45"> </el-table-column>
-                  <el-table-column width="25">
-                    <template slot="header" slot-scope="scope">
-                      <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-                        <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-                        <el-dropdown-menu slot="dropdown">
-                          <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-                          <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-                        </el-dropdown-menu>
-                      </el-dropdown>
-                    </template>
-                    <template slot-scope="scope"> </template>
-                  </el-table-column> -->
                   <el-table-column prop="" label="员工信息" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <div class="ul-li-cell">
@@ -110,19 +97,6 @@
               <!-- 未登录 -->
               <div v-else>
                 <el-table class="select-table" ref="multipleTable" :data="tableData" @sort-change="sortChange" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
-                  <!-- <el-table-column type="selection" width="45"> </el-table-column>
-                  <el-table-column width="25">
-                    <template slot="header" slot-scope="scope">
-                      <el-dropdown style="line-height: 10px; padding: 0; margin-left: -15px; transform: translateY(4px); -webkit-transform: translateY(4px);" @command="handleCommand" placement="bottom-start">
-                        <span class="el-dropdown-link"><i class="iconfont icongengduo"></i> </span>
-                        <el-dropdown-menu slot="dropdown">
-                          <el-dropdown-item command="0"><span :style="{ color: selectRadio == 0 ? '#2f54eb' : '#606266' }">选择当页</span></el-dropdown-item>
-                          <el-dropdown-item command="1"><span :style="{ color: selectRadio == 1 ? '#2f54eb' : '#606266' }">选择全部</span></el-dropdown-item>
-                        </el-dropdown-menu>
-                      </el-dropdown>
-                    </template>
-                    <template slot-scope="scope"> </template>
-                  </el-table-column> -->
                   <el-table-column prop="" label="员工信息" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <div class="ul-li-cell">

src/views/salesleads/trafficTask/taskDetail.vue

@@ -143,7 +143,7 @@
           <template slot-scope="scope">{{ scope.row.isOverTime }}</template>
         </el-table-column>
         <el-table-column label="完成情况">
-          <template slot="header">
+          <template #header>
             <el-tooltip class="item" effect="light" placement="right">
               <div slot="content">
                 完成情况包含3种<br />