1、调整一键群发过期时间可配置，发送过的福袋不给发送

src/views/live/liveCouponUser/index.vue

@@ -94,12 +94,24 @@
       v-loading="loading"
       :data="storeCouponUserList"
     >
+      <el-table-column label="会员ID" prop="userId" width="90" align="center" />
       <el-table-column label="会员" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="cell-main">{{ scope.row.nickname || '-' }}</div>
           <div class="cell-sub">{{ scope.row.phone || '-' }}</div>
         </template>
       </el-table-column>
+      <el-table-column label="会员归属" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.bindCompanyUserName || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="直播间" min-width="140" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div class="cell-main">{{ scope.row.liveName || '-' }}</div>
+          <div class="cell-sub" v-if="scope.row.liveId">ID {{ scope.row.liveId }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="优惠券" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="cell-main">{{ scope.row.couponTitle || '-' }}</div>

src/views/live/liveData/index.vue

@@ -546,12 +546,6 @@
               {{ formatDuration(scope.row.playbackWatchDuration || 0) }}
             </template>
           </el-table-column>
-          <el-table-column prop="orderCount" label="订单数" width="100" align="center"></el-table-column>
-          <el-table-column prop="orderAmount" label="订单金额" width="120" align="center">
-            <template slot-scope="scope">
-              {{ formatMoney(scope.row.orderAmount) }}
-            </template>
-          </el-table-column>
           <el-table-column prop="companyName" label="分公司" min-width="150"></el-table-column>
           <el-table-column prop="salesName" label="销售" min-width="120"></el-table-column>
         </el-table>

src/views/qw/sop/deptSop.vue

@@ -872,7 +872,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6

src/views/qw/sop/mySop.vue

@@ -851,7 +851,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6

src/views/qw/sop/sop.vue

@@ -883,7 +883,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6

src/views/qw/sopTemp/updateSopTemp.vue

@@ -607,7 +607,7 @@
                                         <!--                                                style="margin-left: 10px; color: #b1b4ba">不加URL</span>-->
                                         <!--                                        </el-form-item>-->
                                         <el-form-item label="课节过期时间"
-                                                      v-if="content.type == 2 && (setList.isBindUrl == '1' || setList.contentType==4) && setList.contentType != 2  && setList.contentType != 5  && setList.contentType != 6 && setList.contentType != 8 && setList.contentType != 9 && setList.contentType != 10  ">
+                                                      v-if="content.type == 2 && (setList.isBindUrl == '1' || setList.contentType==4 || setList.contentType==14) && setList.contentType != 2  && setList.contentType != 5  && setList.contentType != 6 && setList.contentType != 8 && setList.contentType != 9 && setList.contentType != 10  ">
                                           <el-row>
                                             <el-input type="number" v-model="setList.expiresDays"
                                                       :disabled="!roles.includes('edit_sop_temp_content') && (formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0))"

src/views/qw/sopUserLogsInfo/sendMsgOpenTool.vue

@@ -400,7 +400,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6

src/views/qw/sopUserLogsInfo/sendMsgSopOpenTool.vue

@@ -289,7 +289,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6

src/views/qw/sopUserLogsInfo/sopUserLogsInfoDetails.vue

@@ -569,7 +569,7 @@
                     <span v-if="item.isBindUrl == '1'" style="margin-left: 10px; color: #13ce66">添加URL</span>
                     <span v-if="item.isBindUrl == '2'" style="margin-left: 10px; color: #b1b4ba">不加URL</span>
                   </el-form-item>
-                  <el-form-item label="课节过期时间" v-if="item.isBindUrl == '1'
+                  <el-form-item label="课节过期时间" v-if="(item.isBindUrl == '1' || item.contentType == 14)
                                                           && item.contentType != 2
                                                           && item.contentType != 5
                                                           && item.contentType != 6