Merge branch 'feature/3.0年后需求-卡券调整' into dev

src/views/card/partials/card-item.vue

@@ -62,7 +62,7 @@
         </p>
       </div>
       <div class="card-item_foot clearfix">
-        <div class="fl">
+        <div class="fl" v-if="item.gicCouponType != 3 && item.gicCouponType != 4">
           <!-- 由外部api创建 仅展示详情、删除、报表按钮 -->
           <span v-if="item.auditingStatus !== -1"
             >剩余库存：{{ item.couponStock }} <a title="编辑库存" v-if="!shelfFlag && item.useCustomCode === 0 && item.canEdit !== false && !item.isApiCreate" @click="preAdjustStock(item)"><i class="el-icon-edit"></i></a

src/views/card/partials/status-render.js

@@ -16,8 +16,8 @@ export default Vue.component('render-temp', {
     const canGroupSend = this.item.putEffectiveMode == 1 ? true : new Date() > new Date(this.item.putBeginDate) && new Date() < new Date(this.item.putEndDate);
     const isWeimo = this.item.gicCouponType == 3;
     const isCommon = this.item.gicCouponType == 4;
-    // 微盟外部券：领取记录、复制、投放、报表
-    // 通用外部券：领取记录、复制、报表
+    // 微盟外部券：领取记录、投放、报表
+    // 通用外部券：领取记录、报表
     const bind1 =
       (canEdit && !isApiCreate && canGroupSend && !isCommon) || isWeimo ? (
         <a title="投放" onClick={this.handler.bind(null, 1)}>
@@ -53,7 +53,7 @@ export default Vue.component('render-temp', {
       </a>
     );
     const bind6 =
-      (canEdit && !isApiCreate) || isWeimo || isCommon ? (
+      canEdit && !isApiCreate && !isWeimo && !isCommon ? (
         <a title="复制" onClick={this.handler.bind(null, 6)}>
           <i class="iconfont icon-wxcard-copy" />
         </a>

src/views/ecm/marketing-event/components/lib-card.vue

@@ -52,7 +52,7 @@
           {{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
+      <el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存" :formatter="(row, col, val) => (showOutCouponIcon ? '--' : val)"></el-table-column>
     </el-table>
     <dm-pagination v-show="tableList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></dm-pagination>
     <span slot="footer" class="dialog-footer">
@@ -143,7 +143,7 @@ export default {
     },
     getCardList() {
       this.loading = true;
-      getCardList(this.listParams).then(res => {
+      getCardList(Object.assign({}, this.listParams, this.showOutCouponIcon ? { useExtCard: 1 } : {})).then(res => {
         if (res.errorCode === 0) {
           this.tableList = (res.result.result || []).map(el => {
             // 如果是外部券，而且配置显示外部券标识，需要缩短cardName的显示长度