点播订单和看课记录

src/views/hisStore/components/productOrder.vue

@@ -141,6 +141,26 @@
                   {{ order.remark }}
                 </span>
           </el-descriptions-item>
+          <el-descriptions-item label="销售名称" v-if="order!=null && order.orderType != 0">
+                <span >
+                  {{ order.companyUserName }}
+                </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="销售公司" v-if="order!=null && order.orderType != 0">
+                <span >
+                  {{ order.companyName }}
+                </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="所属营期" v-if="order!=null && order.orderType == 3">
+                <span >
+                  {{ order.periodName }}
+                </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="所属小节" v-if="order!=null && order.orderType == 3">
+                <span >
+                  {{ order.videoName }}
+                </span>
+          </el-descriptions-item>
           <el-descriptions-item label="跟随阶段" v-if="company.companyId == 174">
               <span v-if="order!=null ">
                 <el-tag prop="orderVisit" v-for="(item, index) in customerUserStatusOptions"

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -124,6 +124,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="订单类型" prop="orderType">
+        <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small">
+          <el-option label="直播订单" value="2" />
+          <el-option label="点播订单" value="3" />
+        </el-select>
+      </el-form-item>
       <!--      <el-form-item label="上传凭证" prop="isUpload">
                <el-select   v-model="queryParams.isUpload" placeholder="请选择" clearable size="small" >
                 <el-option key="0"  label="未上传" value="0" />
@@ -440,6 +446,7 @@
       <el-table-column align="center" label="订单类型" prop="orderType" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.orderType == 2" type="warning">直播订单</el-tag>
+          <el-tag v-else-if="scope.row.orderType == 3">点播订单</el-tag>
           <el-tag v-else type="success">商城订单</el-tag>
         </template>
       </el-table-column>

src/views/live/liveData/indexCompany.vue

@@ -60,7 +60,7 @@
       <el-table-column prop="totalAttendanceCount" label="总到课人数(去重)" width="140" align="center">
         <template slot-scope="scope">{{ scope.row.totalAttendanceCount || 0 }}</template>
       </el-table-column>
-      <el-table-column prop="totalCompleteCount" label="总完课人数" width="110" align="center">
+      <el-table-column prop="totalCompleteCount" label="总完课人数(去重)" width="110" align="center">
         <template slot-scope="scope">{{ scope.row.totalCompleteCount || 0 }}</template>
       </el-table-column>
       <el-table-column prop="totalCompleteRate" label="总完课率" width="100" align="center">
@@ -69,7 +69,7 @@
       <el-table-column prop="liveAttendanceCount" label="直播课人数(去重)" width="140" align="center">
         <template slot-scope="scope">{{ scope.row.liveAttendanceCount || 0 }}</template>
       </el-table-column>
-      <el-table-column prop="liveCompleteCount" label="直播完课人数" width="120" align="center">
+      <el-table-column prop="liveCompleteCount" label="直播完课人数(去重)" width="120" align="center">
         <template slot-scope="scope">{{ scope.row.liveCompleteCount || 0 }}</template>
       </el-table-column>
       <el-table-column prop="liveCompleteRate" label="直播完课率" width="110" align="center">
@@ -167,6 +167,27 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      // 验证公司ID不能为空
+      if (!this.queryParams.companyIds || this.queryParams.companyIds.length === 0) {
+        this.$message.warning('请选择公司');
+        return;
+      }
+
+      // 验证时间范围不能为空
+      if (!this.dateRange || this.dateRange.length !== 2) {
+        this.$message.warning('请选择时间范围');
+        return;
+      }
+
+      // 验证时间范围不能超过31天
+      const startDate = new Date(this.dateRange[0]);
+      const endDate = new Date(this.dateRange[1]);
+      const diffTime = Math.abs(endDate - startDate);
+      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+      if (diffDays > 31) {
+        this.$message.warning('时间范围不能超过31天');
+        return;
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },