From cb97962ddabeca96cc4cc15789c0ded3ee49181a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Sat, 9 Oct 2021 20:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/setting.js                   |   9 +-
 src/utils/api.js                 |   4 +-
 src/views/course/assetConfig.vue |  15 +-
 src/views/order/AddOrder.vue     | 726 ++++++++++++++++---------------
 src/views/order/Order.vue        | 241 +++++-----
 src/views/serve/Configure.vue    |   1 +
 6 files changed, 519 insertions(+), 477 deletions(-)

diff --git a/src/setting.js b/src/setting.js
index dcf186d..7e80f78 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -3,19 +3,18 @@
  * */
 const url = location.host;
 const isDev = process.env.NODE_ENV === 'development'; // 开发环境
-const isTest = url.includes('10.196.131.73'); //测试服
+const isTest = url.includes('39.108.250.202'); //测试服
 const isPro = url.includes('120.78.127.12'); //正式服
 
-
 let jumpPath = "";
 let host = "";
 if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
     // host = 'http://192.168.31.216:9000'// 榕
-    host = 'http://192.168.31.125:9000'// 坤
-    // host = 'http://192.168.31.137:9000'// 陈赓
+    // host = 'http://192.168.31.125:9000'// 坤
+    host = 'http://192.168.31.137:9000'// 赓
 } else if (isTest) {
-    jumpPath = "";
+    jumpPath = "http://39.108.250.202/judgmentPoint/";
     host = "http://39.108.250.202:9000";
 } else if (isPro) {
     jumpPath = "";
diff --git a/src/utils/api.js b/src/utils/api.js
index 08f3d51..ddb499f 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,9 +1,7 @@
 import Setting from '@/setting';
-// let host = Setting.host;
+let host = Setting.host;
 let uploadURL = "http://8.134.8.197:8001";
 
-let host = "http://192.168.31.151:9000"; // 榕
-
 export default {
 
   logins: `${host}/users/users/user/login`, //登录
diff --git a/src/views/course/assetConfig.vue b/src/views/course/assetConfig.vue
index 5b5d92c..9fad8ce 100644
--- a/src/views/course/assetConfig.vue
+++ b/src/views/course/assetConfig.vue
@@ -262,7 +262,7 @@ export default {
         getData() {
             this.$get(`${this.api.queryChaptersAndSubsections}/${this.id}`)
                 .then(res => {
-                    this.chapters = res.data.chapterList;
+                    this.chapters = res.chapterList;
                 })
                 .catch(err => {
 
@@ -324,11 +324,12 @@ export default {
             );
         },
         uploadSuccess(res, file, fileList) {
+            console.log(res);
             this.uploading = false;
-            this.fileId = res.data.filesResult.fileId;
-            this.fileType = res.data.filesResult.fileType;
-            this.fileUrl = res.data.filesResult.fileUrl;
-            this.fileName = res.data.filesResult.ossFileName;
+            this.fileId = res.filesResult.fileId;
+            this.fileType = res.filesResult.fileType;
+            this.fileUrl = res.filesResult.fileUrl;
+            this.fileName = res.filesResult.ossFileName;
         },
         uploadError(err, file, fileList) {
             this.$message({
@@ -476,7 +477,7 @@ export default {
         preview(row) {
             if (this.transferType(row.fileType) == "视频") {
                 this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-                    this.playAuth = res.data.playAuth;
+                    this.playAuth = res.playAuth;
                     if (this.player) {
                         this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
                     } else {
@@ -518,7 +519,7 @@ export default {
                         this.isWord = false;
                         this.isExcel = false;
                     }
-                    this.iframeSrc = res.data.previewUrl;
+                    this.iframeSrc = res.previewUrl;
                     this.$nextTick(() => {
                         this.iframeOnload();
                     });
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 588c4c6..022a596 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -6,18 +6,13 @@
                 <el-col :span="24">
                     <el-card shadow="hover" class="mgb20">
                         <div class="flex-between">
-                            <div class="per_title" v-preventReClick @click="goback()">
+                            <div class="per_title" v-preventReClick @click="goBack()">
                                 <i class="el-icon-arrow-left"></i>
                                 <span class="per_back">返回</span>
                                 <span class="per_school">订单处理</span>
                             </div>
-                            <!-- 新增 -->
-                            <el-button v-if="!disabled&&!editDisabled" type="primary" size="small" round class="mag"
-                                       v-preventReClick @click="addOrder">确定
-                            </el-button>
-                            <!-- 修改 -->
-                            <el-button v-if="editDisabled" type="primary" size="small" round class="mag"
-                                       v-preventReClick @click="orderUpdate">确定
+                            <el-button v-if="!disabled" type="primary" round class="mag" v-preventReClick
+                                       @click="submitOrder">确定
                             </el-button>
                         </div>
                     </el-card>
@@ -109,67 +104,71 @@
                                     <p class="addhr_tag"></p>
                                     <span>课程权限</span>
                                 </div>
-                                <el-button v-if="!disabled&&!editDisabled" type="primary" size="small" round class="mag"
-                                           @click="addClassJurisdiction()">添加
+                                <el-button v-if="!disabled&&!editDisabled&&!renewDisabled" type="primary" round
+                                           class="mag"
+                                           @click="addCourseJurisdiction()">添加
                                 </el-button>
                             </div>
 
-                            <el-table :data="jurisdictionData" class="orderTable" stripe header-align="center">
-                                <el-table-column type="index" width="100" label="序号" align="center">
+                            <el-table :data="coursePermissions" class="orderTable" stripe header-align="center">
+                                <el-table-column type="index" width="60" label="序号" align="center">
                                 </el-table-column>
-                                <el-table-column prop="productName" label="课程名称" align="center">
+                                <el-table-column prop="productName" label="课程名称" align="center" width="200">
                                 </el-table-column>
-                                <el-table-column label="使用期限" align="center" width="200">
+                                <el-table-column label="使用期限" align="center">
                                     <template slot-scope="scope">
-                                        <div class="course-input">
-                                            <el-input @change="deadLine($event,scope.row)" maxlength="4"
+                                        <div class="small">
+                                            <el-input onkeyup="value=this.value.replace(/\D+/g,'')"
+                                                      :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                                      :disabled="disabled||editDisabled" maxlength="4"
+                                                      @change="deadLine($event,scope.row),zero($event,scope.row)"
                                                       oninput="value=value.replace(/[^0-9.]/g,'')"
                                                       v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                            <span>月</span>
+                                            <span style="margin-left:5px">月</span>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="起止日期" align="center" width="200">
                                     <template slot-scope="scope">
-                                        <p v-if="!scope.row.startDate">请输入使用期限，且确认发货</p>
-                                        <div v-else style="display:flex;justify-content:center;">
-                                            <p>{{ scope.row.startTime }}</p><span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
-                                            <p>{{ scope.row.endTime }}</p>
-                                        </div>
+                                        <p v-if="!scope.row.startTime">请输入使用期限</p>
+                                        <p v-else>{{ scope.row.startTime }} - {{ scope.row.endTime }}</p>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="剩余期限" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input v-model="scope.row.remainingPeriod" placeholder="请输入"
+                                            <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
                                                       type="text"></el-input>
-                                            <span>天</span>
+                                            <span style="margin-left:5px">天</span>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="市场价" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input v-model="scope.row.marketValue" placeholder="请输入"
+                                            <el-input disabled v-model="scope.row.marketValue" placeholder=""
                                                       type="text"></el-input>
-                                            <span>万</span>
+                                            <span style="margin-left:5px">万</span>
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="成交价 " align="center">
+                                <el-table-column label="成交价" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input @change="calculateDiscount($event,scope.row)"
+                                            <el-input :class="!scope.row.finalPrice&&whetherSubmit?'red':''"
+                                                      :disabled="disabled||editDisabled"
+                                                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                                      @change="[allAmount($event,scope.row),calculateDiscount($event,scope.row)]"
                                                       v-model="scope.row.finalPrice" placeholder="请输入"
                                                       type="text"></el-input>
-                                            <span>万</span>
+                                            <span style="margin-left:5px">万</span>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="折扣率 " align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input v-model="scope.row.discountRate" placeholder="请输入"
+                                            <el-input disabled v-model="scope.row.discountRate" placeholder=""
                                                       type="text"></el-input>
                                         </div>
                                     </template>
@@ -179,15 +178,34 @@
                                         <el-button @click="configure(scope.row)">配置</el-button>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="发货" align="center">
+                                <el-table-column label="操作" align="center" width="230px">
                                     <template slot-scope="scope">
-                                        <el-switch
-                                            :disabled="scope.row.ship ? true : false"
-                                            v-model="scope.row.ship"
-                                            :active-value="1"
-                                            :inactive-value="0"
-                                            @change="formSwitch($event,scope.row)">
-                                        </el-switch>
+                                        <div class="flex-c-c">
+                                            <el-button v-if="!editDisabled&&!disabled" style="margin-right:10px;"
+                                                       @click="delCourseForm(scope.$index)">删除
+                                            </el-button>
+                                            <el-switch
+                                                style="margin-right:10px"
+                                                v-show="scope.row.ship"
+                                                :disabled="disabled"
+                                                v-model="scope.row.isEnable"
+                                                :active-value="1"
+                                                :inactive-value="0"
+                                                active-text="启用"
+                                                inactive-text="禁用"
+                                                @change="handleEnable($event,scope.row)">
+                                            </el-switch>
+                                            <el-switch
+                                                v-show="!scope.row.ship"
+                                                :disabled="scope.row.ship === 0 || disabled"
+                                                v-model="scope.row.ship"
+                                                :active-value="1"
+                                                :inactive-value="0"
+                                                active-text="发货"
+                                                inactive-text="未发货"
+                                                @change="handleDeliver($event,scope.row)">
+                                            </el-switch>
+                                        </div>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -202,58 +220,55 @@
                                     <p class="addhr_tag"></p>
                                     <span>数据平台权限</span>
                                 </div>
-                                <el-button v-if="!disabled&&!editDisabled&&!renewDisabled" type="primary" size="small"
+                                <el-button v-if="!disabled&&!editDisabled&&!renewDisabled" type="primary"
                                            round class="mag" @click="addDataJurisdiction()">添加
                                 </el-button>
                             </div>
 
-                            <el-table :data="dataPlatform" class="orderTable" stripe header-align="center"
-                                      :summary-method="getSummaries">
-                                <el-table-column type="index" width="100" label="序号" align="center">
+                            <!--:summary-method="getSummaries"-->
+                            <el-table :data="dataPlatformPermissions" class="orderTable" stripe header-align="center">
+                                <el-table-column type="index" width="60" label="序号" align="center">
                                 </el-table-column>
                                 <el-table-column prop="productName" label="产品名称" align="center" width="200">
                                 </el-table-column>
-                                <el-table-column label="使用期限" align="center" width="200">
+                                <el-table-column label="使用期限" align="center">
                                     <template slot-scope="scope">
-                                        <div class="course-input">
+                                        <div class="small">
                                             <el-input onkeyup="value=this.value.replace(/\D+/g,'')"
                                                       :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
                                                       :disabled="disabled||editDisabled" maxlength="4"
                                                       @change="deadLine($event,scope.row),zero($event,scope.row)"
                                                       oninput="value=value.replace(/[^0-9.]/g,'')"
                                                       v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                            <span>月</span>
+                                            <span style="margin-left:5px">月</span>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="起止日期" align="center" width="200">
                                     <template slot-scope="scope">
                                         <p v-if="!scope.row.startTime">请输入使用期限</p>
-                                        <div v-else style="display:flex;justify-content:center;">
-                                            <p>{{ scope.row.startTime }}</p><span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
-                                            <p>{{ scope.row.endTime }}</p>
-                                        </div>
+                                        <p v-else>{{ scope.row.startTime }} - {{ scope.row.endTime }}</p>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="剩余期限" align="center" width="200">
+                                <el-table-column label="剩余期限" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input disabled v-model="scope.row.remainingPeriod" placeholder="请输入"
+                                            <el-input disabled v-model="scope.row.remainingPeriod" placeholder=""
                                                       type="text"></el-input>
                                             <span style="margin-left:5px">天</span>
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="市场价" align="center" width="200">
+                                <el-table-column label="市场价" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
-                                            <el-input disabled v-model="scope.row.marketValue" placeholder="请输入"
+                                            <el-input disabled v-model="scope.row.marketValue" placeholder=""
                                                       type="text"></el-input>
                                             <span style="margin-left:5px">元&nbsp;/&nbsp;账号</span>
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="成交价" align="center" width="200">
+                                <el-table-column label="成交价" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.finalPrice&&whetherSubmit?'red':''"
@@ -266,7 +281,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="折扣率" align="center" width="200">
+                                <el-table-column label="折扣率" align="center">
                                     <template slot-scope="scope">
                                         <!-- <div class="discountRate"> -->
                                         <div class="small">
@@ -275,7 +290,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="账号数" align="center" width="200">
+                                <el-table-column label="账号数" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.accountNum&&whetherSubmit?'red':''"
@@ -287,7 +302,7 @@
                                     </template>
                                 </el-table-column>
                                 <!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 -->
-                                <el-table-column label="总金额(元)" align="center" width="200">
+                                <el-table-column label="总金额(元)" align="center">
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.totalAmount&&whetherSubmit?'red':''"
@@ -299,11 +314,6 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <!-- <el-table-column label="端口地址 " align="center">
-                                    <template slot-scope="scope">
-                                        <el-button :disabled="disabled" @click="configure(scope.row)">配置</el-button>
-                                    </template>
-                                </el-table-column> -->
                                 <el-table-column label="操作" align="center" width="230px">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
@@ -316,30 +326,25 @@
                                                 v-show="scope.row.ship"
                                                 :disabled="disabled"
                                                 v-model="scope.row.isEnable"
-                                                :active-value="false"
-                                                :inactive-value="true"
+                                                :active-value="1"
+                                                :inactive-value="0"
                                                 active-text="启用"
                                                 inactive-text="禁用"
-                                                @change="formSwitch($event,scope.row)">
+                                                @change="handleEnable($event,scope.row)">
                                             </el-switch>
                                             <el-switch
                                                 v-show="!scope.row.ship"
-                                                :disabled="scope.row.ship||disabled"
+                                                :disabled="scope.row.ship === 0 || disabled"
                                                 v-model="scope.row.ship"
-                                                :active-value="true"
-                                                :inactive-value="false"
+                                                :active-value="1"
+                                                :inactive-value="0"
                                                 active-text="发货"
                                                 inactive-text="未发货"
-                                                @change="deliverGoods($event,scope.row)">
+                                                @change="handleDeliver($event,scope.row)">
                                             </el-switch>
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <!-- <el-table-column label="发货状态" align="center">
-                                    <template slot-scope="scope">
-                                    </template>
-                                </el-table-column> -->
-
                             </el-table>
                         </div>
                     </el-card>
@@ -416,7 +421,7 @@
             </el-row>
 
             <!-- 添加课程权限弹框-->
-            <el-dialog :visible.sync="classVisible" width="50%" center>
+            <el-dialog :visible.sync="courseVisible" width="50%" center>
                 <div class="flex-between mgb20">
                     <div class="flex-center">
                         <p class="addhr_tag"></p>
@@ -424,17 +429,21 @@
                     </div>
                     <div>
                         <el-input placeholder="请输入课程名称" prefix-icon="el-icon-search" v-model.trim="curriculumName"
-                                  @keyup.enter.native="addClassJurisdiction('search')" clearable></el-input>
+                                  @keyup.enter.native="getCourseJurisdiction()" clearable></el-input>
                     </div>
                 </div>
-                <el-table v-loading="dataLoading" :data="permissionData" stripe header-align="center"
+                <el-table v-loading="dataLoading" :data="courseList" stripe header-align="center"
                           @selection-change="handleSelectionChange" row-key="cid">
-                    <el-table-column type="selection" width="55" align="center"></el-table-column>
+                    <el-table-column type="selection" :selectable="courseSelectable" width="55"
+                                     align="center"></el-table-column>
                     <el-table-column type="index" width="100" label="序号" align="center">
                     </el-table-column>
                     <el-table-column prop="curriculumName" label="课程名称" align="center">
                     </el-table-column>
-                    <el-table-column prop="curriculumType" label="课程类型" align="center">
+                    <el-table-column label="课程类型" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ curriculumTypeKeys[scope.row.curriculumType] }}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column label="配置的实训应用" align="center">
                         <template slot-scope="scope">
@@ -445,13 +454,13 @@
                     </el-table-column>
                 </el-table>
                 <div class="pagination">
-                    <el-pagination background layout="total, prev, pager, next" :total="totals"
-                                   @current-change="handleCurrentChange" :current-page="pageNo">
+                    <el-pagination background layout="total, prev, pager, next" :total="courseTotals"
+                                   @current-change="handleCurrentChange" :current-page="coursePage">
                     </el-pagination>
                 </div>
                 <span slot="footer" class="dialog-footer">
-                    <el-button @click="classVisible = false">取 消</el-button>
-                    <el-button type="primary" v-preventReClick @click="addSystem()">确 定</el-button>
+                    <el-button @click="courseVisible = false">取 消</el-button>
+                    <el-button type="primary" v-preventReClick @click="addCourse()">确 定</el-button>
                 </span>
             </el-dialog>
 
@@ -464,12 +473,12 @@
                     </div>
                     <div>
                         <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="productName"
-                                  @keyup.enter.native="addDataJurisdiction('search')" clearable></el-input>
+                                  @keyup.enter.native="getDataJurisdiction('search')" clearable></el-input>
                     </div>
                 </div>
-                <el-table v-loading="dataLoading" :data="boxDataPlatform" stripe header-align="center"
-                          @selection-change="boxDataPlatformSelection" row-key="id">
-                    <el-table-column type="selection" :selectable="selectable" width="55"
+                <el-table v-loading="dataLoading" :data="platformList" stripe header-align="center"
+                          @selection-change="dataPlatformSelection" row-key="id">
+                    <el-table-column type="selection" :selectable="dataSelectable" width="55"
                                      align="center"></el-table-column>
                     <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                     <el-table-column prop="productName" label="产品名称" align="center"></el-table-column>
@@ -499,7 +508,7 @@
             <el-dialog :visible.sync="ipVisible" width="70%" center>
                 <div class="flex-center mgb20">
                     <p class="hr_tag"></p>
-                    <span>客户列表</span>
+                    <span>地址列表</span>
                 </div>
                 <el-table :data="IPData" stripe header-align="center">
                     <el-table-column type="index" width="100" label="序号" align="center">
@@ -582,8 +591,8 @@ export default {
                 // orderId: this.$store.state.orderId,
                 customerName: ""// 客户名称
             },
-            jurisdictionData: [{}],// 课程权限
-            dataPlatform: [{}],// 数据平台data
+            coursePermissions: [],// 课程权限
+            dataPlatformPermissions: [],// 数据平台权限
 
             contract: { // 合同信息
                 contractName: "",   // 合同名称
@@ -664,12 +673,16 @@ export default {
             ],
 
             // 课程权限弹框
-            classVisible: false,
-            totals: 0,
-            pageNo: 1,
-            permissionData: [],
-            multipleSelection: [],
+            courseVisible: false,
+            courseTotals: 0,
+            coursePage: 1,
+            courseList: [],
+            courseSelection: [],
             curriculumName: "",
+            curriculumTypeKeys: {
+                0: "理论",
+                1: "实训"
+            }, // 课程类别
 
 
             ipVisible: false,
@@ -702,7 +715,7 @@ export default {
             showPlatform: false,// 弹框显示
             platfromTotals: 0,// 列表条目
             platfromPage: 1,// 页码
-            boxDataPlatform: [],// 数据平台弹框
+            platformList: [],// 数据平台列表
             platformSelect: [],// 数据平台弹框选中
             productName: ""// 搜索产品名称
 
@@ -731,37 +744,33 @@ export default {
 
     methods: {
         // 读取页面详情
-        async getDetail(id) {
-            return this.$get(this.api.orderDetail, { orderId: +id }).then(res => {
-                let form = res.orderDetails.order,// 基本信息
-                    contract = res.orderDetails.contractInformation ? res.orderDetails.contractInformation : {},// 合同
-                    list = res.orderDetails.orderOther;// 俩列表
-                list.map(e => {
-                    e.ship === 1 ? e.ship = true : e.ship = false;
-                    e.isEnable ? e.isEnable = false : e.isEnable = true;
-                });
-                let dataArr = list.filter(e => {// 数据平台
-                        if (this.renewDisabled) {/* 处于续费 */
-                            let end = Date.parse(e.endTime);
-                            let now = +new Date();
-                            if (now < end) {
-                                let time = e.endTime.split(" ")[0];
-                                let arr = time.split("-");
-                                e.startTime = arr[0] + "-" + arr[1] + "-" + "0" + (+arr[2] + 1);
-                            } else {/* 过期 */
-                                e.startTime = "";
-                            }
-                            e.endTime = "";
-                            e.periodOfUse = "";
+        getDetail(id) {
+            this.$get(this.api.orderDetail, { orderId: +id }).then(res => {
+                let form = res.orderDetails.order;// 基本信息
+                let contract = res.orderDetails.contractInformation ? res.orderDetails.contractInformation : {}; // 合同
+                let list = res.orderDetails.orderOther.map(e => {
+                    // 处于续费
+                    if (this.renewDisabled) {
+                        let end = Date.parse(e.endTime);
+                        let now = +new Date();
+                        if (now < end) {
+                            let time = e.endTime.split(" ")[0];
+                            let arr = time.split("-");
+                            e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
                         } else {
-                            e.startTime = e.startTime.split(" ")[0];
-                            e.endTime = e.endTime.split(" ")[0];
+                            // 过期
+                            e.startTime = "";
                         }
-                        return e.authority === 0;
-                    }),
-                    classArr = list.filter(e => {// 课程权限
-                        return e.authority === 1;
-                    });
+                        e.endTime = "";
+                        e.periodOfUse = "";
+                    } else {
+                        e.startTime = e.startTime.split(" ")[0];
+                        e.endTime = e.endTime.split(" ")[0];
+                    }
+                    return e;
+                });// 俩列表
+
+
                 this.form = {
                     orderNumber: form.orderNumber,
                     createTime: form.createTime,
@@ -791,47 +800,63 @@ export default {
                 if (contract.startTime && contract.endTime) {
                     this.contractTime = [contract.startTime, contract.endTime];
                 }
-                this.dataPlatform = dataArr;
+
+                this.coursePermissions = list.filter(i => i.authority === 1);
+                this.dataPlatformPermissions = list.filter(i => i.authority === 0);
             });
         },
         // 新增订单
-        addOrder() {
-            if (this.dataPlatform.length === 0) {
-                return this.$message.error("请选择产品后再确认订单！");
+        submitOrder() {
+            if (!this.coursePermissions.length && !this.dataPlatformPermissions.length) {
+                return this.$message.error("请选择课程权限或数据权限后再确认订单");
             }
-            let verify =
-                this.dataPlatform.some(e => {
-                    if (!e.periodOfUse || !e.finalPrice || !e.accountNum || !e.totalAmount) {
-                        return false;
-                    } else {
-                        return true;
-                    }
-                });
-            if (!verify) {
-                this.whetherSubmit = true;
-                setTimeout(() => {
-                    this.whetherSubmit = false;
-                }, 4000);
-                return this.$message.error("请把产品参数输入完整！");
+
+            // 课程权限参数校验
+            if (this.coursePermissions.length) {
+                let courseVerify =
+                    this.coursePermissions.some(e => {
+                        if (!e.periodOfUse || !e.finalPrice) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    });
+                if (!courseVerify) {
+                    this.whetherSubmit = true;
+                    setTimeout(() => {
+                        this.whetherSubmit = false;
+                    }, 4000);
+                    return this.$message.error("请把课程参数输入完整");
+                }
             }
-            if (this.dataPlatform) {
 
+            // 数据平台权限参数校验
+            if (this.dataPlatformPermissions.length) {
+                let dataVerify =
+                    this.dataPlatformPermissions.some(e => {
+                        if (!e.periodOfUse || !e.finalPrice || !e.accountNum || !e.totalAmount) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    });
+                if (!dataVerify) {
+                    this.whetherSubmit = true;
+                    setTimeout(() => {
+                        this.whetherSubmit = false;
+                    }, 4000);
+                    return this.$message.error("请把产品参数输入完整");
+                }
             }
-            this.dataPlatform.map(e => {
-                e.ship ? e.ship = 1 : e.ship = 0;
-                e.isEnable ? e.isEnable = 0 : e.isEnable = 1;
-            });
-            this.jurisdictionData.map(e => {
-                e.ship ? e.ship = 1 : e.ship = 0;
-                e.isEnable ? e.isEnable = 0 : e.isEnable = 1;
-            });
+
             this.$refs["form"].validate((valid) => {
                 if (valid) {
-                    let renew = this.dataPlatform.some(e => e.renew);
+                    let tempArr = [...this.dataPlatformPermissions, ...this.coursePermissions];
+                    let renew = tempArr.some(e => e.renew);
                     if (this.renewDisabled || renew) {/* 续费状态下 */
                         this.form.orderNature = 2;
                         if (renew) {
-                            this.dataPlatform.forEach(e => {
+                            tempArr.forEach(e => {
                                 if (e.renew) delete e.renew;
                             });
                         }
@@ -839,47 +864,32 @@ export default {
                     let param = {
                         contractInformation: this.contract,//合同信息
                         order: this.form,// 订单基本数据
-                        orderOther: [...this.dataPlatform, ...this.jurisdictionData]//订单其他数据
+                        orderOther: tempArr//俩列表
                     };
                     this.loading = true;
-                    this.$post(this.api.orderAdd, param).then(res => {
-                        this.$router.push("/order");
-                        this.loading = false;
-                        this.$message.success("添加订单成功！");
-                    }).catch(err => {
-                        this.loading = false;
-                    });
+                    if (this.editDisabled) {
+                        this.$post(this.api.orderUpdate, param).then(res => {
+                            this.$message.success("修改成功");
+                            this.loading = false;
+                            this.$router.back();
+                        }).catch(err => {
+                            this.loading = false;
+
+                        });
+                    } else {
+                        this.$post(this.api.orderAdd, param).then(res => {
+                            this.$message.success("添加订单成功");
+                            this.loading = false;
+                            this.$router.back();
+                        }).catch(err => {
+                            this.loading = false;
+                        });
+                    }
                 } else {
-                    this.$message("请填上必填项!");
+                    this.$message("请填上必填项");
                     return false;
                 }
             });
-
-        },
-        // 编辑订单确定
-        orderUpdate() {
-            this.dataPlatform.map(e => {
-                e.ship ? e.ship = 1 : e.ship = 0;
-                e.isEnable ? e.isEnable = 0 : e.isEnable = 1;
-            });
-            this.jurisdictionData.map(e => {
-                e.ship ? e.ship = 1 : e.ship = 0;
-                e.isEnable ? e.isEnable = 0 : e.isEnable = 1;
-            });
-            let param = {
-                contractInformation: this.contract,//合同信息
-                order: this.form,// 订单基本数据
-                orderOther: [...this.dataPlatform, ...this.jurisdictionData]//订单其他数据
-            };
-            this.loading = true;
-            this.$post(this.api.orderUpdate, param).then(res => {
-                this.$message.success("修改成功！");
-                this.loading = false;
-                this.$router.push("/order");
-            }).catch(err => {
-                this.loading = false;
-
-            });
         },
         /* 处理0开头的期限 */
         zero(e, row) {
@@ -909,11 +919,14 @@ export default {
                 this.$forceUpdate();
             }
         },
-        // 课程列表数据
-        addClassJurisdiction(val) {
-            if (val !== "search") {
-                this.classVisible = !this.classVisible;
-            }
+        // 添加课程权限
+        addCourseJurisdiction() {
+            if (!this.form.customerId) return this.$message.warning("请先选择客户");
+            this.courseVisible = true;
+            this.getCourseJurisdiction();
+        },
+        // 获取课程权限列表
+        getCourseJurisdiction() {
             let param = {
                 pageSize: 10,
                 pageNum: this.platfromPage,
@@ -921,8 +934,8 @@ export default {
             };
             this.dataLoading = true;
             this.$post(this.api.curriculumList, param).then(res => {
-                this.permissionData = res.page.records;
-                this.platfromTotals = res.page.total;
+                this.courseList = res.page.records;
+                this.courseTotals = res.page.total;
                 this.dataLoading = false;
             }).catch(err => {
                 this.dataLoading = false;
@@ -930,26 +943,94 @@ export default {
         },
         // 课程--弹框列表选中
         handleSelectionChange(val) {
-            this.multipleSelection = val;
+            this.courseSelection = val;
         },
         // 课程弹框--页数变更
         handleCurrentChange(val) {
-            this.pageNo = val;
-            this.addClassJurisdiction();
+            this.coursePage = val;
+            this.getCourseJurisdiction();
         },
-        async addSystem() {
-            if (!this.form.customerId) return this.$message.warning("请先选择客户！");
-            if (this.multipleSelection.length > 0) {
+        async addCourse() {
+            if (this.courseSelection.length > 0) {
+                let that = this;
+                let fn = function(e) {
+                    let obj = {
+                        dataOrCourseId: e.cid,// id
+                        productName: e.curriculumName,// 名称
+                        periodOfUse: "",// 使用期限
+                        startTime: "",// 开始
+                        endTime: "", // 终止
+                        remainingPeriod: "",// 剩余期限
+                        marketValue: e.marketPrice,// 市场价
+                        finalPrice: "",// 成交价
+                        discountRate: "",// 折扣率
+                        accountNum: "",// 账号数
+                        totalAmount: "",// 总价
+                        ship: 0,// 发货否
+                        authority: 1 // 区分权限 0为数据平台权限，1为课程权限
+                    };
+                    that.coursePermissions.push(obj);
+                };
+                let idArr = [];
+                this.courseSelection.map(e => {// 取得选中的值，进行赋值
+                    idArr.push(e.cid);
+                    if (this.coursePermissions.length > 0) {
+                        // 比对是否存在该id，若存在，不操作，不存在，则进行push操作
+                        let find = this.coursePermissions.some(i => e.cid === i.dataOrCourseId);// 判断已有的相同的id不进行处理
+                        if (!find) {
+                            fn(e);
+                        }
+                    } else {
+                        fn(e);
+                    }
+                });
+                this.courseVisible = !this.courseVisible;
+                this.platformSelect = [];
 
+                /* 调接口，判断是否为客户已有的课程 */
+                let params = {
+                    authority: 1,
+                    customerId: this.form.customerId,
+                    productId: idArr
+                };
+                await this.$post(this.api.renew, params).then(res => {
+                    this.coursePermissions.map(e => {
+                        res.orderOthers.map(el => {
+                            if (el.dataOrCourseId === e.dataOrCourseId) {
+                                let time = el.endTime.split(" ")[0];
+                                let arr = time.split("-");
+                                e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
+                                e.endTime = "";
+                                e.periodOfUse = "";
+                                e.renew = true;
+                            }
+                        });
+                    });
+                });
             } else {
                 return this.$message.warning("请选择课程");
             }
         },
-        // 数据平台列表数据
-        addDataJurisdiction(val) {
-            if (val !== "search") {
-                this.showPlatform = !this.showPlatform;
-            }
+        // 删除课程权限
+        delCourseForm(index) {
+            this.$confirm("确定要删除吗？", "提示", {
+                type: "warning"
+            }).then(() => {
+                if (this.renewDisabled && this.coursePermissions.length === 1) {
+                    return this.$message.warning("续费至少保留一条课程权限");
+                } else {
+                    this.coursePermissions.splice(index, 1);
+                }
+            });
+        },
+        // 添加数据平台权限
+        addDataJurisdiction() {
+            if (!this.form.customerId) return this.$message.warning("请先选择客户");
+            this.showPlatform = true;
+            this.getDataJurisdiction();
+        },
+        // 获取数据权限列表
+        getDataJurisdiction() {
             let param = {
                 pageSize: 10,
                 pageNum: this.platfromPage,
@@ -958,7 +1039,7 @@ export default {
             };
             this.dataLoading = true;
             this.$post(this.api.listByEntity, param).then(res => {
-                this.boxDataPlatform = res.pageList.records;
+                this.platformList = res.pageList.records;
                 this.platfromTotals = res.pageList.total;
                 this.dataLoading = false;
             }).catch(err => {
@@ -966,38 +1047,37 @@ export default {
             });
         },
         // 数据平台--弹框列表选中
-        boxDataPlatformSelection(val) {
+        dataPlatformSelection(val) {
             this.platformSelect = val;
         },
         // 数据平台弹框--确定
         async addPlatform() {
-            if (!this.form.customerId) return this.$message.warning("请先选择客户！");
             if (this.platformSelect.length > 0) {
                 let that = this;
                 let fn = function(e) {
                     let obj = {
+                        dataOrCourseId: e.id,// id
                         productName: e.productName,// 名称
                         periodOfUse: "",// 使用期限
-                        dataOrCourseId: e.id,// id
-                        accountNum: "",// 账号数
                         startTime: "",// 开始
                         endTime: "", // 终止
                         remainingPeriod: "",// 剩余期限
                         marketValue: e.market,// 市场价
                         finalPrice: "",// 成交价
                         discountRate: "",// 折扣率
+                        accountNum: "",// 账号数
                         totalAmount: "",// 总价
-                        ship: false,// 发货否
+                        ship: 0,// 发货否
                         authority: 0// 数据平台权限
                     };
-                    that.dataPlatform.push(obj);
+                    that.dataPlatformPermissions.push(obj);
                 };
                 let idArr = [];
                 this.platformSelect.map(e => {// 取得选中的值，进行赋值
                     idArr.push(e.id);
-                    if (this.dataPlatform.length > 0) {
+                    if (this.dataPlatformPermissions.length > 0) {
                         // 比对是否存在该id，若存在，不操作，不存在，则进行push操作
-                        let find = this.dataPlatform.some(i => e.id === i.dataOrCourseId);// 判断已有的相同的id不进行处理
+                        let find = this.dataPlatformPermissions.some(i => e.id === i.dataOrCourseId);// 判断已有的相同的id不进行处理
                         if (!find) {
                             fn(e);
                         }
@@ -1015,12 +1095,12 @@ export default {
                     productId: idArr
                 };
                 await this.$post(this.api.renew, params).then(res => {
-                    this.dataPlatform.map(e => {
+                    this.dataPlatformPermissions.map(e => {
                         res.orderOthers.map(el => {
                             if (el.dataOrCourseId === e.dataOrCourseId) {
                                 let time = el.endTime.split(" ")[0];
                                 let arr = time.split("-");
-                                e.startTime = arr[0] + "-" + arr[1] + "-" + "0" + (+arr[2] + 1);
+                                e.startTime = arr[0] + "-" + arr[1] + "-" + (+arr[2] + 1);
                                 e.endTime = "";
                                 e.periodOfUse = "";
                                 e.renew = true;
@@ -1028,7 +1108,6 @@ export default {
                         });
                     });
                 });
-
             } else {
                 return this.$message.warning("请选择数据");
             }
@@ -1036,7 +1115,30 @@ export default {
         // 数据平台弹框--页数变更
         platfromCurrentChange(val) {
             this.platfromPage = val;
-            this.addDataJurisdiction();
+            this.getDataJurisdiction();
+        },
+        // 删除数据平台权限
+        delDataForm(index) {
+            this.$confirm("确定要删除吗？", "提示", {
+                type: "warning"
+            }).then(() => {
+                if (this.renewDisabled && this.dataPlatformPermissions.length === 1) {
+                    return this.$message.warning("续费至少保留一条产品信息");
+                } else {
+                    this.dataPlatformPermissions.splice(index, 1);
+                }
+            });
+        },
+        // 课程/数据平台-启用
+        handleEnable(e, row) {
+
+        },
+        // 课程/数据平台-发货
+        handleDeliver(e, row) {
+            if (this.editDisabled) {
+                this.$post(this.api.ship + "?id=" + `${row.dataOrCourseId}`).then(res => {
+                });
+            }
         },
         // 计算折扣率
         calculateDiscount(val, row) {
@@ -1058,12 +1160,21 @@ export default {
         },
         // 新增数据平台权限时，计算总的金额数目
         allAmount($event, row) {
-            // 课程权限未完善，没写
-            let arr = [];
-            this.dataPlatform.map(e => {
-                arr.push(+e.totalAmount);
+            // 课程权限总价
+            let courseArr = [];
+            this.coursePermissions.map(e => {
+                courseArr.push(+e.finalPrice);
             });
-            this.form.orderAmount = arr.reduce((a, b) => a + b);
+            let courseTotalPrice = courseArr.reduce((a, b) => a + b, 0);
+
+            // 数据权限总价
+            let dataArr = [];
+            this.dataPlatformPermissions.map(e => {
+                dataArr.push(+e.totalAmount);
+            });
+            let dataTotalPrice = dataArr.reduce((a, b) => a + b, 0);
+
+            this.form.orderAmount = courseTotalPrice * 10000 + dataTotalPrice;
         },
         // 总金额触发--计算账号或市场价
         allAmountChange(val, row) {
@@ -1090,17 +1201,6 @@ export default {
                 row.finalPrice = Math.round(row.totalAmount / row.accountNum).toFixed(2);
             }
         },
-        // 权限switch切换--计算天数
-        formSwitch(e, row) {
-        },
-        // 数据平台--发货
-        deliverGoods(e, row) {
-            if (this.editDisabled) {
-                this.$post(this.api.ship + "?id=" + `${row.dataOrCourseId}`).then(res => {
-                });
-                // this.$post(this.api.ship,{id:4}).then(res=>{
-            }
-        },
         // 使用期限转换以及计算剩余天数
         deadLine(e, row) {
             function completeDate(value) {
@@ -1120,7 +1220,10 @@ export default {
                 let renewY = arr.shift();/* 年 */
                 let renewM = arr.shift();/* 月 */
                 let renewD = arr.shift();/* 日 */
-                let endYear = +renewY + (parseInt((+renewM + (+e)) / 13) === 0 ? 0 : parseInt((+renewM + (+e)) / 12)) + char + completeDate((+renewM + (+e)) % 12) + char + renewD;
+                if ((+renewM + (+e)) > 12) {
+                    renewY = +renewY + Math.ceil((+renewM + (+e)) / 12) - 1;
+                }
+                let endYear = renewY + char + completeDate((+renewM + (+e)) % 12) + char + renewD;
                 row.endTime = endYear;
 
                 // 计算剩余天数
@@ -1128,9 +1231,8 @@ export default {
                 let date2 = Date.parse(row.startTime);
                 let ms = Math.abs(date1 - date2);
                 row.remainingPeriod = Math.floor(ms / (24 * 3600 * 1000));
-
             } else {
-                if (e === "") {
+                if (e === "" || (e.substr(0, 1) === "0")) {
                     row.startTime = "";
                     row.endTime = "";
                     return;
@@ -1138,7 +1240,10 @@ export default {
                 //补全0，并拼接当前的时间点
                 let nowYear = year + char + completeDate(month) + char + completeDate(day);
                 // 判断结束日期
-                let endYear = year + (parseInt((+month + (+e)) / 12) === 0 ? 0 : parseInt((+month + (+e)) / 12)) + char + completeDate((+month + (+e)) % 12) + char + completeDate(day);
+                if ((+month + (+e)) > 12) {
+                    year = +year + Math.ceil((+month + (+e)) / 12) - 1;
+                }
+                let endYear = year + char + completeDate((+month + (+e)) % 12) + char + completeDate(day);
                 // 得出起始年月日
                 row.startTime = nowYear;
                 row.endTime = endYear;
@@ -1149,20 +1254,6 @@ export default {
                 let days = Math.floor(ms / (24 * 3600 * 1000));
                 row.remainingPeriod = days;
             }
-
-
-        },
-        // 删除数据平台产品
-        delDataForm(index) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.dataPlatform.length === 1) {
-                    return this.$message.warning("续费至少保留一条产品信息！");
-                } else {
-                    this.dataPlatform.splice(index, 1);
-                }
-            });
         },
         // 清除省份
         clearprovince() {
@@ -1188,8 +1279,8 @@ export default {
         },
         // 清除城市
         clearcity() {
-            this.form.customerId = "",
-                this.form.orderContact = "";
+            this.form.customerId = "";
+            this.form.orderContact = "";
             this.form.phone = "";
             this.form.email = "";
         },
@@ -1225,94 +1316,16 @@ export default {
             }).catch(res => {
             });
         },
-
-        // // 获取应用配置
-        // getConfig(rows){
-        //     this.multipleSelection = []
-        //     let data = {
-        //         courseId: this.curArr,
-        //         searchContent: this.configSearch,
-        //         pageNo: this.pageNo,
-        //         pageSize: this.pageSize,
-        //     }
-        //     this.$get(this.api.queryCourseList,data).then(res => {
-        //         res.message.rows.forEach(e => {
-        //             e.courseType = this.courseTypeStatus(e.courseType)
-        //             e.courseHours = this.hoursStatus(e.courseHours)
-        //         })
-        //         this.permissionData = res.message.rows
-        //         this.totals = res.message.total
-        //         this.classVisible = true
-        //     }).catch(res => {});
-        // },
-        // onSearch(){
-        //     this.getConfig()
-        // },
-        getRowKeys(row) {
-            return row.courseId;
-        },
-
-        // // 绑定实训配置
-        // addSystem() {
-        //     this.classVisible = false     
-        //     let arr = this.multipleSelection
-        //     let result = arr.map(e => e.courseId).join()
-        //     this.curArr = this.curArr.concat(`,${result}`)
-        //     if (this.curArr.substr(0,1)==','){
-        //         this.curArr = this.curArr.substr(1);
-        //     }
-        //     let data = {
-        //         courseId: result,
-        //     }
-        //     this.getPermissions(data)
-        // },
-
-
-        // 查询应用权限
-        getPermissions(val) {
-            this.$get(this.api.queryCoursePermissions, val).then(res => {
-                this.classVisible = false;
-                var arritem = {
-                    usePeriod: 30,
-                    transactionPrice: "",
-                    discount: "",
-                    isDeliverGoods: 0,
-                    portAddressId: 1,
-                    orderId: this.form.orderId
-                };
-                let arryNew = [];
-                res.message.map(item => {
-                    arryNew.push(Object.assign({}, item, arritem));
-                });
-                this.jurisdictionData = this.jurisdictionData.concat(arryNew);
-            }).catch(res => {
-            });
-        },
-        deljur(index, row) {
-            this.$confirm("确定要删除该课程吗？", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    let newArr = this.curArr.split(",");
-                    this.removeByValue(newArr, row.courseId);
-                    var newStr = newArr.toString();
-                    this.curArr = newStr;
-                    this.jurisdictionData.splice(index, 1);
-                    this.$message.success("删除成功");
-                })
-                .catch(() => {
-                });
+        discountChange(row) {
+            let reg = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;
+            if (!(reg.test(row.transactionPrice))) {
+                this.$message.error("请输入正确金额格式,可保留两位小数");
+                row.transactionPrice = "";
+            } else {
+                row.discount = this.Percentage(row.transactionPrice, row.marketPrice);
+            }
         },
-        // discountChange(row){
-        //     let reg = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
-        //     if(!(reg.test(row.transactionPrice))){
-        //         this.$message.error('请输入正确金额格式,可保留两位小数！');
-        //         row.transactionPrice = ''
-        //     }else{
-        //         row.discount = this.Percentage(row.transactionPrice,row.marketPrice)
-        //     }
-        // },
-        getSummaries(param) {
+        getSummaries(param) { // 自定义的合计计算方法
             const { columns, data } = param;
             var sums = 0;
             data.map(e => {
@@ -1325,16 +1338,16 @@ export default {
         // 上传文件超出
         handleExceed(files, fileList) {
             this.$message.warning(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择`
             );
         },
         // 上传前
         beforeAvatarUpload(file) {
             const size = file.size / 1024 / 1024 < 10;
             let type = file.name.split(".").pop();
-            let str = ["jpg", "jepg", "gif", "png", "doc", "docx", "pdf"].includes(type.toLowerCase());
+            let str = ["jpg", "jpeg", "gif", "png", "doc", "docx", "pdf"].includes(type.toLowerCase());
             if (!str) {
-                this.$message.error("只能上传图片，word文件和pdf文件！");
+                this.$message.error("只能上传图片，word文件和pdf文件");
             } else if (!size) {
                 this.$message.error("上传头像图片大小不能超过 10MB!");
             }
@@ -1348,7 +1361,7 @@ export default {
         // 上传报错
         uploadError(err, file, fileList) {
             this.$message({
-                message: "上传出错，请重试！",
+                message: "上传出错，请重试",
                 type: "error",
                 center: true
             });
@@ -1356,7 +1369,7 @@ export default {
         // 删除上传文件前的确认
         beforeRemove(file, fileList) {
             let type = file.name.split(".").pop();
-            let str = ["jpg", "jepg", "gif", "png", "doc", "pdf"].includes(type.toLowerCase());
+            let str = ["jpg", "jpeg", "gif", "png", "doc", "pdf"].includes(type.toLowerCase());
             const size = file.size / 1024 / 1024 < 10;
             if (!size || !str) {
                 return true;
@@ -1375,20 +1388,27 @@ export default {
         IPSure() {
             this.ipVisible = false;
         },
-        goback() {
+        goBack() {
             this.$router.go(-1);
         },
-        /* 表格禁用 */
-        selectable(row, index) {
+        dataSelectable(row, index) { // 禁止勾选已经选过的数据平台
             let boolean = true;
-            this.dataPlatform.length && this.dataPlatform.some(e => {
+            this.dataPlatformPermissions.length && this.dataPlatformPermissions.some(e => {
                 if (e.dataOrCourseId === row.id) {
                     boolean = false;
                 }
             });
             return boolean;
+        },
+        courseSelectable(row, index) { // 禁止勾选已经选过的课程
+            let boolean = true;
+            this.coursePermissions.length && this.coursePermissions.some(e => {
+                if (e.dataOrCourseId === row.cid) {
+                    boolean = false;
+                }
+            });
+            return boolean;
         }
-
     }
 };
 </script>
diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue
index d31ccb9..2b4f7cb 100644
--- a/src/views/order/Order.vue
+++ b/src/views/order/Order.vue
@@ -12,40 +12,49 @@
                             <el-form label-width="80px">
                                 <el-col :span="5">
                                     <el-form-item label="省份">
-                                        <el-select v-model="form.provinces" clearable placeholder="请选择省份" @change="getCity()" @clear="clearprovince()">
-                                            <el-option v-for="(item,index) in provinceList" :key="index" :label="item.provinceName" :value="item.provinceId"></el-option>
+                                        <el-select v-model="form.provinces" clearable placeholder="请选择省份"
+                                                   @change="getCity()" @clear="clearprovince()">
+                                            <el-option v-for="(item,index) in provinceList" :key="index"
+                                                       :label="item.provinceName" :value="item.provinceId"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
                                     <el-form-item label="城市">
-                                        <el-select v-model="form.city" clearable placeholder="请选择城市" :disabled="form.provinces ? false : true" @change="getData()">
-                                            <el-option v-for="(item,index) in cityList" :key="index" :label="item.cityName" :value="item.cityId"></el-option>
+                                        <el-select v-model="form.city" clearable placeholder="请选择城市"
+                                                   :disabled="form.provinces ? false : true" @change="getData()">
+                                            <el-option v-for="(item,index) in cityList" :key="index"
+                                                       :label="item.cityName" :value="item.cityId"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
                                     <el-form-item label="订单类型">
-                                        <el-select v-model="form.orderType" clearable placeholder="请选择订单类型" @change="getData()">
-                                            <el-option v-for="(item,index) in orderTypeList" :key="index" :label="item.name" :value="item.value"></el-option>
+                                        <el-select v-model="form.orderType" clearable placeholder="请选择订单类型"
+                                                   @change="getData()">
+                                            <el-option v-for="(item,index) in orderTypeList" :key="index"
+                                                       :label="item.name" :value="item.value"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
                                     <el-form-item label="订单状态">
-                                        <el-select v-model="form.orderStatus" clearable placeholder="请选择订单状态" @change="getData()">
-                                            <el-option v-for="(item,index) in orderStatusList" :key="index" :label="item.name" :value="item.value"></el-option>
+                                        <el-select v-model="form.orderStatus" clearable placeholder="请选择订单状态"
+                                                   @change="getData()">
+                                            <el-option v-for="(item,index) in orderStatusList" :key="index"
+                                                       :label="item.name" :value="item.value"></el-option>
                                         </el-select>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
                                     <el-form-item>
-                                        <el-input placeholder="请输入订单号/客户名称/订单名称" prefix-icon="el-icon-search" v-model="keyword" @keyup.enter.native="onSearch" clearable></el-input>
+                                        <el-input placeholder="请输入订单号/客户名称/订单名称" prefix-icon="el-icon-search"
+                                                  v-model="keyword" @keyup.enter.native="onSearch" clearable></el-input>
                                     </el-form-item>
                                 </el-col>
                             </el-form>
                         </div>
-                    </div>  
+                    </div>
                 </el-card>
             </el-col>
 
@@ -57,12 +66,15 @@
                             <span>订单列表</span>
                         </div>
                         <div>
-                            <el-button type="primary" size="small" round class="mag" @click="addOrder()">新建订单</el-button>
+                            <el-button type="primary" size="small" round class="mag" @click="addOrder()">新建订单
+                            </el-button>
                             <el-button type="primary" size="small" round @click="delAllSelection">批量删除</el-button>
                         </div>
                     </div>
-                    <el-table :data="orderData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-                        <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
+                    <el-table :data="orderData" class="table" stripe header-align="center"
+                              @selection-change="handleSelectionChange" :row-key="getRowKeys">
+                        <el-table-column type="selection" width="55" align="center"
+                                         :reserve-selection="true"></el-table-column>
                         <el-table-column type="index" width="100" label="序号" align="center">
                         </el-table-column>
                         <el-table-column prop="orderNumber" label="订单编号" align="center">
@@ -83,15 +95,20 @@
                         </el-table-column>
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
-                                <el-button type="text" v-if="scope.row.isDel!==1" @click="handle('edit',scope.row)">{{scope.row.orderStatus==='已完成'?'修改':'处理'}}</el-button>
+                                <el-button type="text" v-if="scope.row.isDel!==1" @click="handle('edit',scope.row)">
+                                    {{ scope.row.orderStatus === "已完成" ? "修改" : "处理" }}
+                                </el-button>
                                 <el-button type="text" @click="handle('watch',scope.row)">查看</el-button>
                                 <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
-                                <el-button type="text" v-if="scope.row.orderStatus==='已完成'&&scope.row.isDel!==1" @click="handle('renew',scope.row)">续费</el-button>
+                                <el-button type="text" v-if="scope.row.orderStatus==='已完成'&&scope.row.isDel!==1"
+                                           @click="handle('renew',scope.row)">续费
+                                </el-button>
                             </template>
                         </el-table-column>
                     </el-table>
                     <div class="pagination">
-                        <el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="pageNo" :total="totals">
+                        <el-pagination background layout="total, prev, pager, next"
+                                       @current-change="handleCurrentChange" :current-page="pageNo" :total="totals">
                         </el-pagination>
                     </div>
                 </el-card>
@@ -105,170 +122,176 @@ export default {
     data() {
         return {
             form: {
-                provinces: '',
-                city: '',
-                orderType: '',
-                orderStatus: ''
+                provinces: "",
+                city: "",
+                orderType: "",
+                orderStatus: ""
             },
-            keyword: '',
-            orderData:[],
+            keyword: "",
+            orderData: [],
             multipleSelection: [],
             provinceList: this.$store.state.provinceList,
             cityList: [],
             orderTypeList: [{
-                name: '正式',
+                name: "正式",
                 value: 1
             },
-            {
-                name: '试用',
-                value: 2
-            }],
+                {
+                    name: "试用",
+                    value: 2
+                }],
             orderStatusList: [{
-                name: '待发货',
+                name: "待发货",
                 value: 0
             },
-            {
-                name: '已完成',
-                value: 1
-            },
-            {
-                name: '已取消',
-                value: 2
-            }],
+                {
+                    name: "已完成",
+                    value: 1
+                },
+                {
+                    name: "已取消",
+                    value: 2
+                }],
             pageNo: 1,
             pageSize: 10,
             totals: 1,
-            setTime:'',
+            setTime: ""
         };
     },
     watch: {
         keyword: function(val) {
-            clearTimeout(this.setTime)
-            this.setTime = setTimeout(()=>{
-                this.onSearch()
-            },500)
-        },
+            clearTimeout(this.setTime);
+            this.setTime = setTimeout(() => {
+                this.onSearch();
+            }, 500);
+        }
     },
     created() {
-        this.getData()
+        this.getData();
     },
     methods: {
-        test(val){
-            if(val.length>5){
-                val = 5
+        test(val) {
+            if (val.length > 5) {
+                val = 5;
             }
-            
+
         },
         getData() {
             let data = {
                 cityId: this.form.city,
-                customerName:this.keyword,
+                customerName: this.keyword,
                 orderStatus: this.form.orderStatus,
                 orderType: this.form.orderType,
                 pageNo: this.pageNo,
                 pageSize: this.pageSize,
-                provinceId: this.form.provinces,
-            }
-            this.$post(this.api.orderList,data).then(res => {
+                provinceId: this.form.provinces
+            };
+            this.$post(this.api.orderList, data).then(res => {
                 res.orderPage.orders.forEach(e => {
-                    e.orderType = this.orderTypeFn(e.orderType)
-                    e.orderStatus = this.orderStatusFn(e.orderStatus)
-                    e.orderNature = this.orderNatureFn(e.orderNature)
-                })
-                this.orderData = res.orderPage.orders
-                this.totals =res.orderPage.total
-            }).catch(res => {});
+                    e.orderType = this.orderTypeFn(e.orderType);
+                    e.orderStatus = this.orderStatusFn(e.orderStatus);
+                    e.orderNature = this.orderNatureFn(e.orderNature);
+                });
+                this.orderData = res.orderPage.orders;
+                this.totals = res.orderPage.total;
+            }).catch(res => {
+            });
         },
         // 清除省份
-        clearprovince(){
-            this.form.city = ''
+        clearprovince() {
+            this.form.city = "";
         },
         // 获取城市
-        getCity(){
-            this.clearprovince()
-            this.getCityData()
-            this.pageNo = 1
-            this.getData()
+        getCity() {
+            this.clearprovince();
+            this.getCityData();
+            this.pageNo = 1;
+            this.getData();
         },
-        getCityData(){
+        getCityData() {
             let data = {
                 provinceId: this.form.provinces
-            }
-            this.$get(this.api.queryCity,data).then(res => {
-                this.cityList = res.list
-            }).catch(res => {});
+            };
+            this.$get(this.api.queryCity, data).then(res => {
+                this.cityList = res.list;
+            }).catch(res => {
+            });
         },
-        addOrder(){
-            this.$store.commit("systemData", { order_id : ''});
-            this.$router.push('/addorder');
+        addOrder() {
+            this.$store.commit("systemData", { order_id: "" });
+            this.$router.push("/addorder");
         },
-        handle(val,row){
-            this.$router.push('/addorder?'+val+'='+row.orderId);
+        handle(val, row) {
+            this.$router.push("/addorder?" + val + "=" + row.orderId);
         },
         // 删除订单
         handleDelete(row) {
-            this.$confirm('确定要删除吗？', '提示', {
-                type: 'warning'
-            })
-            .then(() => {
-                var arr = []
-                arr.push(row.orderId)
-                this.$post(this.api.orderDelete,{ids:arr}).then(res => {
-                    this.$message.success('删除成功');
-                    this.getData()
-                }).catch(res => {});
+            this.$confirm("确定要删除吗？", "提示", {
+                type: "warning"
             })
-            .catch(() => {});
+                .then(() => {
+                    var arr = [];
+                    arr.push(row.orderId);
+                    this.$post(this.api.orderDelete, { ids: arr }).then(res => {
+                        this.$message.success("删除成功");
+                        this.getData();
+                    }).catch(res => {
+                    });
+                })
+                .catch(() => {
+                });
         },
         // 续签
-        handleRenew(row){
+        handleRenew(row) {
 
         },
         getRowKeys(row) {
             return row.orderId;
         },
         handleSelectionChange(val) {
-            if(val.length>0){
-                this.multipleSelection = val.map(e=>e.orderId);
-            }else{
-                this.multipleSelection = []
+            if (val.length > 0) {
+                this.multipleSelection = val.map(e => e.orderId);
+            } else {
+                this.multipleSelection = [];
             }
         },
         delAllSelection() {
-            if(this.multipleSelection.length != ''){
+            if (this.multipleSelection.length != "") {
                 // 批量删除
-                this.$confirm('确定要删除吗？', '提示', {
-                    type: 'warning'
+                this.$confirm("确定要删除吗？", "提示", {
+                    type: "warning"
                 })
-                .then(() => {
-                    this.$post(this.api.orderDelete,{ids:this.multipleSelection}).then(res => {
-                        this.multipleSelection = [];
-                        this.$message.success('删除成功');
-                        this.getData()
-                    }).catch(err => {});
-                }).catch(err => {});
-            }else{
-                this.$message.error('请先选择订单 ！');
+                    .then(() => {
+                        this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => {
+                            this.multipleSelection = [];
+                            this.$message.success("删除成功");
+                            this.getData();
+                        }).catch(err => {
+                        });
+                    }).catch(err => {
+                });
+            } else {
+                this.$message.error("请先选择订单 ！");
             }
         },
-        onSearch(){
-            this.pageNo = 1
-            this.getData()
+        onSearch() {
+            this.pageNo = 1;
+            this.getData();
         },
         handleCurrentChange(val) {
             this.pageNo = val;
             this.getData();
         },
         // 选择客户触发
-        gotoClient(){
-            this.$router.push('')
+        gotoClient() {
+            this.$router.push("");
         }
     }
 };
 </script>
 
 <style scoped>
-.mag{
+.mag {
     margin-right: 20px;
 }
 </style>
diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue
index f1a434d..0c9f0b3 100644
--- a/src/views/serve/Configure.vue
+++ b/src/views/serve/Configure.vue
@@ -188,6 +188,7 @@ export default {
             this.$router.push(`/projectList/?systemId=${row.systemId}&show=1`)
         },
         getIntoJudgement(row) {
+            // console.log(`${Setting.jumpPath}#/?systemId=${row.systemId}&token=${this.token}&referrer=${btoa(location.href)}`);
             location.href = `${Setting.jumpPath}#/?systemId=${row.systemId}&token=${this.token}&referrer=${btoa(location.href)}`;
         },
         setCookie(name, value) {