销售后台 需求和bug修改

src/api/course/courseWatchLog.js

@@ -112,6 +112,13 @@ export function exportCourseWatchLog(query) {
     params: query
   })
 }
+export function statisticsExport(query) {
+  return request({
+    url: '/course/courseWatchLog/statisticsExport',
+    method: 'get',
+    params: query
+  })
+}
 
 // 导出我的短链课程看课记录
 export function myExportCourseWatchLog(query) {

src/views/course/courseWatchLog/deptWatchLog.vue

@@ -267,20 +267,20 @@
       </el-form-item>
     </el-form>
 
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['course:courseWatchLog:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport1"
+          v-hasPermi="['course:courseWatchLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <el-tabs type="card" v-model="activeName" @tab-click="handleClickX">
       <el-tab-pane label="全部" name="00"></el-tab-pane>
@@ -464,7 +464,15 @@
 </template>
 
 <script>
-import { deptListCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog } from "@/api/course/courseWatchLog";
+import {
+  deptListCourseWatchLog,
+  getCourseWatchLog,
+  delCourseWatchLog,
+  addCourseWatchLog,
+  updateCourseWatchLog,
+  exportCourseWatchLog,
+  statisticsExport
+} from "@/api/course/courseWatchLog";
 import {courseList, myListCourseRedPacketLog, videoList} from '@/api/course/courseRedPacketLog'
 import {myListLogs} from "@/api/course/courseAnswerlogs";
 import { getCompanyUserListLikeName } from "@/api/company/companyUser";
@@ -886,7 +894,26 @@ export default {
           }
         }).catch(() => {});
     },
-
+    handleExport1() {
+      if (this.isEmptyArray(this.createTimeText) &&
+        this.isEmptyArray(this.updateTimeText) &&
+        this.isEmptyArray(this.scheduleTimeText)) {
+        this.$message.warning('请选择创建时间或营期时间或最新更新时间');
+        return;
+      }
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有短链课程看课记录数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportCourseWatchLog(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
     openAnswerLogFun(row) {
       this.openAnswerLog = true;
       this.answerLogQueryParams.watchLogId = row.logId;

src/views/course/courseWatchLog/qw/statistics.vue

@@ -196,7 +196,7 @@ export default {
             column.property === "noUserWaitNumber" ||
             column.property === "onLineRate" ||
             column.property === "finishedRate" ||
-            column.property === "redAmount" 
+            column.property === "redAmount"
           ) {
           }
         } else {
@@ -213,7 +213,7 @@ export default {
             } else if(index === 13 && !!sums[9]){
               sums[index] =  (sums[7] * 100 / sums[9]).toFixed(2) + '%';
             }
-          } 
+          }
         }
       });
       console.log(sums);

src/views/course/courseWatchLog/statistics.vue

@@ -38,7 +38,19 @@
         <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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange"  show-summary>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="销售昵称" align="center" prop="qwUserName" />
@@ -65,7 +77,16 @@
 </template>
 
 <script>
-import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,statisticsList } from "@/api/course/courseWatchLog";
+import {
+  listCourseWatchLog,
+  getCourseWatchLog,
+  delCourseWatchLog,
+  addCourseWatchLog,
+  updateCourseWatchLog,
+  exportCourseWatchLog,
+  statisticsList,
+  statisticsExport
+} from "@/api/course/courseWatchLog";
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import PaginationMore from "../../../components/PaginationMore/index.vue";
 import {getDateRange} from "@/utils/common";
@@ -287,7 +308,7 @@ export default {
           type: "warning"
         }).then(() => {
           this.exportLoading = true;
-          return exportCourseWatchLog(queryParams);
+          return statisticsExport(queryParams);
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;

src/views/store/components/packageOrderDetails.vue

@@ -78,7 +78,28 @@
        </el-card>
      </div>
 
-
+    <div class="contentx" v-if="item!=null">
+      <div class="desct">
+        收货信息
+       </div>
+      <el-descriptions   :column="3" border  >
+        <el-descriptions-item label="收货人"  >
+                <span v-if="item!=null">
+                  {{item.userName}}
+                </span>
+        </el-descriptions-item>
+        <el-descriptions-item label="收货人电话"  >
+                <span v-if="item!=null">
+                  {{item.userPhone}}
+                </span>
+        </el-descriptions-item>
+        <el-descriptions-item label="收货人地址"  >
+                <span v-if="item!=null">
+                  {{item.userAddress}}
+                </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
 
    <div class="contentx" v-if="item!=null">
      <div class="desct">
@@ -282,7 +303,7 @@ import addSms from '../../crm/components/addSms.vue';
         setTimeout(() => {
             that.$refs.sms.getPackageOrderId(this.item.orderId,mobile,3);
         }, 500);
-        
+
       },
       handlePhone(){
         const orderId = this.item.orderId;