Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -35,7 +35,7 @@
         <div v-if="codeInfo.statusFlag != 2 && codeInfo.statusFlag" class="flex" style="padding-top:20px;">
           <el-button v-if="codeInfo.hmType == 2 && codeInfo.statusFlag == 1" icon="el-icon-download" type="primary" style="width:120px;margin-right: 12px;" @click="downloadQR">下载二维码</el-button>
           <el-button type="primary" plain style="width:98px;" @click="modifyCode">编辑</el-button>
-          <el-button class="button-discard specter" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode" :disabled="codeInfo.hmType == 2 && useMemberList.length > 0">作废</el-button>
+          <el-button class="button-discard specter" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode">作废</el-button>
         </div>
       </div>
     </div>

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

@@ -296,7 +296,10 @@ export default {
         {
           text: '作废',
           visible: row => {
-            if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2 && row.hmType == 2 && row.clerkCode == '') {
+            // if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2 && row.hmType == 2 && row.clerkCode == '') {
+            //   return true;
+            // }
+            if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2) {
               return true;
             }
           },