Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -44,14 +44,14 @@
         <el-button type="primary" @click="$router.push('/actCodeAdd')">新增活码</el-button> -->
       </el-form-item>
     </el-form>
-    <el-table ref="actCodeTableRef" v-loading="loadingStatus" :data="tableData" class="act-code-table" @sort-change="sortChange" :max-height="tableMaxHeight">
+    <el-table ref="actCodeTableRef" v-loading="loadingStatus" :data="tableData" class="act-code-table" @sort-change="sortChange" :max-height="tableMaxHeight" @selection-change="handleSelectionChange">
       <!-- @select="selectTable"  tooltip-effect="dark"-->
       <el-table-column type="selection" width="60" fixed> </el-table-column>
-      <el-table-column width="60" class-name="table-select-cell" fixed>
+      <!-- <el-table-column width="60" class-name="table-select-cell" fixed>
         <template #header>
           <dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="tableData" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="活码ID" fixed width="110">
         <template slot-scope="{ row }">
           <p>{{ row.hmCode }}</p>
@@ -113,11 +113,11 @@
           </p>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="所属分组" width="100" show-overflow-tooltip>
+      <el-table-column label="所属分组" width="100" show-overflow-tooltip>
         <template slot-scope="{ row }">
-          <p>{{ row.hmGroupId ? row.hmGroupId : '--' }}</p>
+          <p>{{ row.hmGroupName ? row.hmGroupName : '--' }}</p>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="创建人" width="100">
         <template slot-scope="{ row }">
           <p>{{ row.creatorName ? row.creatorName : '--' }}</p>
@@ -283,7 +283,7 @@ export default {
         {
           text: '作废',
           visible: row => {
-            if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2) {
+            if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2 && row.hmType == 2 && row.clerkCode == '') {
               // if (row.statusFlag != 2) {
               return true;
             }
@@ -457,6 +457,7 @@ export default {
       this.selectHmIds = val.map(item => {
         return item.hmId;
       });
+      console.log(this.selectHmIds, 'this.selectHmIds');
     },
     // 批量分组
     batchGoupEvent() {