appv1.2 需求

src/api/course/userCoursePeriod.js

@@ -52,6 +52,15 @@ export function addCourse(data) {
   })
 }
 
+// 插入会员营期课程
+export function insertCourse(data) {
+  return request({
+    url: '/course/period/insertCourse',
+    method: 'post',
+    data: data
+  })
+}
+
 // 新增会员营期
 export function updateCourseTime(data) {
   return request({

src/api/his/externalOrder.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+export function listExternalOrder(query) {
+  return request({
+    url: '/his/externalOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getExternalOrder(orderId) {
+  return request({
+    url: '/his/externalOrder/' + orderId,
+    method: 'get'
+  })
+}
+
+export function auditExternalOrder(orderId) {
+  return request({
+    url: '/his/externalOrder/audit/' + orderId,
+    method: 'post'
+  })
+}
+
+export function cancelExternalOrder(orderId) {
+  return request({
+    url: '/his/externalOrder/cancel/' + orderId,
+    method: 'post'
+  })
+}

src/views/components/course/userCourseCatalogDetails.vue

@@ -159,6 +159,12 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否VIP课程" prop="isVip">
+          <el-radio-group v-model="form.isVip">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品选择" v-if="form.isProduct === 1">
           <el-button size="small" type="primary" @click="chooseCourseProduct">选取商品</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.courseProducts">
@@ -788,6 +794,7 @@ export default {
         transcodeFileKey: null,
         isProduct: 0,
         isFirst: 0,
+        isVip: 0,
         listingStartTime: null,
         listingEndTime: null,
       };

src/views/course/userCoursePeriod/index.vue

@@ -381,7 +381,7 @@
 <!--    </el-dialog>-->
 
     <!-- 添加课程对话框-->
-    <el-dialog title="添加课程" :visible.sync="course.addOpen" width="500px" append-to-body>
+    <el-dialog :title="course.addMode === 'insert' ? '插入课程' : '添加课程'" :visible.sync="course.addOpen" width="500px" append-to-body>
       <el-form ref="courseAddForm" :model="course.form" :rules="courseAddRules" label-width="100px">
         <el-form-item label="课程" prop="courseId">
           <el-select filterable  v-model="course.form.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(course.form.courseId)" style="width: 100%" :value-key="'dictValue'">
@@ -423,6 +423,15 @@
           </el-select>
           <p v-if="!course.form.videoIds || course.form.videoIds.length === 0" style="color: #909399; font-size: 12px; margin: 5px 0 0;">请先选择小节</p>
         </el-form-item>
+        <el-form-item v-if="course.addMode === 'insert'" label="营期时间" prop="dayDate">
+          <el-date-picker
+            v-model="course.form.dayDate"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="请选择营期时间"
+            style="width: 100%">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="看课时间" prop="timeRange">
           <el-time-picker
             is-range
@@ -542,6 +551,16 @@
                 v-hasPermi="['course:period:addCourse']"
               >添加课程</el-button>
             </el-col>
+            <el-col :span="1.5">
+              <el-button
+                v-if="(getDiff(periodSettingsData.periodStartingTime, periodSettingsData.periodEndTime) - course.total) > 0"
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleInsertCourse"
+                v-hasPermi="['course:period:addCourse']"
+              >插入课程</el-button>
+            </el-col>
 <!--            <el-col :span="1.5">-->
 <!--              <el-button-->
 <!--                type="primary"-->
@@ -662,7 +681,7 @@
 </template>
 
 <script>
-import {addPeriod, delPeriod, exportPeriod, getPeriod, pagePeriod, updatePeriod, getDays, addCourse,delPeriodDay,  updateCourseTime, updateCourseDate, updateListCourseData, periodCourseMove, closePeriod} from "@/api/course/userCoursePeriod";
+import {addPeriod, delPeriod, exportPeriod, getPeriod, pagePeriod, updatePeriod, getDays, addCourse, insertCourse, delPeriodDay,  updateCourseTime, updateCourseDate, updateListCourseData, periodCourseMove, closePeriod} from "@/api/course/userCoursePeriod";
 import {getCompanyList} from "@/api/company/company";
 import { listCamp, addCamp, editCamp, delCamp, copyCamp } from "@/api/course/userCourseCamp";
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
@@ -738,6 +757,7 @@ export default {
         loading: true,
         total: 0,
         addOpen: false,
+        addMode: 'add',
         form: {
           videoIds: [],
           noRegisterVideoIds: []
@@ -813,6 +833,18 @@ export default {
         videoIds: [
           { required: true, message: '请选择小节', trigger: 'change' },
           { type: 'array', min: 1, message: '请至少选择一个小节', trigger: 'change' }
+        ],
+        dayDate: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.course.addMode === 'insert' && !value) {
+                callback(new Error('请选择营期时间'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
         ]
       },
       // 修改看课时间表单校验
@@ -1492,9 +1524,11 @@ export default {
         }
       });
       this.course.addOpen = true;
+      this.course.addMode = 'add';
       this.course.form = {
         periodId: this.course.queryParams.periodId,
         courseId: null,
+        dayDate: null,
         timeRange: ['00:00:00', '23:59:59'],
         joinTime: '23:59:59',
         videoIds: [],
@@ -1507,6 +1541,10 @@ export default {
         }
       });
     },
+    handleInsertCourse() {
+      this.handleAddCourse();
+      this.course.addMode = 'insert';
+    },
     handleUpdateCourse() {
       const key = "joinTime.switch.config"
       getConfigByKey(key).then(response => {
@@ -1534,9 +1572,11 @@ export default {
     },
     closeAddCourse() {
       this.course.addOpen = false;
+      this.course.addMode = 'add';
       this.course.form = {
         periodId: null,
         courseId: null,
+        dayDate: null,
         timeRange: null,
         joinTime: null,
         videoIds: [],
@@ -1584,14 +1624,26 @@ export default {
     submitCourseForm(){
       this.$refs.courseAddForm.validate(valid => {
         if (valid) {
-          if(this.course.form.timeRange != null && this.course.form.timeRange.length === 2){
-            this.course.form.startTime = this.course.form.timeRange[0];
-            this.course.form.endTime1 = this.course.form.timeRange[1];
+          const isInsert = this.course.addMode === 'insert';
+          const submitData = { ...this.course.form };
+          if(submitData.timeRange != null && submitData.timeRange.length === 2){
+            if (isInsert) {
+              submitData.startDateTime = `${submitData.dayDate} ${submitData.timeRange[0]}`;
+              submitData.endDateTime = `${submitData.dayDate} ${submitData.timeRange[1]}`;
+            } else {
+              submitData.startTime = submitData.timeRange[0];
+              submitData.endTime1 = submitData.timeRange[1];
+            }
           }
-          // 提交数据
-          addCourse(this.course.form).then(response => {
-            this.$message.success('添加成功');
+          if (isInsert && submitData.joinTime) {
+            submitData.lastJoinTime = `${submitData.dayDate} ${submitData.joinTime}`;
+          }
+          const submitRequest = isInsert ? insertCourse : addCourse;
+          const successMessage = isInsert ? '插入成功' : '添加成功';
+          submitRequest(submitData).then(response => {
+            this.$message.success(successMessage);
             this.course.addOpen = false;
+            this.course.addMode = 'add';
             // 重新加载训练营列表
             this.getCourseList();
           });

src/views/his/externalOrder/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单编号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户电话" prop="userPhone">
+        <el-input
+          v-model="queryParams.userPhone"
+          placeholder="请输入用户电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </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">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="externalOrderList">
+      <el-table-column label="订单编号" align="center" prop="orderCode" />
+      <el-table-column label="销售公司" align="center" prop="companyName" />
+      <el-table-column label="销售账号" align="center" prop="companyUserName" />
+      <el-table-column label="用户名称" align="center" prop="userName" />
+      <el-table-column label="用户电话" align="center" prop="userPhone" />
+      <el-table-column label="商品名称" align="center" prop="productNames" show-overflow-tooltip />
+      <el-table-column label="应收金额" align="center" prop="receivablePrice" />
+      <el-table-column label="实付金额" align="center" prop="payPrice" />
+      <el-table-column label="状态" align="center" prop="statusDesc" />
+      <el-table-column label="提交时间" align="center" prop="externalCreateTime" width="180"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
+          >详情
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleAudit(scope.row)"
+            v-if="scope.row.status === 1"
+            v-hasPermi="['his:externalOrder:audit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleCancel(scope.row)"
+            v-if="scope.row.status === 1 || scope.row.status === 2"
+            v-hasPermi="['his:externalOrder:cancel']"
+          >取消
+          </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-drawer
+      :with-header="false"
+      size="60%"
+      :title="drawer.title" :visible.sync="drawer.open">
+      <div class="drawer-content" v-if="detail">
+        <el-descriptions title="订单详情" :column="2" border>
+          <el-descriptions-item label="订单编号">{{ detail.orderCode }}</el-descriptions-item>
+          <el-descriptions-item label="外部来源">{{ detail.source }}</el-descriptions-item>
+          <el-descriptions-item label="销售公司">{{ detail.companyName }}</el-descriptions-item>
+          <el-descriptions-item label="销售账号">{{ detail.companyUserName }}</el-descriptions-item>
+          <el-descriptions-item label="收货人">{{ detail.userName }}</el-descriptions-item>
+          <el-descriptions-item label="收货电话">{{ detail.userPhone }}</el-descriptions-item>
+          <el-descriptions-item label="收货地址" :span="2">{{ detail.userAddress }}</el-descriptions-item>
+          <el-descriptions-item label="商品总数">{{ detail.totalNum }}</el-descriptions-item>
+          <el-descriptions-item label="订单总价">{{ detail.totalPrice }}</el-descriptions-item>
+          <el-descriptions-item label="应收金额">{{ detail.receivablePrice }}</el-descriptions-item>
+          <el-descriptions-item label="实付金额">{{ detail.payPrice }}</el-descriptions-item>
+          <el-descriptions-item label="运费">{{ detail.freightPrice }}</el-descriptions-item>
+          <el-descriptions-item label="支付方式">
+            <span v-if="detail.payType === 1">微信支付</span>
+            <span v-else-if="detail.payType === 2">支付宝</span>
+            <span v-else>{{ detail.payType }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="是否支付">
+            <span v-if="detail.isPay === 1">已支付</span>
+            <span v-else>未支付</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="支付时间">{{ detail.payTime }}</el-descriptions-item>
+          <el-descriptions-item label="快递公司">{{ detail.deliveryName }}</el-descriptions-item>
+          <el-descriptions-item label="快递单号">{{ detail.deliverySn }}</el-descriptions-item>
+          <el-descriptions-item label="发货时间">{{ detail.deliveryTime }}</el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">{{ detail.remark }}</el-descriptions-item>
+          <el-descriptions-item label="外部创建时间">{{ detail.externalCreateTime }}</el-descriptions-item>
+          <el-descriptions-item label="系统创建时间">{{ detail.createTime }}</el-descriptions-item>
+        </el-descriptions>
+
+        <el-divider content-position="left">商品明细</el-divider>
+        <el-table :data="detail.productList" border>
+          <el-table-column label="商品图片" align="center" prop="productImage">
+            <template slot-scope="scope">
+              <el-image style="width: 50px; height: 50px" :src="scope.row.productImage" fit="cover"></el-image>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" align="center" prop="productName" />
+          <el-table-column label="规格" align="center" prop="productSpec" />
+          <el-table-column label="单价" align="center" prop="price" />
+          <el-table-column label="数量" align="center" prop="num" />
+        </el-table>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { listExternalOrder, getExternalOrder, auditExternalOrder, cancelExternalOrder } from "@/api/his/externalOrder";
+
+export default {
+  name: "ExternalOrder",
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      externalOrderList: [],
+      statusOptions: [],
+      drawer: {
+        open: false,
+        title: "订单详情"
+      },
+      detail: null,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderCode: null,
+        userName: null,
+        userPhone: null,
+        status: null
+      }
+    };
+  },
+  created() {
+    this.statusOptions = [
+      { dictValue: 1, dictLabel: "待审核" },
+      { dictValue: 2, dictLabel: "待发货" },
+      { dictValue: 3, dictLabel: "待收货" },
+      { dictValue: 4, dictLabel: "已完成" },
+      { dictValue: -3, dictLabel: "已取消" }
+    ];
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listExternalOrder(this.queryParams).then(response => {
+        this.externalOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleDetail(row) {
+      this.drawer.open = true;
+      getExternalOrder(row.orderId).then(response => {
+        this.detail = response.data;
+      });
+    },
+    handleAudit(row) {
+      this.$confirm('确认审核通过订单"' + row.orderCode + '"吗?', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        auditExternalOrder(row.orderId).then(response => {
+          if (response.code === 0) {
+            this.msgSuccess("审核成功");
+            this.getList();
+          } else {
+            this.msgError(response.msg);
+          }
+        });
+      }).catch(() => {});
+    },
+    handleCancel(row) {
+      this.$confirm('确认取消订单"' + row.orderCode + '"吗?', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        cancelExternalOrder(row.orderId).then(response => {
+          if (response.code === 0) {
+            this.msgSuccess("取消成功");
+            this.getList();
+          } else {
+            this.msgError(response.msg);
+          }
+        });
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped>
+.drawer-content {
+  padding: 20px;
+}
+</style>