Merge remote-tracking branch 'origin/master'

src/api/live/liveWatchLog.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询直播看课记录列表
+export function listLiveWatchLog(query) {
+  return request({
+    url: '/live/liveWatchLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询直播看课记录详细
+export function getLiveWatchLog(logId) {
+  return request({
+    url: '/live/liveWatchLog/' + logId,
+    method: 'get'
+  })
+}
+
+// 新增直播看课记录
+export function addLiveWatchLog(data) {
+  return request({
+    url: '/live/liveWatchLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改直播看课记录
+export function updateLiveWatchLog(data) {
+  return request({
+    url: '/live/liveWatchLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除直播看课记录
+export function delLiveWatchLog(logId) {
+  return request({
+    url: '/live/liveWatchLog/' + logId,
+    method: 'delete'
+  })
+}
+
+// 导出直播看课记录
+export function exportLiveWatchLog(query) {
+  return request({
+    url: '/live/liveWatchLog/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/course/courseWatchLog/watchLog.vue

@@ -1526,7 +1526,6 @@ export default {
         this.resultDialogVisible = true; // 显示弹窗
         this.resultTitle = '批量添加标签结果';
 
-
         this.tagOpen = false;
         loadingRock.close();
         this.addTagFormByWatch={

src/views/live/liveOrder/liveOrderDetails.vue

@@ -262,7 +262,16 @@
 
 
 <script>
-import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder} from "@/api/live/liveOrder";
+import {
+  getLiveOrder,
+  syncExpress,
+  updateLiveOrder,
+  updateErp,
+  getExpress,
+  listOrderitem,
+  tuiOrder,
+  getExpressByDeliverId
+} from "@/api/live/liveOrder";
 
 
 export default {
@@ -459,7 +468,7 @@ export default {
 
     showExpress(){
       this.expressDialog.open=true;
-      getExpress(this.item.orderId).then(response => {
+      getExpressByDeliverId({"orderId":this.item.orderId}).then(response => {
         this.express = response.data;
         if(this.express!=null&&this.express.Traces!=null){
           this.traces=this.express.Traces

src/views/live/liveWatchLog/index.vue

@@ -0,0 +1,448 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户Id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户userId"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="直播间id" prop="liveId">
+        <el-input
+          v-model="queryParams.liveId"
+          placeholder="请输入直播间id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="记录类型" prop="logType">
+        <el-select v-model="queryParams.logType" placeholder="请选择记录类型" clearable size="small">
+          <el-option
+            v-for="dict in logTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label-width="100px" label="外部联系人id" prop="externalContactId">
+        <el-input
+          v-model="queryParams.externalContactId"
+          placeholder="请输入外部联系人id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售id" prop="companyUserId">
+        <el-input
+          v-model="queryParams.companyUserId"
+          placeholder="请输入销售id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="公司id" prop="companyId">
+        <el-input
+          v-model="queryParams.companyId"
+          placeholder="请输入公司id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="完课时间" prop="finishTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.finishTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择完课时间">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="sop最后创建时间" prop="sopCreateTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.sopCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择sop最后创建时间">
+        </el-date-picker>
+      </el-form-item> -->
+      <!-- <el-form-item label="发送小程序appid" prop="sendAppId">
+        <el-input
+          v-model="queryParams.sendAppId"
+          placeholder="请输入发送小程序appid"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="日志创建来源：1、个人sop，2、群聊sop，3、一键群发" prop="logSource">
+        <el-input
+          v-model="queryParams.logSource"
+          placeholder="请输入日志创建来源：1、个人sop，2、群聊sop，3、一键群发"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label-width="110px" label="分享人企微id" prop="qwUserId">
+        <el-input
+          v-model="queryParams.qwUserId"
+          placeholder="请输入分享人企微id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['live:liveWatchLog:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['live:liveWatchLog:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['live:liveWatchLog:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['live:liveWatchLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="liveWatchLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="记录编号" align="center" prop="logId" />
+      <el-table-column label="会员id" align="center" prop="userId" />
+      <el-table-column label="直播间id" align="center" prop="liveId" />
+      <el-table-column label="记录类型" align="center" prop="logType">
+        <template slot-scope="scope">
+          <dict-tag :options="logTypeOptions" :value="scope.row.logType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="外部联系人id" align="center" prop="externalContactId" />
+      <el-table-column label="销售id" align="center" prop="companyUserId" />
+      <el-table-column label="公司id" align="center" prop="companyId" />
+      <el-table-column label="完课时间" align="center" prop="finishTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="sop最后创建时间" align="center" prop="sopCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sopCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="发送小程序appid" align="center" prop="sendAppId" /> -->
+      <!-- <el-table-column label="日志创建来源：1、个人sop，2、群聊sop，3、一键群发" align="center" prop="logSource" /> -->
+      <el-table-column label="分享人企微id" align="center" prop="qwUserId" />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['live:liveWatchLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['live:liveWatchLog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改直播看课记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户userId" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户userId" />
+        </el-form-item>
+        <el-form-item label="直播间id" prop="liveId">
+          <el-input v-model="form.liveId" placeholder="请输入直播间id" />
+        </el-form-item>
+        <el-form-item label="记录类型" prop="logType">
+          <el-select v-model="form.logType" placeholder="请选择记录类型">
+            <el-option
+              v-for="dict in logTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="外部联系人id" prop="externalContactId">
+          <el-input v-model="form.externalContactId" placeholder="请输入外部联系人id" />
+        </el-form-item>
+        <el-form-item label="销售id" prop="companyUserId">
+          <el-input v-model="form.companyUserId" placeholder="请输入销售id" />
+        </el-form-item>
+        <el-form-item label="公司id" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入公司id" />
+        </el-form-item>
+        <el-form-item label="完课时间" prop="finishTime">
+          <el-date-picker clearable size="small"
+            v-model="form.finishTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择完课时间">
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="sop最后创建时间" prop="sopCreateTime">
+          <el-date-picker clearable size="small"
+            v-model="form.sopCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择sop最后创建时间">
+          </el-date-picker>
+        </el-form-item> -->
+        <!-- <el-form-item label="发送小程序appid" prop="sendAppId">
+          <el-input v-model="form.sendAppId" placeholder="请输入发送小程序appid" />
+        </el-form-item>
+        <el-form-item label="日志创建来源：1、个人sop，2、群聊sop，3、一键群发" prop="logSource">
+          <el-input v-model="form.logSource" placeholder="请输入日志创建来源：1、个人sop，2、群聊sop，3、一键群发" />
+        </el-form-item> -->
+        <el-form-item label="分享人企微id" prop="qwUserId">
+          <el-input v-model="form.qwUserId" placeholder="请输入分享人企微id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLiveWatchLog, getLiveWatchLog, delLiveWatchLog, addLiveWatchLog, updateLiveWatchLog, exportLiveWatchLog } from "@/api/live/liveWatchLog";
+
+export default {
+  name: "LiveWatchLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 直播看课记录表格数据
+      liveWatchLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 记录类型 1看课中 2完课 3待看课 4看课中断字典
+      logTypeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        liveId: null,
+        logType: null,
+        externalContactId: null,
+        companyUserId: null,
+        companyId: null,
+        finishTime: null,
+        sopCreateTime: null,
+        sendAppId: null,
+        logSource: null,
+        qwUserId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("live_watch_log_type").then(response => {
+      this.logTypeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询直播看课记录列表 */
+    getList() {
+      this.loading = true;
+      listLiveWatchLog(this.queryParams).then(response => {
+        this.liveWatchLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        logId: null,
+        userId: null,
+        liveId: null,
+        logType: null,
+        createTime: null,
+        updateTime: null,
+        externalContactId: null,
+        companyUserId: null,
+        companyId: null,
+        finishTime: null,
+        createBy: null,
+        sopCreateTime: null,
+        sendAppId: null,
+        logSource: null,
+        qwUserId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.logId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加直播看课记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const logId = row.logId || this.ids
+      getLiveWatchLog(logId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改直播看课记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.logId != null) {
+            updateLiveWatchLog(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLiveWatchLog(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const logIds = row.logId || this.ids;
+      this.$confirm('是否确认删除直播看课记录编号为"' + logIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delLiveWatchLog(logIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有直播看课记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportLiveWatchLog(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/qw/externalContact/index.vue

@@ -592,7 +592,7 @@
 
       <div>搜索标签：
         <el-input v-model="queryTagParams.name" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="getPageListTagGroup()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchTags(queryTagParams.name)">搜索</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="cancelSearchTags">重置</el-button>
       </div>
       <div v-for="item in tagGroupList" :key="item.id"  >
@@ -629,8 +629,8 @@
 
     <el-dialog title="批量添加标签" :visible.sync="tagOpen" width="800px" append-to-body>
       <div>搜索标签：
-        <el-input v-model="queryTagParams.name" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="getPageListTagGroup()">搜索</el-button>
+        <el-input v-model="tagChange.tagName" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchTags(tagChange.tagName)">搜索</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="cancelSearchTags">重置</el-button>
       </div>
       <el-form ref="form" :model="addTagForm"  label-width="80px">
@@ -1523,7 +1523,7 @@ export default {
 
 
     getPageListTagGroup(){
-      
+
       this.queryTagParams.corpId=this.queryParams.corpId
       allListTagGroupPage(this.queryTagParams).then(response => {
         this.tagGroupList = response.rows;

src/views/qw/sop/sop.vue

@@ -739,6 +739,37 @@
                     </el-radio-group>
                   </el-form-item>
                   <el-form-item label="内容" style="margin-bottom: 2%" >
+                     <div v-if="item.contentType == 12">
+                        <!--                                           <div >-->
+                        <el-card class="box-card">
+                          <el-form-item label="直播间" >
+                            <el-select  v-model="item.liveId"
+                                        placeholder="请选择直播间" size="mini"
+                                        @change="liveChange(item)" >
+                              <el-option
+                                v-for="dict in liveList"
+                                :key="dict.liveId"
+                                :label="dict.liveName"
+                                :value="dict.liveId"
+                              />
+                            </el-select>
+                          </el-form-item>
+
+                          <el-form-item label="标题" prop="miniprogramTitle">
+                            <el-input v-model="item.miniprogramTitle" placeholder="请输入小程序消息标题，最长为64字节" :rows="2" maxlength="64"
+                                      type="textarea"   />
+                          </el-form-item>
+                          <el-form-item label="封面" prop="miniprogramPicUrl">
+                            <ImageUpload v-model="item.miniprogramPicUrl" type="image" :num="10" :width="150" :height="150" />
+                          </el-form-item>
+                          <el-form-item label="appid" prop="miniprogramAppid" v-show="false">
+                            <el-input v-model="item.miniprogramAppid='wx503cf8ab31f83dd4' " disabled />
+                          </el-form-item>
+                          <el-form-item label="page路径" prop="miniprogramPage"  v-show="false" label-width="100px" style="margin-left: -30px">
+                            <el-input v-model="item.miniprogramPage" placeholder="小程序消息打开后的路径"  disabled />
+                          </el-form-item>
+                        </el-card>
+                      </div>
                     <el-input v-if="item.contentType == 1 " v-model="item.value" type="textarea" :rows="3" placeholder="内容" style="width: 90%;margin-top: 10px;"/>
 
                     <ImageUpload v-if="item.contentType == 2 " v-model="item.imgUrl" type="image" :num="1"  :width="150" :height="150" />
@@ -913,6 +944,7 @@ import {listTag,} from "@/api/qw/tag";
 import {getMyQwCompanyList} from "@/api/qw/user";
 import {allList} from "@/api/qw/groupChat";
 import SendMsgSopOpenTool from '@/views/qw/sopUserLogsInfo/sendMsgSopOpenTool.vue'
+import {listToLiveNoEnd} from "@/api/live/live";
 
 export default {
   name: "Sop",
@@ -941,7 +973,7 @@ export default {
       chatList: [],
       courseList: [],
       sendMsgOpen:{
-        title:'一键批量群发',
+        title:'一键批量群发',//标记todo copyLMX
         open:false,
         row: {},
         ids:null,
@@ -1060,10 +1092,14 @@ export default {
         autoSopType: [{required: true, message: "选项不能为空", trigger: "submit"}],
         autoStartTime: [{required: true, message: "起始时间不能为空", trigger: "submit"}],
         autoEndTime: [{required: true, message: "结束时间不能为空", trigger: "submit"}],
-      }
+      },
+      liveList: [],
     };
   },
   created() {
+    listToLiveNoEnd().then(response => {
+      this.liveList = response.rows;
+    })
 
     this.getDicts("sys_sop_status").then(response => {
       this.sysSopStatus = response.data;
@@ -1809,11 +1845,29 @@ export default {
           if (this.setting.length <= 0) {
             return this.$message.error("请添加规则")
           }
-          if (this.msgForm.courseId===null || this.msgForm.courseId===''){
+          console.log(this.msgForm.setting)
+          let jsonSetting = JSON.parse(this.msgForm.setting);
+          let hasLiveSetting = false;
+          console.log(jsonSetting)
+          for(let index=0;index < jsonSetting.length;index++){
+           if(!!jsonSetting[index] && jsonSetting[index].contentType == "12") {
+            hasLiveSetting = true;
+            break;
+           }
+          }
+          if(!!hasLiveSetting && (this.msgForm.courseId!=null && this.msgForm.courseId!='')){
+              return this.$message.error("直播间不能选取课程");
+          }
+          if(!!hasLiveSetting && (this.msgForm.videoId!=null && this.msgForm.videoId!='')){
+              return this.$message.error("直播间不能选取课节");
+          }
+          console.log(hasLiveSetting);
+          // debugger;
+          if ((this.msgForm.courseId===null || this.msgForm.courseId==='') && !hasLiveSetting){
             return this.$message.error("课程不能为空")
           }
 
-          if (this.msgForm.videoId===null || this.msgForm.videoId===''){
+          if ((this.msgForm.videoId===null || this.msgForm.videoId==='')&& !hasLiveSetting){
             return this.$message.error("课节不能为空")
           }
 
@@ -1821,6 +1875,7 @@ export default {
             return this.$message.error("消息类型不能为空")
           }
 
+
           for (let i = 0; i < this.setting.length; i++) {
             if (this.setting[i].contentType == 1 && (this.setting[i].value == null || this.setting[i].value == "")) {
               return this.$message.error("内容不能为空")
@@ -1849,6 +1904,9 @@ export default {
             if (this.setting[i].contentType == 7 && (this.setting[i].value == null || this.setting[i].value == "")) {
               return this.$message.error("语音不能为空")
             }
+            if(this.setting[i].contentType == 12 && (this.setting[i].liveId==null || this.setting[i].liveId == "")){
+             return this.$message.error("直播间不能为空");
+            }
           }
 
           this.sendMsgOpen.open = false;
@@ -1909,6 +1967,20 @@ export default {
     delSetList(index){
       this.setting.splice(index,1)
     },
+    liveChange(content) {
+      // content.liveId 是选中的直播间 ID（liveId）
+      const selectedLive = this.liveList.find(live => live.liveId === content.liveId);
+      if (selectedLive) {
+        // 从选中的直播间对象中提取标题和封面，赋值给当前内容的对应字段
+        // 假设直播间对象中标题字段为 liveTitle，封面字段为 coverImg（根据实际接口字段调整）
+        content.miniprogramTitle = selectedLive.liveName || ''; // 自动填充标题
+        content.miniprogramPicUrl = selectedLive.liveImgUrl || ''; // 自动填充封面
+      } else {
+        // 若未找到对应直播间，清空标题和封面（可选）
+        content.miniprogramTitle = '';
+        content.miniprogramPicUrl = '';
+      }
+    },
   }
 };
 </script>

src/views/qw/sopUserLogs/sopUserLogsSchedule.vue

@@ -77,6 +77,7 @@
         <el-tooltip class="item" effect="dark"
                     content="此功能用于给 选中的 营期 内【所有的】客户发送 消息【或者发送草稿-/-清楚草稿】" placement="top"
         >
+        <!-- copylmx -->
           <el-button
             type="warning"
             icon="el-icon-s-promotion"

src/views/qw/sopUserLogsInfo/sendMsgOpenTool.vue

@@ -489,6 +489,7 @@ export default {
       videoList(this.msgForm.courseId).then(response => {
         this.videoList=response.list;
       });
+      this.msgForm.videoId = null
     },
 
     videoIdChange() {

src/views/qw/sopUserLogsInfo/sendMsgSopOpenTool.vue

@@ -415,7 +415,6 @@ export default {
       this.msgForm.type = type;
       this.msgForm.corpId = corpId;
       this.msgForm.isMine = isMine;
-
     },
     courseChange() {
       if (this.msgForm.courseId != null ) {
@@ -439,6 +438,7 @@ export default {
       videoList(this.msgForm.courseId).then(response => {
         this.videoList=response.list;
       });
+      this.msgForm.videoId = null
     },
 
     videoIdChange() {

src/views/qw/sopUserLogsInfo/sopUserLogsInfoDetails.vue

@@ -931,6 +931,7 @@ export default {
       videoList(this.msgForm.courseId).then(response => {
         this.videoList=response.list;
       });
+      this.msgForm.videoId = null
     },
 
     videoIdChange() {

src/views/qw/sopUserLogsInfo/sopUserLogsInfoDetailsOld.vue

@@ -811,6 +811,7 @@ export default {
       videoList(this.msgForm.courseId).then(response => {
         this.videoList=response.list;
       });
+      this.msgForm.videoId = null
     },
 
     videoIdChange() {