update: 卡券调整

src/views/card/form.vue

@@ -18,7 +18,7 @@
       </el-form-item>
 
       <el-form-item prop="subName" label="备注名">
-        <dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="10"></dm-input>
+        <dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="15"></dm-input>
       </el-form-item>
 
       <el-form-item prop="subTitle" label="卡券副标题">

src/views/card/record-send.vue

@@ -31,6 +31,10 @@
             <div slot="content" style="max-width:300px">{{ scope.row.remark || '--' }}</div>
             <i class="el-icon-warning" style="color:#f56c6c;cursor:pointer;margin-left:3px;"></i>
           </el-tooltip>
+          <el-tooltip v-if="scope.row.putonStatus === 5" :open-delay="300" class="item" effect="dark">
+            <div slot="content" style="max-width:300px">{{ scope.row.remark || '--' }}</div>
+            <i class="el-icon-warning" style="color:#f56c6c;cursor:pointer;margin-left:3px;"></i>
+          </el-tooltip>
           <div v-if="scope.row.putonStatus === 1">
             <time-counts class="primary-color fz12" :defaultVal="scope.row.putonTime" :autoStart="true"></time-counts>
           </div>
@@ -40,7 +44,7 @@
       <el-table-column label="操作" align="left" width="150px" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" v-if="scope.row.putonStatus === 2 || scope.row.putonStatus === 3" @click="$router.push('/card/groupinfo/' + scope.row.putonId)">详情</el-button>
-          <el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3 && scope.row.canEdit !== false" @click="$router.push('/card/groupsend/' + scope.row.putonId)">编辑</el-button>
+          <el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3 && scope.row.canEdit !== false && scope.row.putonStatus !== 5 && scope.row.putonStatus !== 6" @click="$router.push('/card/groupsend/' + scope.row.putonId)">编辑</el-button>
           <el-button type="text" v-if="scope.row.putonTime > nowDate" @click="$router.push('/card/record/sendInfo/' + scope.row.putonId)">记录</el-button>
           <dm-delete v-if="scope.row.putonStatus !== 2 && scope.row.canEdit !== false" @confirm="delData(scope.row)" tips="是否删除该投放记录?">
             <el-button type="text">删除</el-button>