优惠列表合并状态和投放状态列

src/views/ecw/coupon/index.vue

@@ -87,22 +87,28 @@
       </el-table-column>
       <el-table-column :label="$t('状态')" align="center" prop="createTime" width="180">
         <template slot-scope="{row}">
-          <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
+          <template v-if="row.status === 1">
+            <template v-if="row.putonStatus === 1">{{$t('已发布，投放中')}}</template>
+            <template v-else-if="row.putonStatus === -1">{{$t('取消投放')}}</template>
+            <!--投放状态暂时就只有上诉两种，如果出现了其他的应该视为异常状态，为了方便发现问题所以直接显示投放字典-->
+						<dict-tag v-else :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" :value="row.putonStatus" />
+          </template>
+          <template v-else>{{$t('草稿')}}</template>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('投放状态')" align="center" prop="putonStatus" width="180">
+      <!--<el-table-column :label="$t('投放状态')" align="center" prop="putonStatus" width="180">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" :value="row.putonStatus" />
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"
                      v-hasPermi="['ecw:coupon:show']">{{ $t('查看') }}</el-button>
 
-          <el-button v-if="scope.row.putonStatus == 1" size="mini" type="text" icon="el-icon-edit" @click="setPutonStatus(scope.row, -1)"
+          <el-button v-if="scope.row.status === 1 && scope.row.putonStatus == 1" size="mini" type="text" icon="el-icon-edit" @click="setPutonStatus(scope.row, -1)"
                      v-hasPermi="['ecw:coupon:show']">{{ $t('取消投放') }}</el-button>
-          <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="setPutonStatus(scope.row, 1)"
+          <el-button v-else-if="scope.row.status === 1" size="mini" type="text" icon="el-icon-edit" @click="setPutonStatus(scope.row, 1)"
                      v-hasPermi="['ecw:coupon:show']">{{ $t('投放') }}</el-button>
 
           <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"