diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index 58e78a8..9cbe7d2 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -1,912 +1,1085 @@
 <template>
-    <div>
-        <el-row :gutter="20">
-            <el-col :span="24">
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-between">
-                        <div class="per_title" v-preventReClick @click="goback()">
-                            <i class="el-icon-arrow-left"></i>
-                            <span class="per_back">返回</span>
-                            <span class="per_school" v-text="form.cid ? '编辑课程' : '新建课程'"></span>
-                        </div>
-                        <el-button type="primary" round class="mag" v-preventReClick
-                                   @click="saveAdd">确定
-                        </el-button>
-                    </div>
-                </el-card>
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-between">
+            <div class="per_title"
+                 v-preventReClick
+                 @click="goback()">
+              <i class="el-icon-arrow-left"></i>
+              <span class="per_back">返回</span>
+              <span class="per_school"
+                    v-text="form.cid ? '编辑课程' : '新建课程'"></span>
+            </div>
+            <el-button type="primary"
+                       round
+                       class="mag"
+                       v-preventReClick
+                       @click="saveAdd">确定
+            </el-button>
+          </div>
+        </el-card>
+
+        <el-card shadow="hover"
+                 class="mgb20 ">
+          <div class="flex-center mgb20">
+            <p class="addhr_tag"></p>
+            <span>课程信息</span>
+          </div>
+          <div class="border-b-dashed"></div>
 
-                <el-card shadow="hover" class="mgb20 ">
-                    <div class="flex-center mgb20">
-                        <p class="addhr_tag"></p>
-                        <span>课程信息</span>
-                    </div>
-                    <div class="border-b-dashed"></div>
+          <div>
+            <el-form :model="form"
+                     :rules="rules"
+                     ref="form"
+                     label-width="100px">
+              <el-col :span="6"
+                      :offset="5">
+                <el-form-item label="课程名称"
+                              prop="curriculumName">
+                  <el-input placeholder="请输入课程名称"
+                            v-model.trim="form.curriculumName"></el-input>
+                </el-form-item>
 
-                    <div>
-                        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-                            <el-col :span="6" :offset="5">
-                                <el-form-item label="课程名称" prop="curriculumName">
-                                    <el-input placeholder="请输入课程名称" v-model.trim="form.curriculumName"></el-input>
-                                </el-form-item>
+                <el-form-item label="学科类别"
+                              prop="categoryId">
+                  <el-select v-model="form.categoryId"
+                             clearable
+                             placeholder="请选择学科类别"
+                             @change="getProfessionalClass()"
+                             @clear="clearsubjectType()">
+                    <el-option v-for="(item,index) in subjectList"
+                               :key="index"
+                               :label="item.disciplineName"
+                               :value="item.disciplineId"></el-option>
+                  </el-select>
+                </el-form-item>
 
-                                <el-form-item label="学科类别" prop="categoryId">
-                                    <el-select v-model="form.categoryId" clearable placeholder="请选择学科类别"
-                                               @change="getProfessionalClass()" @clear="clearsubjectType()">
-                                        <el-option v-for="(item,index) in subjectList" :key="index"
-                                                   :label="item.disciplineName" :value="item.disciplineId"></el-option>
-                                    </el-select>
-                                </el-form-item>
+                <el-form-item label="专业"
+                              prop="professionalId">
+                  <el-select v-model="form.professionalId"
+                             clearable
+                             placeholder="请选择专业"
+                             :disabled="form.professionalCategoryId ? false : true">
+                    <el-option v-for="(item,index) in ProfessionalList"
+                               :key="index"
+                               :label="item.professionalName"
+                               :value="item.professionalId"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="供应厂商"
+                              prop="supplier">
+                  <el-select v-model="form.supplier"
+                             clearable
+                             placeholder="请选择供应厂商"
+                             multiple>
+                    <el-option v-for="(item, i) in suppliers"
+                               :key="i"
+                               :label="item.supplierName"
+                               :value="item.supplierId"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
-                                <el-form-item label="专业" prop="professionalId">
-                                    <el-select v-model="form.professionalId" clearable placeholder="请选择专业"
-                                               :disabled="form.professionalCategoryId ? false : true">
-                                        <el-option v-for="(item,index) in ProfessionalList" :key="index"
-                                                   :label="item.professionalName"
-                                                   :value="item.professionalId"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="供应厂商" prop="supplier">
-                                  <el-select v-model="form.supplier" clearable placeholder="请选择供应厂商" multiple>
-                                      <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
-                                  </el-select>
-                                </el-form-item>
-                            </el-col>
+              <el-col :span="6"
+                      :offset="2">
+                <el-form-item label="课程类别">
+                  <el-select v-model="form.curriculumType"
+                             clearable
+                             placeholder="请选择课程类型">
+                    <el-option label="理论课程"
+                               :value="0"></el-option>
+                    <el-option label="实训课程"
+                               :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="专业类"
+                              prop="professionalCategoryId">
+                  <el-select v-model="form.professionalCategoryId"
+                             clearable
+                             placeholder="请选择专业类"
+                             :disabled="form.categoryId ? false : true"
+                             @change="getProfessional()"
+                             @clear="clearProfessionalClass()">
+                    <el-option v-for="(item,index) in ProfessionalClassList"
+                               :key="index"
+                               :label="item.professionalClassName"
+                               :value="item.professionalClassId"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="预计课时"
+                              prop="expectedCourse">
+                  <el-select v-model="form.expectedCourse"
+                             clearable
+                             placeholder="请选择预计课时">
+                    <el-option label="32课时"
+                               value="32课时"></el-option>
+                    <el-option label="64课时"
+                               value="64课时"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
-                            <el-col :span="6" :offset="2">
-                                <el-form-item label="课程类别">
-                                    <el-select v-model="form.curriculumType" clearable placeholder="请选择课程类型">
-                                        <el-option label="理论课程" :value="0"></el-option>
-                                        <el-option label="实训课程" :value="1"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="专业类" prop="professionalCategoryId">
-                                    <el-select v-model="form.professionalCategoryId" clearable placeholder="请选择专业类"
-                                               :disabled="form.categoryId ? false : true" @change="getProfessional()"
-                                               @clear="clearProfessionalClass()">
-                                        <el-option v-for="(item,index) in ProfessionalClassList" :key="index"
-                                                   :label="item.professionalClassName"
-                                                   :value="item.professionalClassId"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="预计课时" prop="expectedCourse">
-                                    <el-select v-model="form.expectedCourse" clearable placeholder="请选择预计课时">
-                                        <el-option label="32课时" value="32课时"></el-option>
-                                        <el-option label="64课时" value="64课时"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
+              <el-col :span="14"
+                      :offset="5">
+                <el-form-item label="课程简介"
+                              prop="briefIntroduction">
+                  <el-input type="textarea"
+                            :autosize="{ minRows: 4 }"
+                            placeholder="请输入课程简介"
+                            v-model.trim="form.briefIntroduction"></el-input>
+                </el-form-item>
+                <el-form-item label="教学目标"
+                              prop="teachingObjectives">
+                  <el-input type="textarea"
+                            :autosize="{ minRows: 4 }"
+                            placeholder="请输入教学目标"
+                            v-model.trim="form.teachingObjectives"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </div>
+        </el-card>
+
+        <!-- 练习配置 -->
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="mgb20 flex-between">
+            <div class="flex-center ">
+              <p class="addhr_tag"></p>
+              <span>练习配置</span>
+            </div>
+            <div>
+              <el-button @click="handleBatchDelete(0)">批量移除</el-button>
+              <el-button @click="handleConfig(0)"
+                         icon="el-icon-plus"
+                         circle></el-button>
+            </div>
+          </div>
+          <div class="border-b-dashed"></div>
+          <div>
+            <el-table :data="practiceData"
+                      class="table"
+                      stripe
+                      header-align="center"
+                      max-height="400"
+                      @selection-change="handleSelectionPractice">
+              <el-table-column type="selection"
+                               width="55"
+                               align="center"></el-table-column>
+              <el-table-column type="index"
+                               width="100"
+                               label="序号"
+                               align="center"></el-table-column>
+              <el-table-column prop="projectName"
+                               label="项目名称"
+                               align="center"></el-table-column>
+              <el-table-column prop="remark"
+                               label="备注名称"
+                               align="center"></el-table-column>
+              <el-table-column prop="applicationName"
+                               label="系统名称"
+                               align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                </template>
+              </el-table-column>
+              <el-table-column label="排序"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-input v-model.trim="scope.row.sort"
+                            @input="practiceSortChange(scope.row, scope.$index)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="展示控制"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-switch v-model="scope.row.isShow"
+                             :active-value="0"
+                             :inactive-value="1"
+                             :disabled="scope.row.disabled">
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-button :disabled="scope.row.disabled"
+                             @click.native.prevent="handleDelete(scope.$index, practiceData)">移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-card>
 
-                            <el-col :span="14" :offset="5">
-                                <el-form-item label="课程简介" prop="briefIntroduction">
-                                    <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入课程简介"
-                                              v-model.trim="form.briefIntroduction"></el-input>
-                                </el-form-item>
-                                <el-form-item label="教学目标" prop="teachingObjectives">
-                                    <el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入教学目标"
-                                              v-model.trim="form.teachingObjectives"></el-input>
-                                </el-form-item>
-                            </el-col>
-                        </el-form>
-                    </div>
-                </el-card>
+        <!-- 考核配置 -->
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="mgb20 flex-between">
+            <div class="flex-center ">
+              <p class="addhr_tag"></p>
+              <span>考核配置</span>
+            </div>
+            <div>
+              <el-button @click="handleBatchDelete(1)">批量移除</el-button>
+              <el-button @click="handleConfig(1)"
+                         icon="el-icon-plus"
+                         circle></el-button>
+            </div>
+          </div>
+          <div class="border-b-dashed"></div>
+          <!-- 实训配置 -->
+          <div>
+            <el-table :data="assessmentData"
+                      class="table"
+                      stripe
+                      header-align="center"
+                      max-height="400"
+                      @selection-change="handleSelectionAssessment">
+              <el-table-column type="selection"
+                               width="55"
+                               align="center"></el-table-column>
+              <el-table-column type="index"
+                               width="100"
+                               label="序号"
+                               align="center"></el-table-column>
+              <el-table-column prop="projectName"
+                               label="项目名称"
+                               align="center"></el-table-column>
+              <el-table-column prop="remark"
+                               label="备注名称"
+                               align="center"></el-table-column>
+              <el-table-column prop="applicationName"
+                               label="系统名称"
+                               align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                </template>
+              </el-table-column>
+              <el-table-column label="排序"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-input v-model.trim="scope.row.sort"
+                            @input="assessmentSortChange(scope.row, scope.$index)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="展示控制"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-switch v-model="scope.row.isShow"
+                             :active-value="0"
+                             :inactive-value="1"
+                             :disabled="scope.row.disabled">
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-button :disabled="scope.row.disabled"
+                             @click.native.prevent="handleDelete(scope.$index, assessmentData)">移除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-card>
 
-                <!-- 练习配置 -->
-                <el-card shadow="hover" class="mgb20">
-                    <div class="mgb20 flex-between">
-                        <div class="flex-center ">
-                            <p class="addhr_tag"></p>
-                            <span>练习配置</span>
-                        </div>
-                        <div>
-                            <el-button @click="handleBatchDelete(0)">批量移除</el-button>
-                            <el-button @click="handleConfig(0)" icon="el-icon-plus" circle></el-button>
-                        </div>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <div>
-                        <el-table :data="practiceData" class="table" stripe header-align="center" max-height="400"
-                                  @selection-change="handleSelectionPractice">
-                            <el-table-column type="selection" width="55" align="center"></el-table-column>
-                            <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-                            <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                            <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-                            <el-table-column prop="applicationName" label="系统名称" align="center">
-                              <template slot-scope="scope">
-                                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="排序" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-input v-model.trim="scope.row.sort"
-                                              @input="practiceSortChange(scope.row, scope.$index)"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="展示控制" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-switch
-                                        v-model="scope.row.isShow"
-                                        :active-value="0"
-                                        :inactive-value="1"
-                                        :disabled="scope.row.disabled">
-                                    </el-switch>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-button :disabled="scope.row.disabled" @click.native.prevent="handleDelete(scope.$index, practiceData)">移除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-card>
+        <!-- 竞赛配置 -->
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="mgb20 flex-between">
+            <div class="flex-center ">
+              <p class="addhr_tag"></p>
+              <span>竞赛配置</span>
+            </div>
+            <div>
+              <el-button @click="handleBatchDelete(2)">批量移除</el-button>
+              <el-button @click="handleConfig(2)"
+                         icon="el-icon-plus"
+                         circle></el-button>
+            </div>
+          </div>
+          <div class="border-b-dashed"></div>
+          <!-- 实训配置 -->
+          <div>
+            <el-table :data="matches"
+                      class="table"
+                      stripe
+                      header-align="center"
+                      max-height="400"
+                      @selection-change="handleSelectionMatch">
+              <el-table-column type="selection"
+                               width="55"
+                               align="center"></el-table-column>
+              <el-table-column type="index"
+                               width="100"
+                               label="序号"
+                               align="center"></el-table-column>
+              <el-table-column prop="projectName"
+                               label="项目名称"
+                               align="center"></el-table-column>
+              <el-table-column prop="applicationName"
+                               label="系统名称"
+                               align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                </template>
+              </el-table-column>
+              <el-table-column label="排序"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-input v-model.trim="scope.row.sort"
+                            @input="assessmentSortChange(scope.row, scope.$index)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="展示控制"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-switch v-model="scope.row.isShow"
+                             :active-value="0"
+                             :inactive-value="1"
+                             :disabled="scope.row.disabled">
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作"
+                               align="center"
+                               width="100">
+                <template slot-scope="scope">
+                  <el-button :disabled="scope.row.disabled"
+                             @click.native.prevent="handleDelete(scope.$index, matches)">移除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-card>
 
-                <!-- 考核配置 -->
-                <el-card shadow="hover" class="mgb20">
-                    <div class="mgb20 flex-between">
-                        <div class="flex-center ">
-                            <p class="addhr_tag"></p>
-                            <span>考核配置</span>
-                        </div>
-                        <div>
-                            <el-button @click="handleBatchDelete(1)">批量移除</el-button>
-                            <el-button @click="handleConfig(1)" icon="el-icon-plus" circle></el-button>
-                        </div>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <!-- 实训配置 -->
-                    <div>
-                        <el-table :data="assessmentData" class="table" stripe header-align="center" max-height="400"
-                                  @selection-change="handleSelectionAssessment">
-                            <el-table-column type="selection" width="55" align="center"></el-table-column>
-                            <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-                            <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                            <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-                            <el-table-column prop="applicationName" label="系统名称" align="center">
-                              <template slot-scope="scope">
-                                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="排序" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-input v-model.trim="scope.row.sort"
-                                              @input="assessmentSortChange(scope.row, scope.$index)"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="展示控制" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-switch
-                                        v-model="scope.row.isShow"
-                                        :active-value="0"
-                                        :inactive-value="1"
-                                        :disabled="scope.row.disabled">
-                                    </el-switch>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-button :disabled="scope.row.disabled" @click.native.prevent="handleDelete(scope.$index, assessmentData)">移除</el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-card>
-                
-                <!-- 竞赛配置 -->
-                <el-card shadow="hover" class="mgb20">
-                    <div class="mgb20 flex-between">
-                        <div class="flex-center ">
-                            <p class="addhr_tag"></p>
-                            <span>竞赛配置</span>
-                        </div>
-                        <div>
-                            <el-button @click="handleBatchDelete(2)">批量移除</el-button>
-                            <el-button @click="handleConfig(2)" icon="el-icon-plus" circle></el-button>
-                        </div>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <!-- 实训配置 -->
-                    <div>
-                        <el-table :data="matches" class="table" stripe header-align="center" max-height="400"
-                                  @selection-change="handleSelectionMatch">
-                            <el-table-column type="selection" width="55" align="center"></el-table-column>
-                            <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-                            <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                            <el-table-column prop="applicationName" label="系统名称" align="center">
-                              <template slot-scope="scope">
-                                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="排序" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-input v-model.trim="scope.row.sort"
-                                              @input="assessmentSortChange(scope.row, scope.$index)"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="展示控制" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-switch
-                                        v-model="scope.row.isShow"
-                                        :active-value="0"
-                                        :inactive-value="1"
-                                        :disabled="scope.row.disabled">
-                                    </el-switch>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="100">
-                                <template slot-scope="scope">
-                                    <el-button :disabled="scope.row.disabled" @click.native.prevent="handleDelete(scope.$index, matches)">移除</el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-card>
+      </el-col>
+    </el-row>
 
-            </el-col>
-        </el-row>
+    <!-- 配置弹窗 -->
+    <el-dialog :visible.sync="configVisible"
+               width="1200px"
+               center
+               custom-class="config-dia">
+      <div class="config-wrap">
+        <div class="item system">
+          <div class="title-wrap flex-center">
+            <p class="addhr_tag"></p>
+            <span>系统列表</span>
+          </div>
+          <el-input placeholder="请输入系统名称"
+                    prefix-icon="el-icon-search"
+                    v-model.trim="systemKeyword"
+                    clearable></el-input>
 
-        <!-- 配置弹窗 -->
-        <el-dialog :visible.sync="configVisible" width="1200px" center custom-class="config-dia">
-          <div class="config-wrap">
-            <div class="item system">
-              <div class="title-wrap flex-center">
-                <p class="addhr_tag"></p>
-                <span>系统列表</span>
+          <ul class="systems">
+            <li v-for="(item, i) in systems"
+                :key="i"
+                :title="item.systemName">
+              <el-checkbox v-model="item.check"
+                           @change="val => systemChange(val, item)"></el-checkbox>
+              <div :class="['name', {active: curSystem == item.systemId}]"
+                   @click="getProject(item)">
+                <span>{{ item.systemName }}</span>
+                <i class="el-icon-arrow-right"></i>
               </div>
-              <el-input placeholder="请输入系统名称" prefix-icon="el-icon-search" v-model.trim="systemKeyword" clearable></el-input>
+            </li>
+          </ul>
+        </div>
 
-              <ul class="systems">
-                <li v-for="(item, i) in systems" :key="i" :title="item.systemName">
-                  <el-checkbox v-model="item.check" @change="val => systemChange(val, item)"></el-checkbox>
-                  <div :class="['name', {active: curSystem == item.systemId}]" @click="getProject(item)">
-                    <span>{{ item.systemName }}</span>
-                    <i class="el-icon-arrow-right"></i>
-                  </div>
-                </li>
-              </ul>
-            </div>
-            
-            <div class="item project">
-              <div class="title-wrap flex-center">
-                <p class="addhr_tag"></p>
-                <span>项目列表</span>
-              </div>
-              <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="projectKeyword" clearable></el-input>
+        <div class="item project">
+          <div class="title-wrap flex-center">
+            <p class="addhr_tag"></p>
+            <span>项目列表</span>
+          </div>
+          <el-input placeholder="请输入项目名称"
+                    prefix-icon="el-icon-search"
+                    v-model.trim="projectKeyword"
+                    clearable></el-input>
 
-              <ul class="systems">
-                <el-checkbox v-if="projects.length" v-model="checkAll" label="全选" @change="val => checkAllChange(val, projects[0].systemId)"></el-checkbox>
-                <li v-for="(item, i) in projects" :key="i" :title="item.projectName">
-                  <el-checkbox v-model="item.check" :label="item.remark ? item.remark + '(' + item.projectName + ')' : item.projectName" @change="val => projectChange(val, item)"></el-checkbox>
-                </li>
-              </ul>
-            </div>
+          <ul class="systems">
+            <el-checkbox v-if="projects.length"
+                         v-model="checkAll"
+                         label="全选"
+                         @change="val => checkAllChange(val, projects[0].systemId)"></el-checkbox>
+            <li v-for="(item, i) in projects"
+                :key="i"
+                :title="item.projectName">
+              <el-checkbox v-model="item.check"
+                           :label="item.remark ? item.remark + '(' + item.projectName + ')' : item.projectName"
+                           @change="val => projectChange(val, item)"></el-checkbox>
+            </li>
+          </ul>
+        </div>
 
-            <div class="item checked">
-              <div class="title-wrap flex-center">
-                <p class="addhr_tag"></p>
-                <span>已选择项目（{{ checkeds.length }}个）</span>
-              </div>
-              <el-input style="width: 200px;margin-bottom: 20px;" placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="checkedKeyword" clearable></el-input>
-              <el-table :data="checkeds" class="table" stripe header-align="center" max-height="470">
-                <el-table-column type="index" width="55" label="序号" align="center"></el-table-column>
-                <el-table-column prop="applicationName" label="系统名称" align="center">
-                  <template slot-scope="scope">
-                    {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="projectName" width="80" label="系统类型" align="center">
-                  <template slot-scope="scope">
-                    {{ scope.row.type ? '流程类' : '编程类' }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-                <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-                <el-table-column label="操作" align="center" width="55">
-                  <template slot-scope="scope">
-                    <i :class="['el-icon-delete rm', {disabled: scope.row.disabled}]" @click="delProject(scope.$index, scope.row)"></i>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+        <div class="item checked">
+          <div class="title-wrap flex-center">
+            <p class="addhr_tag"></p>
+            <span>已选择项目（{{ checkeds.length }}个）</span>
           </div>
-          
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="configVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
-          </span>
-        </el-dialog>
-    </div>
+          <el-input style="width: 200px;margin-bottom: 20px;"
+                    placeholder="请输入项目名称"
+                    prefix-icon="el-icon-search"
+                    v-model.trim="checkedKeyword"
+                    clearable></el-input>
+          <el-table :data="checkeds"
+                    class="table"
+                    stripe
+                    header-align="center"
+                    max-height="470">
+            <el-table-column type="index"
+                             width="55"
+                             label="序号"
+                             align="center"></el-table-column>
+            <el-table-column prop="applicationName"
+                             label="系统名称"
+                             align="center">
+              <template slot-scope="scope">
+                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectName"
+                             width="80"
+                             label="系统类型"
+                             align="center">
+              <template slot-scope="scope">
+                {{ scope.row.type ? '流程类' : '编程类' }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark"
+                             label="备注名称"
+                             align="center"></el-table-column>
+            <el-table-column prop="projectName"
+                             label="项目名称"
+                             align="center"></el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             width="55">
+              <template slot-scope="scope">
+                <i :class="['el-icon-delete rm', {disabled: scope.row.disabled}]"
+                   @click="delProject(scope.$index, scope.row)"></i>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="configVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="handleConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {
-            headers: {
-                token: sessionStorage.getItem("token")
-            },
-            isDetail: Boolean(this.$route.query.isDetail),
-            form: {
-                cid: this.$route.query.cid,
-                curriculumName: "",
-                courseType: "",
-                categoryId: "",
-                professionalCategoryId: "",
-                professionalId: "",
-                expectedCourse: "",
-                briefIntroduction: "",
-                teachingObjectives: "",
-                systemIdByAssessment: [],
-                systemIdByPractice: [],
-                supplier: '',
-            },
-            rules: {
-                curriculumName: [
-                    { required: true, message: "请输入课程名称", trigger: "blur" }
-                ],
-                categoryId: [
-                    { required: true, message: "请选择学科类别", trigger: "change" }
-                ],
-                professionalId: [
-                    { required: true, message: "请选择专业", trigger: "change" }
-                ],
-                expectedCourse: [
-                    { required: true, message: "请选择预计课时", trigger: "change" }
-                ],
-                professionalCategoryId: [
-                    { required: true, message: "请选择专业类", trigger: "change" }
-                ],
-                courseType: [
-                    { required: true, message: "请选择课程类别", trigger: "change" }
-                ],
-                briefIntroduction: [
-                    { required: true, message: "请输入课程简介", trigger: "blur" }
-                ],
-                teachingObjectives: [
-                    { required: true, message: "请输入教学目标", trigger: "blur" }
-                ]
-            },
-            subjectList: [],
-            ProfessionalClassList: [],
-            ProfessionalList: [],
+  data () {
+    return {
+      headers: {
+        token: sessionStorage.getItem("token")
+      },
+      isDetail: Boolean(this.$route.query.isDetail),
+      form: {
+        cid: this.$route.query.cid,
+        curriculumName: "",
+        courseType: "",
+        categoryId: 1,
+        professionalCategoryId: 1,
+        professionalId: 1,
+        expectedCourse: "",
+        briefIntroduction: "",
+        teachingObjectives: "",
+        systemIdByAssessment: [],
+        systemIdByPractice: [],
+        supplier: []
+      },
+      rules: {
+        curriculumName: [
+          { required: true, message: "请输入课程名称", trigger: "blur" }
+        ],
+        categoryId: [
+          { required: true, message: "请选择学科类别", trigger: "change" }
+        ],
+        professionalId: [
+          { required: true, message: "请选择专业", trigger: "change" }
+        ],
+        supplier: [
+          { required: true, message: "请选择供应厂商", trigger: "change" }
+        ],
+        expectedCourse: [
+          { required: true, message: "请选择预计课时", trigger: "change" }
+        ],
+        professionalCategoryId: [
+          { required: true, message: "请选择专业类", trigger: "change" }
+        ],
+        courseType: [
+          { required: true, message: "请选择课程类别", trigger: "change" }
+        ],
+        briefIntroduction: [
+          { required: true, message: "请输入课程简介", trigger: "blur" }
+        ],
+        teachingObjectives: [
+          { required: true, message: "请输入教学目标", trigger: "blur" }
+        ]
+      },
+      subjectList: [],
+      ProfessionalClassList: [],
+      ProfessionalList: [],
 
-            systemBelongKeys: {
-                1: "外部产品",
-                0: "内部系统"
-            },
-            systemTypeKeys: {
-                0: "编程类",
-                1: "流程类"
-            },
-            systemStatusKeys: {
-                0: "运行中",
-                1: "默认"
-            },
-            pageNo: 1,
-            pageSize: 10,
-            multipleSelection: [],
-            systemKeyword: "",
-            searchTimer: null,
-            configVisible: false,// 配置弹框
+      systemBelongKeys: {
+        1: "外部产品",
+        0: "内部系统"
+      },
+      systemTypeKeys: {
+        0: "编程类",
+        1: "流程类"
+      },
+      systemStatusKeys: {
+        0: "运行中",
+        1: "默认"
+      },
+      pageNo: 1,
+      pageSize: 10,
+      multipleSelection: [],
+      systemKeyword: "",
+      searchTimer: null,
+      configVisible: false,// 配置弹框
 
-            permissions: "", // 练习：0；考核：1
-            practiceData: [],
-            practiceTotal: 0,
-            multiplePractice: [],
+      permissions: "", // 练习：0；考核：1
+      practiceData: [],
+      practiceTotal: 0,
+      multiplePractice: [],
 
-            assessmentData: [],
-            assessmentTotal: 0,
-            multipleAssessment: [],
-            matches: [],
-            matcheTotal: 0,
-            multipleMatch: [],
-            submiting: false, // 新增编辑防抖标识
-            loadIns: null,
-            updateTime: 0,
-            systemAll: [],
-            systems: [],
-            systemsAll: [],
-            systemChecked: [],
-            curSystem: '',
-            projects: [],
-            projectAll: [],
-            projectKeyword: '',
-            checkedKeyword: '',
-            checkeds: [],
-            checkedAll: [],
-            checkAll: false,
-            suppliers: [],
-            mulSystem: this.$store.state.btns.includes('/curriculum:支持多系统组课'), // 是否支持多系统组课
-        };
-    },
-    watch: {
-        // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-        form: {
-          handler(){
-            this.updateTime++
-          },
-          deep:true
-        },
-        systemKeyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.getConfig();
-            }, 500);
-        },
-        projectKeyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.filterProject();
-            }, 500);
-        },
-        checkedKeyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.filterChecked();
-            }, 500);
-        }
+      assessmentData: [],
+      assessmentTotal: 0,
+      multipleAssessment: [],
+      matches: [],
+      matcheTotal: 0,
+      multipleMatch: [],
+      submiting: false, // 新增编辑防抖标识
+      loadIns: null,
+      updateTime: 0,
+      systemAll: [],
+      systems: [],
+      systemsAll: [],
+      systemChecked: [],
+      curSystem: '',
+      projects: [],
+      projectAll: [],
+      projectKeyword: '',
+      checkedKeyword: '',
+      checkeds: [],
+      checkedAll: [],
+      checkAll: false,
+      suppliers: [],
+      mulSystem: this.$store.state.btns.includes('/curriculum:支持多系统组课'), // 是否支持多系统组课
+    };
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
+      },
+      deep: true
     },
-    created() {
-        
+    systemKeyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.getConfig();
+      }, 500);
     },
-    mounted() {
-      this.getSubject()
-      this.getConfig()
-      this.getSystem()
-      this.getSupplier()
-      this.form.cid && this.getInfoData()
+    projectKeyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.filterProject();
+      }, 500);
     },
-    methods: {
-        getInfoData() {
-            this.$post(`${this.api.curriculumDetail}?cid=${this.form.cid}`).then(({ data }) => {
-                if (data.supplier) data.supplier = data.supplier.split(',').map(e => +e)
-                if (data.categoryId) {
-                    this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => {
-                        this.ProfessionalClassList = res.list;
-                    }).catch(res => {});
-                }
-                if (data.professionalCategoryId) {
-                    this.$get(this.api.courseProfessional, { professionalClassId: data.professionalCategoryId }).then(res => {
-                        this.ProfessionalList = res.list;
-                    }).catch(res => {});
-                }
-                this.$nextTick(() => {
-                    this.form = data;
-                    const pList = data.practiceConfig
-                    const { systemsAll } = this
-                    pList.map(e => {
-                      if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
-                    })
-                    this.practiceData = pList
+    checkedKeyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.filterChecked();
+      }, 500);
+    }
+  },
+  created () {
 
-                    const aList = data.assessmentConfig
-                    aList.map(e => {
-                      if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
-                    })
-                    this.assessmentData = aList
+  },
+  mounted () {
+    this.getSubject()
+    this.getConfig()
+    this.getSystem()
+    this.getSupplier()
+    this.form.cid && this.getInfoData()
+  },
+  methods: {
+    getInfoData () {
+      this.$post(`${this.api.curriculumDetail}?cid=${this.form.cid}`).then(({ data }) => {
+        if (data.supplier) data.supplier = data.supplier.split(',').map(e => +e)
+        if (data.categoryId) {
+          this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => {
+            this.ProfessionalClassList = res.list;
+          }).catch(res => { });
+        }
+        if (data.professionalCategoryId) {
+          this.$get(this.api.courseProfessional, { professionalClassId: data.professionalCategoryId }).then(res => {
+            this.ProfessionalList = res.list;
+          }).catch(res => { });
+        }
+        this.$nextTick(() => {
+          this.form = data;
+          const pList = data.practiceConfig
+          const { systemsAll } = this
+          pList.map(e => {
+            if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
+          })
+          this.practiceData = pList
 
-                    const cList = data.competitionConfig
-                    cList.map(e => {
-                      if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
-                    })
-                    this.matches = cList
-                });
-            }).catch(err => {
-            });
-        },
-        // 获取供应厂商
-        getSupplier() {
-          const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
-          this.$get(this.api.getSupplierListByRole, {
-            permissionId: sid.permissionId
-          }).then(res => {
-            this.suppliers = res.supplierList
-          }).catch(res => {})
-        },
-        // 获取系统
-        getSystem() {
-          const checked = this[!this.permissions ?
-            'practiceData' :
-            this.permissions == 1 ?
-              'assessmentData' :
-              'matches']
-          const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
-          this.$post(this.api.queryServiceConfig, {
-            systemName: '',
-            pageNum: 1,
-            pageSize: 1000,
-            supplierId: sid ? sid.supplierId : ''
-          }).then(({ serviceList }) => {
-            this.systemsAll = serviceList.records
-          }).catch(err => {})
-        },
-        getSubject() { // 获取学科类别
-            this.$get(this.api.courseDiscipline).then(res => {
-                this.subjectList = res.list;
-            }).catch(err => {
-            });
-        },
-        clearsubjectType() { // 清空学科类别
-            this.form.professionalCategoryId = "",
-            this.form.professionalId = "";
-        },
-        getProfessionalClass() { // 获取专业类
-            this.clearsubjectType();
-            this.getProfessionalClassData();
-        },
-        getProfessionalClassData() {
-            let data = {
-                disciplineId: this.form.categoryId
-            };
-            this.$get(this.api.courseProfessionalClass, data).then(res => {
-                this.ProfessionalClassList = res.list;
-            }).catch(err => {
-            });
-        },
-        clearProfessionalClass() { // 清空专业类
-            this.form.professionalId = "";
-        },
-        getProfessional() { // 获取专业
-            this.clearProfessionalClass();
-            this.getProfessionalData();
-        },
-        getProfessionalData() {
-            let data = {
-                professionalClassId: this.form.professionalCategoryId
-            };
-            this.$get(this.api.courseProfessional, data).then(res => {
-                this.ProfessionalList = res.list;
-            }).catch(err => {
-            });
-        },
-        // 练习考核弹框
-        handleConfig(type) {
-          this.systemKeyword = ''
-          this.projectKeyword = ''
-          this.checkedKeyword = ''
-          this.permissions = type;
-          this.configVisible = true;
-          this.pageNo = 1;
-          this.getConfig();
-          this.checkeds = JSON.parse(JSON.stringify(type == 1 ? this.assessmentData : type == 2 ? this.matches : this.practiceData))
-        },
-        // 获取系统
-        getConfig() {
-          const checked = this[!this.permissions ?
-            'practiceData' :
-            this.permissions == 1 ?
-              'assessmentData' :
-              'matches']
-          const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
-          this.$post(this.api.queryServiceConfig, {
-            systemName: this.systemKeyword,
-            pageNum: 1,
-            pageSize: 1000,
-            supplierId: sid ? sid.supplierId : ''
-          }).then(res => {
-            const list = res.serviceList.records
-            this.systemAll = JSON.parse(JSON.stringify(list)) // 全部系统，另外保存
-            const result = []
-            list.map(e => {
-              // 如果选中的项目里有该系统的项目，则隐藏
-              // if (!checked.find(n => n.systemId == e.systemId)) {
-                // e.check = !!checked.find(n => n.systemId == e.systemId)
-                e.check = false
-                result.push(e)
-              // }
-            })
-            this.systems = result
-            this.checkAll = !!checked.find(n => n.systemId == result[0].systemId) // 因为默认显示第一个系统的项目，所以如果系统默认选中，则全选也勾选上
-            result.length && this.getProject(result[0])
-          }).catch(err => {})
-        },
-        // 获取项目列表
-        getProject(item) {
-          const checked = this.checkeds
-          this.curSystem = item.systemId
-          this.$get(`${this.api.getInternalProjectBySystemId}?permissions=${this.permissions}&systemId=${item.systemId}`).then(res => {
-            this.projectAll = JSON.parse(JSON.stringify(res)) // 全部项目，另外保存
-            const result = []
-            res.map(e => {
-              // 如果选择了该项目，则禁用并选中
-              const include = checked.some(n => n.projectId == e.projectId && n.systemId == e.systemId)
-              e.check = include
-              result.push(e)
-            })
-            this.checkAll = !result.filter(e => !e.check).length
-            this.projects = result
-          }).catch(err => {})
-        },
-        // 项目模糊查询
-        filterProject() {
-          const val = this.projectKeyword
-          this.projects = this.projectAll.filter(e => e.projectName.includes(val))
-        },
-        // 系统选择回调
-        systemChange(val, item) {
-          // 项目列表选中状态同步
-          const { projects, checkeds } = this
-          if (projects.length && projects[0].systemId == item.systemId) {
-            projects.map(e => {
-              e.check = val
-            })
+          const aList = data.assessmentConfig
+          aList.map(e => {
+            if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
+          })
+          this.assessmentData = aList
+
+          const cList = data.competitionConfig
+          cList.map(e => {
+            if (!systemsAll.find(n => n.systemId == e.systemId)) e.disabled = true
+          })
+          this.matches = cList
+        });
+      }).catch(err => {
+      });
+    },
+    // 获取供应厂商
+    getSupplier () {
+      const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
+      this.$get(this.api.getSupplierListByRole, {
+        permissionId: sid.permissionId
+      }).then(res => {
+        this.suppliers = res.supplierList
+      }).catch(res => { })
+    },
+    // 获取系统
+    getSystem () {
+      const checked = this[!this.permissions ?
+        'practiceData' :
+        this.permissions == 1 ?
+          'assessmentData' :
+          'matches']
+      const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
+      this.$post(this.api.queryServiceConfig, {
+        systemName: '',
+        pageNum: 1,
+        pageSize: 1000,
+        supplierId: sid ? sid.supplierId : ''
+      }).then(({ serviceList }) => {
+        this.systemsAll = serviceList.records
+      }).catch(err => { })
+    },
+    getSubject () { // 获取学科类别
+      this.$get(this.api.courseDiscipline).then(res => {
+        this.subjectList = res.list
+        this.form.categoryId === 1 && this.getProfessionalClass()
+      }).catch(err => {
+      });
+    },
+    clearsubjectType () { // 清空学科类别
+      this.form.professionalCategoryId = this.form.categoryId === 1 ? 1 : ''
+      this.form.professionalId = this.form.categoryId === 1 ? 1 : ''
+    },
+    getProfessionalClass () { // 获取专业类
+      this.clearsubjectType();
+      this.getProfessionalClassData();
+    },
+    getProfessionalClassData () {
+      let data = {
+        disciplineId: this.form.categoryId
+      };
+      this.$get(this.api.courseProfessionalClass, data).then(res => {
+        this.ProfessionalClassList = res.list;
+        this.form.professionalCategoryId === 1 && this.getProfessional()
+      }).catch(err => {
+      });
+    },
+    clearProfessionalClass () { // 清空专业类
+      this.form.professionalId = this.form.professionalCategoryId === 1 ? 1 : ''
+    },
+    getProfessional () { // 获取专业
+      this.clearProfessionalClass();
+      this.getProfessionalData();
+    },
+    getProfessionalData () {
+      let data = {
+        professionalClassId: this.form.professionalCategoryId
+      };
+      this.$get(this.api.courseProfessional, data).then(res => {
+        this.ProfessionalList = res.list;
+      }).catch(err => {
+      });
+    },
+    // 练习考核弹框
+    handleConfig (type) {
+      this.systemKeyword = ''
+      this.projectKeyword = ''
+      this.checkedKeyword = ''
+      this.permissions = type;
+      this.configVisible = true;
+      this.pageNo = 1;
+      this.getConfig();
+      this.checkeds = JSON.parse(JSON.stringify(type == 1 ? this.assessmentData : type == 2 ? this.matches : this.practiceData))
+    },
+    // 获取系统
+    getConfig () {
+      const checked = this[!this.permissions ?
+        'practiceData' :
+        this.permissions == 1 ?
+          'assessmentData' :
+          'matches']
+      const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
+      this.$post(this.api.queryServiceConfig, {
+        systemName: this.systemKeyword,
+        pageNum: 1,
+        pageSize: 1000,
+        supplierId: sid ? sid.supplierId : ''
+      }).then(res => {
+        const list = res.serviceList.records
+        this.systemAll = JSON.parse(JSON.stringify(list)) // 全部系统，另外保存
+        const result = []
+        list.map(e => {
+          // 如果选中的项目里有该系统的项目，则隐藏
+          // if (!checked.find(n => n.systemId == e.systemId)) {
+          // e.check = !!checked.find(n => n.systemId == e.systemId)
+          e.check = false
+          result.push(e)
+          // }
+        })
+        this.systems = result
+        this.checkAll = !!checked.find(n => n.systemId == result[0].systemId) // 因为默认显示第一个系统的项目，所以如果系统默认选中，则全选也勾选上
+        result.length && this.getProject(result[0])
+      }).catch(err => { })
+    },
+    // 获取项目列表
+    getProject (item) {
+      const checked = this.checkeds
+      this.curSystem = item.systemId
+      this.$get(`${this.api.getInternalProjectBySystemId}?permissions=${this.permissions}&systemId=${item.systemId}`).then(res => {
+        this.projectAll = JSON.parse(JSON.stringify(res)) // 全部项目，另外保存
+        const result = []
+        res.map(e => {
+          // 如果选择了该项目，则禁用并选中
+          const include = checked.some(n => n.projectId == e.projectId && n.systemId == e.systemId)
+          e.check = include
+          result.push(e)
+        })
+        this.checkAll = !result.filter(e => !e.check).length
+        this.projects = result
+      }).catch(err => { })
+    },
+    // 项目模糊查询
+    filterProject () {
+      const val = this.projectKeyword
+      this.projects = this.projectAll.filter(e => e.projectName.includes(val))
+    },
+    // 系统选择回调
+    systemChange (val, item) {
+      // 项目列表选中状态同步
+      const { projects, checkeds } = this
+      if (projects.length && projects[0].systemId == item.systemId) {
+        projects.map(e => {
+          e.check = val
+        })
+      }
+      this.projectKeyword = ''
+      this.$get(`${this.api.getInternalProjectBySystemId}?permissions=${this.permissions}&systemId=${item.systemId}`).then(res => {
+        if (val) {
+          // 如果不支持多选系统，选中后全部取消选中再选中当前系统
+          if (!this.mulSystem) {
+            this.systems.map(e => e.check = false)
+            item.check = true
           }
-          this.projectKeyword = ''
-          this.$get(`${this.api.getInternalProjectBySystemId}?permissions=${this.permissions}&systemId=${item.systemId}`).then(res => {
-            if (val) {
-              // 如果不支持多选系统，选中后全部取消选中再选中当前系统
-              if (!this.mulSystem) {
-                this.systems.map(e => e.check = false)
-                item.check = true
-              }
-              res.map(e => {
-                if (!checkeds.find(n => n.projectId == e.projectId && n.systemId == e.systemId)) {
-                  checkeds.push(e)
-                }
-              })
-            } else {
-              res.map(e => {
-                const i = checkeds.findIndex(n => n.projectId == e.projectId && n.systemId == e.systemId)
-                i === -1 || checkeds.splice(i, 1)
-              })
+          res.map(e => {
+            if (!checkeds.find(n => n.projectId == e.projectId && n.systemId == e.systemId)) {
+              checkeds.push(e)
             }
-            this.checkedAll = JSON.parse(JSON.stringify(checkeds)) // 全部已选项目，另外保存
-            this.getProject(item)
-          }).catch(err => {})
-        },
-        // 项目全选回调
-        checkAllChange(val, systemId) {
-          this.systemChange(val, { systemId })
-          this.systems.map(e => {
-            if (e.systemId == systemId) e.check = val
           })
-        },
-        // 项目选择回调
-        projectChange(val, item) {
-          const { systemId } = item
-          const i = this.checkeds.findIndex(e => e.projectId == item.projectId && e.systemId == systemId)
-          // 选中，则push，否则移除
-          if (val) {
-            this.checkeds.push(item)
-          } else if (i !== -1) {
-            this.checkeds.splice(i, 1)
-          }
-          // 同步系统
-          this.systems.map(e => {
-            if (e.systemId == systemId) e.check = !this.projects.filter(n => !n.check).length
+        } else {
+          res.map(e => {
+            const i = checkeds.findIndex(n => n.projectId == e.projectId && n.systemId == e.systemId)
+            i === -1 || checkeds.splice(i, 1)
           })
-          this.checkAll = !this.projects.find(e => !e.check) // 同步全选框
-          this.checkedAll = JSON.parse(JSON.stringify(this.checkeds)) // 全部已选项目，另外保存
-          console.log("🚀 ~ file: AddCurriculum.vue ~ line 728 ~ projectChange ~ checkedAll", this.checkeds, item)
-        },
-        // 已选择项目模糊查询
-        filterChecked() {
-          const val = this.checkedKeyword
-          this.checkeds = this.checkedAll.filter(e => e.projectName.includes(val))
-        },
-        // 删除已选项目
-        delProject(i, e) {
-          if (e.disabled) return
-          this.$confirm("确定要删除吗？", "提示", {
-            type: "warning"
-          }).then(() => {
-            this.checkeds.splice(i, 1)
-            // 如果当前展示的项目列表跟删掉的项目是同个系统，则找到项目列表里删掉的该项目，重置check和disabled
-            if (e.systemId == this.curSystem) {
-              const { projectId } = e
-              this.projects.map(n => {
-                if (n.projectId == projectId) {
-                  n.check = false
-                }
-              })
-              this.checkAll = !this.projects.find(e => !e.check)
+        }
+        this.checkedAll = JSON.parse(JSON.stringify(checkeds)) // 全部已选项目，另外保存
+        this.getProject(item)
+      }).catch(err => { })
+    },
+    // 项目全选回调
+    checkAllChange (val, systemId) {
+      this.systemChange(val, { systemId })
+      this.systems.map(e => {
+        if (e.systemId == systemId) e.check = val
+      })
+    },
+    // 项目选择回调
+    projectChange (val, item) {
+      const { systemId } = item
+      const i = this.checkeds.findIndex(e => e.projectId == item.projectId && e.systemId == systemId)
+      // 选中，则push，否则移除
+      if (val) {
+        this.checkeds.push(item)
+      } else if (i !== -1) {
+        this.checkeds.splice(i, 1)
+      }
+      // 同步系统
+      this.systems.map(e => {
+        if (e.systemId == systemId) e.check = !this.projects.filter(n => !n.check).length
+      })
+      this.checkAll = !this.projects.find(e => !e.check) // 同步全选框
+      this.checkedAll = JSON.parse(JSON.stringify(this.checkeds)) // 全部已选项目，另外保存
+      console.log("🚀 ~ file: AddCurriculum.vue ~ line 728 ~ projectChange ~ checkedAll", this.checkeds, item)
+    },
+    // 已选择项目模糊查询
+    filterChecked () {
+      const val = this.checkedKeyword
+      this.checkeds = this.checkedAll.filter(e => e.projectName.includes(val))
+    },
+    // 删除已选项目
+    delProject (i, e) {
+      if (e.disabled) return
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.checkeds.splice(i, 1)
+        // 如果当前展示的项目列表跟删掉的项目是同个系统，则找到项目列表里删掉的该项目，重置check和disabled
+        if (e.systemId == this.curSystem) {
+          const { projectId } = e
+          this.projects.map(n => {
+            if (n.projectId == projectId) {
+              n.check = false
             }
-            this.systems.map(n => {
-              if (n.systemId == e.systemId) n.check = false
-            })
-          }).catch(() => {})
-        },
-        // 确认系统
-        handleConfirm() {
-          const list = this.checkeds
-          if (!list.length) {
-            this.$message.warning("请选择系统！");
-          } else {
-            this.configVisible = false
-            list.map((e, i) => {
-              e.isShow = 0; // isShow是否展示(默认0:展示 1:不展示)
-              e.sort = i + 1; // 排序
-            });
-            if (!this.permissions) {
-              this.practiceData = JSON.parse(JSON.stringify(list))
-              this.practiceTotal = this.practiceData.length;
-            } else if (this.permissions == 1) {
-              this.assessmentData = JSON.parse(JSON.stringify(list))
-              this.assessmentTotal = this.assessmentData.length;
-            } else if (this.permissions == 2) {
-              this.matches = JSON.parse(JSON.stringify(list))
-              this.matchTotal = this.matches.length;
+          })
+          this.checkAll = !this.projects.find(e => !e.check)
+        }
+        this.systems.map(n => {
+          if (n.systemId == e.systemId) n.check = false
+        })
+      }).catch(() => { })
+    },
+    // 确认系统
+    handleConfirm () {
+      const list = this.checkeds
+      if (!list.length) {
+        this.$message.warning("请选择系统！");
+      } else {
+        this.configVisible = false
+        list.map((e, i) => {
+          e.isShow = 0; // isShow是否展示(默认0:展示 1:不展示)
+          e.sort = i + 1; // 排序
+        });
+        if (!this.permissions) {
+          this.practiceData = JSON.parse(JSON.stringify(list))
+          this.practiceTotal = this.practiceData.length;
+        } else if (this.permissions == 1) {
+          this.assessmentData = JSON.parse(JSON.stringify(list))
+          this.assessmentTotal = this.assessmentData.length;
+        } else if (this.permissions == 2) {
+          this.matches = JSON.parse(JSON.stringify(list))
+          this.matchTotal = this.matches.length;
+        }
+      }
+    },
+    practiceSortChange (row, index) { // 处理排序
+      this.practiceData.splice(index, 1, row);
+    },
+    assessmentSortChange (row, index) { // 处理排序
+      this.assessmentData.splice(index, 1, row);
+    },
+    handleSelectionPractice (val) { // 多选练习项目
+      this.multiplePractice = val;
+    },
+    handleSelectionAssessment (val) { // 多选考核项目
+      this.multipleAssessment = val;
+    },
+    handleSelectionMatch (val) { // 多选竞赛项目
+      this.multipleMatch = val;
+    },
+    handleBatchDelete (type) { // 批量移除
+      if (type == 1 && !this.multipleAssessment.length) {
+        this.$message.warning("请勾选考核项目！");
+        return;
+      } else if (!type && !this.multiplePractice.length) {
+        this.$message.warning("请勾选练习项目！");
+        return;
+      } else if (type == 2 && !this.multipleMatch.length) {
+        this.$message.warning("请勾选竞赛项目！");
+        return;
+      }
+      this.$confirm("此操作将批量移除项目, 是否继续?", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (type == 1) {
+          let ids = this.multipleAssessment.map(i => i.projectId);
+          let tempArr = [];
+          for (let i = 0; i < this.assessmentData.length; i++) {
+            if (!ids.includes(this.assessmentData[i].projectId)) {
+              tempArr.push(this.assessmentData[i]);
+            }
+          }
+          this.assessmentData = tempArr;
+        } else if (!type) {
+          let ids = this.multiplePractice.map(i => i.projectId);
+          let tempArr = [];
+          for (let i = 0; i < this.practiceData.length; i++) {
+            if (!ids.includes(this.practiceData[i].projectId)) {
+              tempArr.push(this.practiceData[i]);
             }
           }
-        },
-        practiceSortChange(row, index) { // 处理排序
-            this.practiceData.splice(index, 1, row);
-        },
-        assessmentSortChange(row, index) { // 处理排序
-            this.assessmentData.splice(index, 1, row);
-        },
-        handleSelectionPractice(val) { // 多选练习项目
-            this.multiplePractice = val;
-        },
-        handleSelectionAssessment(val) { // 多选考核项目
-            this.multipleAssessment = val;
-        },
-        handleSelectionMatch(val) { // 多选竞赛项目
-            this.multipleMatch = val;
-        },
-        handleBatchDelete(type) { // 批量移除
-            if (type == 1 && !this.multipleAssessment.length) {
-                this.$message.warning("请勾选考核项目！");
-                return;
-            } else if (!type && !this.multiplePractice.length) {
-                this.$message.warning("请勾选练习项目！");
-                return;
-            } else if (type == 2 && !this.multipleMatch.length) {
-                this.$message.warning("请勾选竞赛项目！");
-                return;
+          this.practiceData = tempArr;
+        } else {
+          let ids = this.multipleMatch.map(i => i.projectId);
+          let tempArr = [];
+          for (let i = 0; i < this.matches.length; i++) {
+            if (!ids.includes(this.matches[i].projectId)) {
+              tempArr.push(this.matches[i]);
             }
-            this.$confirm("此操作将批量移除项目, 是否继续?", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (type == 1) {
-                    let ids = this.multipleAssessment.map(i => i.projectId);
-                    let tempArr = [];
-                    for (let i = 0; i < this.assessmentData.length; i++) {
-                        if (!ids.includes(this.assessmentData[i].projectId)) {
-                            tempArr.push(this.assessmentData[i]);
-                        }
-                    }
-                    this.assessmentData = tempArr;
-                } else if (!type) {
-                    let ids = this.multiplePractice.map(i => i.projectId);
-                    let tempArr = [];
-                    for (let i = 0; i < this.practiceData.length; i++) {
-                        if (!ids.includes(this.practiceData[i].projectId)) {
-                            tempArr.push(this.practiceData[i]);
-                        }
-                    }
-                    this.practiceData = tempArr;
-                } else {
-                    let ids = this.multipleMatch.map(i => i.projectId);
-                    let tempArr = [];
-                    for (let i = 0; i < this.matches.length; i++) {
-                        if (!ids.includes(this.matches[i].projectId)) {
-                            tempArr.push(this.matches[i]);
-                        }
-                    }
-                    this.matches = tempArr;
-                }
-                this.$message.success("批量移除成功");
-            }).catch(() => {
-                this.$message.info("已取消批量移除");
+          }
+          this.matches = tempArr;
+        }
+        this.$message.success("批量移除成功");
+      }).catch(() => {
+        this.$message.info("已取消批量移除");
+      });
+    },
+    handleDelete (index, data) { // 移除
+      this.$confirm("此操作将移除该项目, 是否继续?", "提示", {
+        type: "warning"
+      }).then(() => {
+        data.splice(index, 1);
+        this.$message.success("移除成功");
+      }).catch(() => {
+        this.$message.info("已取消移除");
+      });
+    },
+    saveAdd (fromBack) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.submiting) return false
+          const form = JSON.parse(JSON.stringify(this.form))
+          form.supplier = form.supplier.join()
+          if (!this.practiceData.length) {
+            this.$message.warning("请添加练习配置");
+            return;
+          } else {
+            form.systemIdByPractice = this.practiceData.map(i => {
+              let obj = {
+                isShow: i.isShow,
+                projectId: i.projectId,
+                sort: Number(i.sort),
+                systemId: i.systemId
+              };
+              return obj;
             });
-        },
-        handleDelete(index, data) { // 移除
-            this.$confirm("此操作将移除该项目, 是否继续?", "提示", {
-                type: "warning"
-            }).then(() => {
-                data.splice(index, 1);
-                this.$message.success("移除成功");
-            }).catch(() => {
-                this.$message.info("已取消移除");
+            form.systemIdByPractice.sort((a, b) => a.sort - b.sort)
+          }
+          if (!this.assessmentData.length) {
+            this.$message.warning("请添加考核配置");
+            return;
+          } else {
+            form.systemIdByAssessment = this.assessmentData.map(i => {
+              let obj = {
+                isShow: i.isShow,
+                projectId: i.projectId,
+                sort: Number(i.sort),
+                systemId: i.systemId
+              };
+              return obj;
             });
-        },
-        saveAdd(fromBack) {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    const form = JSON.parse(JSON.stringify(this.form))
-                    form.supplier = form.supplier.join()
-                    if (!this.practiceData.length) {
-                        this.$message.warning("请添加练习配置");
-                        return;
-                    } else {
-                        form.systemIdByPractice = this.practiceData.map(i => {
-                            let obj = {
-                                isShow: i.isShow,
-                                projectId: i.projectId,
-                                sort: Number(i.sort),
-                                systemId: i.systemId
-                            };
-                            return obj;
-                        });
-                        form.systemIdByPractice.sort((a, b) => a.sort - b.sort)
-                    }
-                    if (!this.assessmentData.length) {
-                        this.$message.warning("请添加考核配置");
-                        return;
-                    } else {
-                        form.systemIdByAssessment = this.assessmentData.map(i => {
-                            let obj = {
-                                isShow: i.isShow,
-                                projectId: i.projectId,
-                                sort: Number(i.sort),
-                                systemId: i.systemId
-                            };
-                            return obj;
-                        });
-                        form.systemIdByAssessment.sort((a, b) => a.sort - b.sort)
-                    }
-                    // 竞赛配置
-                    form.systemIdByCompetition = this.matches.map(i => {
-                        let obj = {
-                            isShow: i.isShow,
-                            projectId: i.projectId,
-                            sort: Number(i.sort),
-                            systemId: i.systemId
-                        };
-                        return obj;
-                    });
-                    form.systemIdByCompetition.sort((a, b) => a.sort - b.sort)
+            form.systemIdByAssessment.sort((a, b) => a.sort - b.sort)
+          }
+          // 竞赛配置
+          form.systemIdByCompetition = this.matches.map(i => {
+            let obj = {
+              isShow: i.isShow,
+              projectId: i.projectId,
+              sort: Number(i.sort),
+              systemId: i.systemId
+            };
+            return obj;
+          });
+          form.systemIdByCompetition.sort((a, b) => a.sort - b.sort)
 
-                    this.submiting = true
-                    this.loadIns = this.$loading({
-                      lock: true,
-                      text: 'Loading',
-                      spinner: 'el-icon-loading',
-                      background: 'rgba(0, 0, 0, 0.7)'
-                    })
-                    if (form.cid) {
-                        this.$post(this.api.modifyCourse, form).then((res) => {
-                            this.$message.success("编辑成功");
-                            this.backPage()
-                        }).catch((res) => {
-                            this.submiting = false
-                            this.loadIns.close()
-                        });
-                    } else {
-                        this.$post(this.api.createCurriculum, form).then((res) => {
-                            !fromBack ? this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", {
-                                type: "success",
-                                confirmButtonText: "马上设置",
-                                cancelButtonText: "稍后操作"
-                            }).then(() => {
-                                this.$router.push(`/contentSettings?cid=${res.cid}`);
-                            }).catch(() => {
-                                this.backPage()
-                            }) : this.backPage()
-                        }).catch((res) => {
-                            this.submiting = false
-                            this.loadIns.close()
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        goback() {
-          const id = this.form.cid
-          const updateTime = this.updateTime
-          // 更改了信息才需要提示
-          if ((id && updateTime > 2) || (!id && updateTime)) {
-            this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
-              type: 'warning'
-            }).then(() => {
-              this.saveAdd(1)
-            }).catch(() => {
+          this.submiting = true
+          this.loadIns = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          if (form.cid) {
+            this.$post(this.api.modifyCourse, form).then((res) => {
+              this.$message.success("编辑成功");
               this.backPage()
-            })
+            }).catch((res) => {
+              this.submiting = false
+              this.loadIns.close()
+            });
           } else {
-            this.backPage()
+            this.$post(this.api.createCurriculum, form).then((res) => {
+              !fromBack ? this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", {
+                type: "success",
+                confirmButtonText: "马上设置",
+                cancelButtonText: "稍后操作"
+              }).then(() => {
+                this.$router.push(`/contentSettings?cid=${res.cid}`);
+              }).catch(() => {
+                this.backPage()
+              }) : this.backPage()
+            }).catch((res) => {
+              this.submiting = false
+              this.loadIns.close()
+            });
           }
-        },
-        // 返回上一页
-        backPage() {
-          this.$router.back()
-          this.loadIns.close()
+        } else {
+          return false;
         }
+      });
+    },
+    goback () {
+      const id = this.form.cid
+      const updateTime = this.updateTime
+      // 更改了信息才需要提示
+      if ((id && updateTime > 2) || (!id && updateTime)) {
+        this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.saveAdd(1)
+        }).catch(() => {
+          this.backPage()
+        })
+      } else {
+        this.backPage()
+      }
+    },
+    // 返回上一页
+    backPage () {
+      this.$router.back()
+      this.loadIns.close()
     }
+  }
 };
 </script>
 
@@ -923,7 +1096,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
@@ -971,81 +1144,82 @@ $avatar-width: 104px;
     }
 }
 .settlement {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-  .label {
-    margin-right: 10px;
-    white-space: nowrap;
-    color: #606266;
-    font-size: 14px;
-  }
-  .el-input {
-    width: 150px;
-    margin-right: 30px;
-  }
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    .label {
+        margin-right: 10px;
+        white-space: nowrap;
+        color: #606266;
+        font-size: 14px;
+    }
+    .el-input {
+        width: 150px;
+        margin-right: 30px;
+    }
 }
 /deep/.config-dia {
-  .config-wrap {
-    display: flex;
-  }
-  .title-wrap {
-    margin-bottom: 15px;
-  }
-  .item {
-    width: 250px;
-    max-height: 600px;
-    padding: 10px;
-    margin-right: 20px;
-    overflow: hidden;
-  }
-  .system {
-    background-color: #f9f9f9;
-  }
-  .systems {
-    margin-top: 10px;
-    max-height: 550px;
-    overflow: auto;
-    li {
-      display: flex;
-      align-items: center;
-      margin: 10px 0;
+    .config-wrap {
+        display: flex;
     }
-    .name {
-      display: inline-flex;
-      flex: 1;
-      justify-content: space-between;
-      align-items: center;
-      margin-left: 5px;
-      cursor: pointer;
-      &.active, &:hover {
-        color: #9076FF;
-      }
-      span {
-        max-width: 200px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    .title-wrap {
+        margin-bottom: 15px;
+    }
+    .item {
+        width: 250px;
+        max-height: 600px;
+        padding: 10px;
+        margin-right: 20px;
         overflow: hidden;
-      }
     }
-  }
-  .checked {
-    flex: 1;
-    width: auto;
-    .el-table .cell {
-      font-size: 12px;
+    .system {
+        background-color: #f9f9f9;
     }
-  }
-  .rm {
-    font-size: 14px;
-    cursor: pointer;
-    &.disabled {
-      color: #ccc;
-      cursor: not-allowed;
+    .systems {
+        margin-top: 10px;
+        max-height: 550px;
+        overflow: auto;
+        li {
+            display: flex;
+            align-items: center;
+            margin: 10px 0;
+        }
+        .name {
+            display: inline-flex;
+            flex: 1;
+            justify-content: space-between;
+            align-items: center;
+            margin-left: 5px;
+            cursor: pointer;
+            &.active,
+            &:hover {
+                color: #9076ff;
+            }
+            span {
+                max-width: 200px;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                overflow: hidden;
+            }
+        }
     }
-    &:hover {
-      color: #17161f;
+    .checked {
+        flex: 1;
+        width: auto;
+        .el-table .cell {
+            font-size: 12px;
+        }
+    }
+    .rm {
+        font-size: 14px;
+        cursor: pointer;
+        &.disabled {
+            color: #ccc;
+            cursor: not-allowed;
+        }
+        &:hover {
+            color: #17161f;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 5a882c1..7b89f55 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -1,2577 +1,3033 @@
 <template>
-    <div v-loading="loading">
-        <!-- 订单详情 -->
-        <div v-show="!showSelectClient">
-            <el-row :gutter="20">
-                <el-col :span="24">
-                    <el-card shadow="hover" class="mgb20">
-                        <div class="flex-between">
-                            <div class="per_title" v-preventReClick @click="goBack()">
-                                <i class="el-icon-arrow-left"></i>
-                                <span class="per_back">返回</span>
-                                <span class="per_school">{{ titlesw }}</span>
-                            </div>
-                            <el-button v-if="!viewDisabled" type="primary" round class="mag" v-preventReClick
-                                       @click="submitOrder">确定
-                            </el-button>
-                        </div>
-                    </el-card>
+  <div v-loading="loading">
+    <!-- 订单详情 -->
+    <div v-show="!showSelectClient">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div class="flex-between">
+              <div class="per_title"
+                   v-preventReClick
+                   @click="goBack()">
+                <i class="el-icon-arrow-left"></i>
+                <span class="per_back">返回</span>
+                <span class="per_school">{{ titlesw }}</span>
+              </div>
+              <el-button v-if="!viewDisabled"
+                         type="primary"
+                         round
+                         class="mag"
+                         v-preventReClick
+                         @click="submitOrder">确定
+              </el-button>
+            </div>
+          </el-card>
 
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-center mgb20 user_header">
-                                <p class="addhr_tag"></p>
-                                <span>基本信息</span>
-                            </div>
-                            <div>
-                                <el-form class="info" ref="form" :model="form" :rules="rules" label-width="120px">
-                                    <el-col :span="6" :offset="5">
-                                        <el-form-item label="订单编号">
-                                            <el-input v-model="form.orderNumber" disabled placeholder="自动生成"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="订单时间" prop="createTime">
-                                            <el-date-picker
-                                                disabled
-                                                style="width:100%"
-                                                v-model="form.createTime"
-                                                type="date"
-                                                placeholder="自动生成">
-                                            </el-date-picker>
-                                        </el-form-item>
-                                        <el-form-item label="省份">
-                                            <el-select disabled v-model="form.provinceId" 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-form-item label="联系人">
-                                            <el-input disabled v-model="form.orderContact"
-                                                      placeholder="请输入联系人姓名"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="邮箱">
-                                            <el-input disabled v-model="form.email" placeholder="请输入邮箱地址"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="团队">
-                                            <el-select :disabled="viewDisabled" v-model="form.teamId" filterable placeholder="请选择团队" @change="teamChange">
-                                                <el-option v-for="(item, i) in teams" :key="i" :label="item.partnerClassificationName" :value="item.id"></el-option>
-                                            </el-select>
-                                        </el-form-item>
-                                    </el-col>
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-center mgb20 user_header">
+                <p class="addhr_tag"></p>
+                <span>基本信息</span>
+              </div>
+              <div>
+                <el-form class="info"
+                         ref="form"
+                         :model="form"
+                         :rules="rules"
+                         label-width="120px">
+                  <el-col :span="6"
+                          :offset="5">
+                    <el-form-item label="订单编号">
+                      <el-input v-model="form.orderNumber"
+                                disabled
+                                placeholder="自动生成"></el-input>
+                    </el-form-item>
+                    <el-form-item label="订单时间"
+                                  prop="createTime">
+                      <el-date-picker disabled
+                                      style="width:100%"
+                                      v-model="form.createTime"
+                                      type="date"
+                                      placeholder="自动生成">
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="省份">
+                      <el-select disabled
+                                 v-model="form.provinceId"
+                                 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-form-item label="联系人">
+                      <el-input disabled
+                                v-model="form.orderContact"
+                                placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="邮箱">
+                      <el-input disabled
+                                v-model="form.email"
+                                placeholder="请输入邮箱地址"></el-input>
+                    </el-form-item>
+                    <el-form-item label="团队">
+                      <el-select :disabled="viewDisabled"
+                                 v-model="form.teamId"
+                                 filterable
+                                 placeholder="请选择团队"
+                                 @change="teamChange">
+                        <el-option v-for="(item, i) in teams"
+                                   :key="i"
+                                   :label="item.partnerClassificationName"
+                                   :value="item.id"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
-                                    <el-col :span="6" :offset="2">
-                                        <el-form-item prop="customerName" label="订单客户">
-                                            <div v-if="!viewDisabled&&!editDisabled&&!renewDisabled" @click="gotoClient"
-                                                 style="cursor: pointer">
-                                                <el-input v-model="form.customerName" placeholder="请选择客户"></el-input>
-                                            </div>
-                                            <el-input v-if="viewDisabled||editDisabled||renewDisabled" disabled
-                                                      v-model="form.customerName" placeholder="请选择客户"></el-input>
-                                        </el-form-item>
-                                        <el-form-item prop="orderType" label="订单类型">
-                                            <el-select :disabled="viewDisabled"
-                                                       v-model="form.orderType" clearable placeholder="请选择订单类型" @change="updateOrderType">
-                                                <el-option v-for="(item,index) in orderTypeList" :key="index"
-                                                           :label="item.name" :value="item.value"></el-option>
-                                            </el-select>
-                                        </el-form-item>
-                                        <el-form-item label="城市">
-                                            <el-select disabled v-model="form.cityId" placeholder="请选择">
-                                                <el-option
-                                                    v-for="(item,index) in cityList"
-                                                    :key="index"
-                                                    :label="item.cityName"
-                                                    :value="item.cityId">
-                                                </el-option>
-                                            </el-select>
-                                        </el-form-item>
-                                        <el-form-item label="电话">
-                                            <el-input disabled v-model="form.phone" placeholder="请输入电话号码"
-                                                      maxlength="11"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="订单金额(元)" prop="orderAmount">
-                                            <el-input disabled
-                                                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      type="number" v-model="form.orderAmount"
-                                                      placeholder="请输入订单金额"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="商务经理">
-                                          <el-input v-if="form.businessManagerName" disabled v-model="form.businessManagerName"></el-input>
-                                          <el-select v-else :disabled="viewDisabled || !form.teamId" v-model="form.businessManagerId" clearable filterable placeholder="请选择商务经理">
-                                              <el-option v-for="(item, i) in bmList" :key="i" :label="item.userName" :value="item.partnerId"></el-option>
-                                          </el-select>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-form>
-                            </div>
-                        </div>
-                    </el-card>
-                    <!-- 课程 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>实训课程产品权限</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || coursePermissions.find(e => e.status == 1) || (isAdd && coursePermissions.length))">
-                                    <el-button v-if="coursePermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 0)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 0)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round @click="addCourseJurisdiction(1)">添加</el-button>
-                                </div>
-                            </div>
+                  <el-col :span="6"
+                          :offset="2">
+                    <el-form-item prop="customerName"
+                                  label="订单客户">
+                      <div v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                           @click="gotoClient"
+                           style="cursor: pointer">
+                        <el-input v-model="form.customerName"
+                                  placeholder="请选择客户"></el-input>
+                      </div>
+                      <el-input v-if="viewDisabled||editDisabled||renewDisabled"
+                                disabled
+                                v-model="form.customerName"
+                                placeholder="请选择客户"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="orderType"
+                                  label="订单类型">
+                      <el-select :disabled="viewDisabled"
+                                 v-model="form.orderType"
+                                 clearable
+                                 placeholder="请选择订单类型"
+                                 @change="updateOrderType">
+                        <el-option v-for="(item,index) in orderTypeList"
+                                   :key="index"
+                                   :label="item.name"
+                                   :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="城市">
+                      <el-select disabled
+                                 v-model="form.cityId"
+                                 placeholder="请选择">
+                        <el-option v-for="(item,index) in cityList"
+                                   :key="index"
+                                   :label="item.cityName"
+                                   :value="item.cityId">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="电话">
+                      <el-input disabled
+                                v-model="form.phone"
+                                placeholder="请输入电话号码"
+                                maxlength="11"></el-input>
+                    </el-form-item>
+                    <el-form-item label="订单金额(元)"
+                                  prop="orderAmount">
+                      <el-input disabled
+                                oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                type="number"
+                                v-model="form.orderAmount"
+                                placeholder="请输入订单金额"></el-input>
+                    </el-form-item>
+                    <el-form-item label="商务经理">
+                      <el-input v-if="form.businessManagerName"
+                                disabled
+                                v-model="form.businessManagerName"></el-input>
+                      <el-select v-else
+                                 :disabled="viewDisabled || !form.teamId"
+                                 v-model="form.businessManagerId"
+                                 clearable
+                                 filterable
+                                 placeholder="请选择商务经理">
+                        <el-option v-for="(item, i) in bmList"
+                                   :key="i"
+                                   :label="item.userName"
+                                   :value="item.partnerId"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-form>
+              </div>
+            </div>
+          </el-card>
+          <!-- 课程 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>实训课程产品权限</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || coursePermissions.find(e => e.status == 1) || (isAdd && coursePermissions.length))">
+                    <el-button v-if="coursePermissions.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 0)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 0)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             @click="addCourseJurisdiction(1)">添加</el-button>
+                </div>
+              </div>
 
-                            <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" min-width="150" show-overflow-tooltip>
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                                class="time-input"
-                                                      :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled" maxlength="4"
-                                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                      @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                                      v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.marketValue" type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text" size="small" style="width: 100%"></el-input>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="端口地址 " align="center" min-width="100">
-                                    <template slot-scope="scope">
-                                        <el-button @click="configure(scope.row)">配置</el-button>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="180">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delCourseForm(scope.$index, scope.row)"
-                                                style="margin-right:10px;"
-                                            >删除</el-button>
-                                            <!-- 1: 未生效，2：生效中，3：已过期 -->
-                                            <!-- 
+              <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"
+                                 min-width="150"
+                                 show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <el-select class="time-select"
+                                 v-model="scope.row.options"
+                                 :disabled="viewDisabled||editDisabled"
+                                 placeholder="请选择"
+                                 @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
+                        <el-option label="日"
+                                   :value="0"></el-option>
+                        <el-option label="月"
+                                   :value="1"></el-option>
+                        <el-option label="年"
+                                   :value="2"></el-option>
+                      </el-select>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.marketValue"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率 "
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <el-input class="normal"
+                              disabled
+                              v-model="scope.row.discountRate"
+                              placeholder=""
+                              type="text"
+                              size="small"
+                              style="width: 100%"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="端口地址 "
+                                 align="center"
+                                 min-width="100">
+                  <template slot-scope="scope">
+                    <el-button @click="configure(scope.row)">配置</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="180">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delCourseForm(scope.$index, scope.row)"
+                                 style="margin-right:10px;">删除</el-button>
+                      <!-- 1: 未生效，2：生效中，3：已过期 -->
+                      <!-- 
                                               1、查看时不可操作
                                               2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
                                               3、处理中的订单显示发货，不显示禁用
                                             -->
-                                            <el-switch
-                                                v-if="scope.row.ship === 0 || dispose || isAdd "
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                :disabled="viewDisabled"
-                                                @change="handleDeliver($event,scope.row,0)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,0)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
+                      <el-switch v-if="scope.row.ship === 0 || dispose || isAdd "
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 :disabled="viewDisabled"
+                                 @change="handleDeliver($event,scope.row,0)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,0)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
 
-                    <!-- 理论课程 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>理论课程产品权限</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || theoryCourseList.find(e => e.status == 1) || (isAdd && theoryCourseList.length))">
-                                    <el-button v-if="theoryCourseList.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 5)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 5)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round @click="addCourseJurisdiction(2)">添加</el-button>
-                                </div>
-                            </div>
+          <!-- 理论课程 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>理论课程产品权限</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || theoryCourseList.find(e => e.status == 1) || (isAdd && theoryCourseList.length))">
+                    <el-button v-if="theoryCourseList.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 5)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 5)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             @click="addCourseJurisdiction(2)">添加</el-button>
+                </div>
+              </div>
 
-                            <el-table :data="theoryCourseList" 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" min-width="150" show-overflow-tooltip>
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                                class="time-input"
-                                                      :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled" maxlength="4"
-                                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                      @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                                      v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.marketValue" type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text" size="small" style="width: 100%"></el-input>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="端口地址 " align="center" min-width="100">
-                                    <template slot-scope="scope">
-                                        <el-button @click="configure(scope.row)">配置</el-button>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="180">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delCourseDataForm(scope.$index, scope.row)"
-                                                style="margin-right:10px;"
-                                            >删除</el-button>
-                                            <!-- 1: 未生效，2：生效中，3：已过期 -->
-                                            <!-- 
+              <el-table :data="theoryCourseList"
+                        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"
+                                 min-width="150"
+                                 show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <el-select class="time-select"
+                                 v-model="scope.row.options"
+                                 :disabled="viewDisabled||editDisabled"
+                                 placeholder="请选择"
+                                 @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
+                        <el-option label="日"
+                                   :value="0"></el-option>
+                        <el-option label="月"
+                                   :value="1"></el-option>
+                        <el-option label="年"
+                                   :value="2"></el-option>
+                      </el-select>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.marketValue"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率 "
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <el-input class="normal"
+                              disabled
+                              v-model="scope.row.discountRate"
+                              placeholder=""
+                              type="text"
+                              size="small"
+                              style="width: 100%"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="端口地址 "
+                                 align="center"
+                                 min-width="100">
+                  <template slot-scope="scope">
+                    <el-button @click="configure(scope.row)">配置</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="180">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delCourseDataForm(scope.$index, scope.row)"
+                                 style="margin-right:10px;">删除</el-button>
+                      <!-- 1: 未生效，2：生效中，3：已过期 -->
+                      <!-- 
                                               1、查看时不可操作
                                               2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
                                               3、处理中的订单显示发货，不显示禁用
                                             -->
-                                            <el-switch
-                                                v-if="scope.row.ship === 0 || dispose || isAdd "
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                :disabled="viewDisabled"
-                                                @change="handleDeliver($event,scope.row,5)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,5)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
-
-                    <!-- 数据平台权限 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>数据前瞻产品权限</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || dataPlatformPermissions.find(e => e.status == 1) || (isAdd && dataPlatformPermissions.length))">
-                                    <el-button v-if="dataPlatformPermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 1)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 1)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addCourseJurisdiction(5)">添加</el-button>
-                                </div>
-                            </div>
-
-                            <!--:summary-method="getSummaries"-->
-                            <el-table :data="dataPlatformPermissions" class="orderTable orderTables" 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" min-width="100">
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                              class="time-input"
-                                              :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                              :disabled="viewDisabled||editDisabled" maxlength="4"
-                                              @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
-                                              @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                              v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                            <span style="margin-left:5px">
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                            </span>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="120">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="180">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="scope.row.finalValue === '' && whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalValue = scope.row.finalValue.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      @change="[dealComputers($event,scope.row),calculateDiscount($event,scope.row)]"
-                                                      v-model="scope.row.finalValue"
-                                                      type="text"></el-input>
-                                            <span style="margin-left:5px">元&nbsp;/&nbsp; 账号</span>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率" align="center" min-width="140">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text"></el-input>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="账号数" align="center" min-width="120">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', !scope.row.accountNum&&whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.accountNum = scope.row.accountNum.replace(/[^0-9.]/g,'')"
-                                                      v-model="scope.row.accountNum"
-                                                      @change="[dealComputers($event,scope.row)]"
-                                                      type="text"></el-input>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 -->
-                                <el-table-column label="成交价" align="center" min-width="160">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input style="width: 80%" :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @blur="[allAmount($event,scope.row),dealFinalValue($event,scope.row)]"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="160">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input style="width: 80%" :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="180">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delDataForm(scope.$index, scope.row)"
-                                                style="margin-right:10px;"
-                                            >删除</el-button>
-                                            <el-switch
-                                                v-if="scope.row.ship === 0  || dispose || isAdd"
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                @change="handleDeliver($event,scope.row,1)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,1)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
-
-                    <!-- 职站增值模块权限 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>职站增值应用产品权限</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || valuePermissions.find(e => e.status == 1) || (isAdd && valuePermissions.length))">
-                                    <el-button v-if="valuePermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 2)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 2)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addCourseJurisdiction(3)">添加</el-button>
-                                </div>
-                            </div>
+                      <el-switch v-if="scope.row.ship === 0 || dispose || isAdd "
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 :disabled="viewDisabled"
+                                 @change="handleDeliver($event,scope.row,5)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,5)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
 
-                            <!--:summary-method="getSummaries"-->
-                            <el-table :data="valuePermissions" class="orderTable orderTables" 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" min-width="100">
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                              class="time-input"
-                                              :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                              :disabled="viewDisabled||editDisabled" maxlength="4"
-                                              @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
-                                              @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                              v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                            <span style="margin-left:5px">
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                            </span>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
+          <!-- 数据平台权限 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>数据前瞻产品权限</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || dataPlatformPermissions.find(e => e.status == 1) || (isAdd && dataPlatformPermissions.length))">
+                    <el-button v-if="dataPlatformPermissions.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 1)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 1)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             class="mag"
+                             @click="addCourseJurisdiction(5)">添加</el-button>
+                </div>
+              </div>
 
+              <!--:summary-method="getSummaries"-->
+              <el-table :data="dataPlatformPermissions"
+                        class="orderTable orderTables"
+                        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"
+                                 min-width="100">
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <span style="margin-left:5px">
+                        <el-select class="time-select"
+                                   v-model="scope.row.options"
+                                   :disabled="viewDisabled||editDisabled"
+                                   placeholder="请选择"
+                                   @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
+                          <el-option label="日"
+                                     :value="0"></el-option>
+                          <el-option label="月"
+                                     :value="1"></el-option>
+                          <el-option label="年"
+                                     :value="2"></el-option>
+                        </el-select>
+                      </span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="120">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="180">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="scope.row.finalValue === '' && whetherSubmit?'red':''"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalValue = scope.row.finalValue.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                @change="[dealComputers($event,scope.row),calculateDiscount($event,scope.row)]"
+                                v-model="scope.row.finalValue"
+                                type="text"></el-input>
+                      <span style="margin-left:5px">元&nbsp;/&nbsp; 账号</span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率"
+                                 align="center"
+                                 min-width="140">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.discountRate"
+                                placeholder=""
+                                type="text"></el-input>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="账号数"
+                                 align="center"
+                                 min-width="120">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', !scope.row.accountNum&&whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.accountNum = scope.row.accountNum.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.accountNum"
+                                @change="[dealComputers($event,scope.row)]"
+                                type="text"></el-input>
+                    </div>
+                  </template>
+                </el-table-column>
+                <!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 -->
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="160">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input style="width: 80%"
+                                :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @blur="[allAmount($event,scope.row),dealFinalValue($event,scope.row)]"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="160">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input style="width: 80%"
+                                :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="180">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delDataForm(scope.$index, scope.row)"
+                                 style="margin-right:10px;">删除</el-button>
+                      <el-switch v-if="scope.row.ship === 0  || dispose || isAdd"
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 @change="handleDeliver($event,scope.row,1)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,1)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
 
+          <!-- 职站增值模块权限 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>职站增值应用产品权限</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || valuePermissions.find(e => e.status == 1) || (isAdd && valuePermissions.length))">
+                    <el-button v-if="valuePermissions.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 2)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 2)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             class="mag"
+                             @click="addCourseJurisdiction(3)">添加</el-button>
+                </div>
+              </div>
 
+              <!--:summary-method="getSummaries"-->
+              <el-table :data="valuePermissions"
+                        class="orderTable orderTables"
+                        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"
+                                 min-width="100">
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <span style="margin-left:5px">
+                        <el-select class="time-select"
+                                   v-model="scope.row.options"
+                                   :disabled="viewDisabled||editDisabled"
+                                   placeholder="请选择"
+                                   @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
+                          <el-option label="日"
+                                     :value="0"></el-option>
+                          <el-option label="月"
+                                     :value="1"></el-option>
+                          <el-option label="年"
+                                     :value="2"></el-option>
+                        </el-select>
+                      </span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
 
-                                <el-table-column label="剩余期限" align="center" min-width="120">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.marketValue" type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text" size="small" style="width: 100%"></el-input>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="180">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delDataFormList(scope.$index, scope.row)"
-                                                style="margin-right:10px;"
-                                            >删除</el-button>
-                                            <el-switch
-                                                v-if="scope.row.ship === 0  || dispose || isAdd"
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                @change="handleDeliver($event,scope.row,2)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,2)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="120">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.marketValue"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率 "
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <el-input class="normal"
+                              disabled
+                              v-model="scope.row.discountRate"
+                              placeholder=""
+                              type="text"
+                              size="small"
+                              style="width: 100%"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="180">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delDataFormList(scope.$index, scope.row)"
+                                 style="margin-right:10px;">删除</el-button>
+                      <el-switch v-if="scope.row.ship === 0  || dispose || isAdd"
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 @change="handleDeliver($event,scope.row,2)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,2)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
 
-                    <!-- 实训课程 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>实训课程（非集成）</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || practicalCourses.find(e => e.status == 1) || (isAdd && practicalCourses.length))">
-                                    <el-button v-if="practicalCourses.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 3)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 3)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addCourseJurisdiction(4)">添加</el-button>
-                                </div>
-                            </div>
+          <!-- 实训课程 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>实训课程（非集成）</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || practicalCourses.find(e => e.status == 1) || (isAdd && practicalCourses.length))">
+                    <el-button v-if="practicalCourses.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 3)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 3)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             class="mag"
+                             @click="addCourseJurisdiction(4)">添加</el-button>
+                </div>
+              </div>
 
-                            <!--:summary-method="getSummaries"-->
-                            <el-table :data="practicalCourses" class="orderTable orderTables" 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" min-width="150" show-overflow-tooltip>
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                                class="time-input"
-                                                      :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled" maxlength="4"
-                                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                      @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                                      v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.marketValue" type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text" size="small" style="width: 100%"></el-input>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="250">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                style="margin-right: 10px;"
-                                                type="text"
-                                                @click="showShip(scope.row)"
-                                            >{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delPracticalCourses(scope.$index, scope.row)"
-                                                style="margin: 0 10px;"
-                                            >删除</el-button>
-                                            <!-- 1: 未生效，2：生效中，3：已过期 -->
-                                            <!-- 
+              <!--:summary-method="getSummaries"-->
+              <el-table :data="practicalCourses"
+                        class="orderTable orderTables"
+                        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"
+                                 min-width="150"
+                                 show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <el-select class="time-select"
+                                 v-model="scope.row.options"
+                                 :disabled="viewDisabled||editDisabled"
+                                 placeholder="请选择"
+                                 @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
+                        <el-option label="日"
+                                   :value="0"></el-option>
+                        <el-option label="月"
+                                   :value="1"></el-option>
+                        <el-option label="年"
+                                   :value="2"></el-option>
+                      </el-select>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.marketValue"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率 "
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <el-input class="normal"
+                              disabled
+                              v-model="scope.row.discountRate"
+                              placeholder=""
+                              type="text"
+                              size="small"
+                              style="width: 100%"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="250">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button style="margin-right: 10px;"
+                                 type="text"
+                                 @click="showShip(scope.row)">{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delPracticalCourses(scope.$index, scope.row)"
+                                 style="margin: 0 10px;">删除</el-button>
+                      <!-- 1: 未生效，2：生效中，3：已过期 -->
+                      <!-- 
                                               1、查看时不可操作
                                               2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
                                               3、处理中的订单显示发货，不显示禁用
                                             -->
-                                            <el-switch
-                                                v-if="scope.row.ship === 0 || dispose || isAdd "
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                :disabled="viewDisabled"
-                                                @change="handleDeliver($event,scope.row,3)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,3)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
+                      <el-switch v-if="scope.row.ship === 0 || dispose || isAdd "
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 :disabled="viewDisabled"
+                                 @change="handleDeliver($event,scope.row,3)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,3)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
 
-                    <!-- 实验工具 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-between mgb20 user_header">
-                                <div class="flex-center">
-                                    <p class="addhr_tag"></p>
-                                    <span>实验工具</span>
-                                </div>
-                                <div>
-                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
-                                  <template v-if="!viewDisabled && (dispose || expTools.find(e => e.status == 1) || (isAdd && expTools.length))">
-                                    <el-button v-if="expTools.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 4)">一键发货</el-button>
-                                    <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 4)">取消全部发货</el-button>
-                                  </template>
-                                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addCourseJurisdiction(6)">添加</el-button>
-                                </div>
-                            </div>
+          <!-- 实验工具 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-between mgb20 user_header">
+                <div class="flex-center">
+                  <p class="addhr_tag"></p>
+                  <span>实验工具</span>
+                </div>
+                <div>
+                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                  <template v-if="!viewDisabled && (dispose || expTools.find(e => e.status == 1) || (isAdd && expTools.length))">
+                    <el-button v-if="expTools.find(e => !e.ship)"
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(1, 4)">一键发货</el-button>
+                    <el-button v-else
+                               v-auth="'/order:发货'"
+                               type="primary"
+                               round
+                               @click="batchDeliver(0, 4)">取消全部发货</el-button>
+                  </template>
+                  <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
+                             type="primary"
+                             round
+                             class="mag"
+                             @click="addCourseJurisdiction(6)">添加</el-button>
+                </div>
+              </div>
 
-                            <!--:summary-method="getSummaries"-->
-                            <el-table :data="expTools" class="orderTable orderTables" 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" min-width="150" show-overflow-tooltip>
-                                </el-table-column>
-                                <el-table-column label="使用期限" align="center" min-width="190">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input
-                                                class="time-input"
-                                                      :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled" maxlength="4"
-                                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                      @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
-                                                      v-model="scope.row.periodOfUse" placeholder="输入时间"></el-input>
-                                                <el-select class="time-select" v-model="scope.row.options" :disabled="viewDisabled||editDisabled" placeholder="请选择" @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
-                                                    <el-option label="日" :value="0"></el-option>
-                                                    <el-option label="月" :value="1"></el-option>
-                                                    <el-option label="年" :value="2"></el-option>
-                                                </el-select>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="起止日期" align="center" min-width="240">
-                                    <template slot-scope="scope">
-                                        <p v-if="!scope.row.startTime">
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                        </p>
-                                        <p v-else>
-                                            <el-date-picker
-                                                :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
-                                                style="width:130px"
-                                                v-model="scope.row.startTime"
-                                                type="date" :disabled="viewDisabled||editDisabled"
-                                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
-                                                placeholder="请选择使用日期">
-                                            </el-date-picker>
-                                            <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span></p>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="剩余期限" align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <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" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input class="normal" disabled v-model="scope.row.marketValue" type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="折扣率 " align="center" min-width="110">
-                                    <template slot-scope="scope">
-                                            <el-input class="normal" disabled v-model="scope.row.discountRate" placeholder=""
-                                                      type="text" size="small" style="width: 100%"></el-input>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="成交价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
-                                                      v-model="scope.row.finalPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算价" align="center" min-width="170">
-                                    <template slot-scope="scope">
-                                        <div class="small">
-                                            <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
-                                                      :disabled="viewDisabled"
-                                                      @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="scope.row.settlementPrice"
-                                                      type="text"></el-input> 元
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="操作" align="center" width="250">
-                                    <template slot-scope="scope">
-                                        <div class="flex-c-c">
-                                            <el-button
-                                                style="margin-right: 10px;"
-                                                type="text"
-                                                @click="showShip(scope.row)"
-                                            >{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
-                                            <el-button
-                                                v-if="!editDisabled&&!viewDisabled"
-                                                type="text"
-                                                @click="delExpTool(scope.$index, scope.row)"
-                                                style="margin-right:10px;"
-                                            >删除</el-button>
-                                            <!-- 1: 未生效，2：生效中，3：已过期 -->
-                                            <!-- 
+              <!--:summary-method="getSummaries"-->
+              <el-table :data="expTools"
+                        class="orderTable orderTables"
+                        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"
+                                 min-width="150"
+                                 show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="使用期限"
+                                 align="center"
+                                 min-width="190">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="time-input"
+                                :class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
+                                :disabled="viewDisabled||editDisabled"
+                                maxlength="4"
+                                @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                @input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
+                                v-model="scope.row.periodOfUse"
+                                placeholder="输入时间"></el-input>
+                      <el-select class="time-select"
+                                 v-model="scope.row.options"
+                                 :disabled="viewDisabled||editDisabled"
+                                 placeholder="请选择"
+                                 @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
+                        <el-option label="日"
+                                   :value="0"></el-option>
+                        <el-option label="月"
+                                   :value="1"></el-option>
+                        <el-option label="年"
+                                   :value="2"></el-option>
+                      </el-select>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="起止日期"
+                                 align="center"
+                                 min-width="240">
+                  <template slot-scope="scope">
+                    <p v-if="!scope.row.startTime">
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                    </p>
+                    <p v-else>
+                      <el-date-picker :class="orderRepeat.includes(scope.row.dataOrCourseId) ? 'red' : ''"
+                                      style="width:130px"
+                                      v-model="scope.row.startTime"
+                                      type="date"
+                                      :disabled="viewDisabled||editDisabled"
+                                      @change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
+                                      placeholder="请选择使用日期">
+                      </el-date-picker>
+                      <span v-if="scope.row.startTime"><span v-if='scope.row.endTime'> - </span>{{ scope.row.endTime }}</span>
+                    </p>
+                  </template>
+                </el-table-column>
+                <el-table-column label="剩余期限"
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <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"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input class="normal"
+                                disabled
+                                v-model="scope.row.marketValue"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="折扣率 "
+                                 align="center"
+                                 min-width="110">
+                  <template slot-scope="scope">
+                    <el-input class="normal"
+                              disabled
+                              v-model="scope.row.discountRate"
+                              placeholder=""
+                              type="text"
+                              size="small"
+                              style="width: 100%"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成交价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.finalPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.finalPrice = scope.row.finalPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                @change="[allAmount($event,scope.row),calculateDiscountCourse($event,scope.row)]"
+                                v-model="scope.row.finalPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结算价"
+                                 align="center"
+                                 min-width="170">
+                  <template slot-scope="scope">
+                    <div class="small">
+                      <el-input :class="['normal', scope.row.settlementPrice === '' && whetherSubmit?'red':'']"
+                                :disabled="viewDisabled"
+                                @input="scope.row.settlementPrice = scope.row.settlementPrice.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="scope.row.settlementPrice"
+                                type="text"></el-input> 元
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作"
+                                 align="center"
+                                 width="250">
+                  <template slot-scope="scope">
+                    <div class="flex-c-c">
+                      <el-button style="margin-right: 10px;"
+                                 type="text"
+                                 @click="showShip(scope.row)">{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
+                      <el-button v-if="!editDisabled&&!viewDisabled"
+                                 type="text"
+                                 @click="delExpTool(scope.$index, scope.row)"
+                                 style="margin-right:10px;">删除</el-button>
+                      <!-- 1: 未生效，2：生效中，3：已过期 -->
+                      <!-- 
                                               1、查看时不可操作
                                               2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
                                               3、处理中的订单显示发货，不显示禁用
                                             -->
-                                            <el-switch
-                                                v-if="scope.row.ship === 0 || dispose || isAdd "
-                                                v-auth="'/order:发货'"
-                                                style="margin-right:10px;"
-                                                v-model="scope.row.ship"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.ship ? '已发货' : '未发货'"
-                                                :disabled="viewDisabled"
-                                                @change="handleDeliver($event,scope.row,4)">
-                                            </el-switch>
-                                            <el-switch
-                                                v-else
-                                                :disabled="viewDisabled"
-                                                v-model="scope.row.isEnable"
-                                                :active-value="1"
-                                                :inactive-value="0"
-                                                :active-text="scope.row.isEnable ? '启用' : '禁用'"
-                                                @change="handleEnable($event,scope.row,4)">
-                                            </el-switch>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </el-card>
-                    <!-- 合同 -->
-                    <el-card shadow="hover" class="mgb20">
-                        <div>
-                            <div class="flex-center mgb20 user_header">
-                                <p class="addhr_tag"></p>
-                                <span>合同信息</span>
-                            </div>
-                            <div>
-                                <el-form :disabled="viewDisabled" ref="contract" :model="contract" :rules="rules"
-                                         label-width="80px">
-                                    <el-col :span="8" :offset="4">
-                                        <el-form-item label="合同名称">
-                                            <el-input v-model="contract.contractName" placeholder="请输入合同名称"></el-input>
-                                        </el-form-item>
-
-                                        <el-form-item label="合同金额" prop="contractInformationSum">
-                                            <el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                                                      v-model="contract.contractMoney" placeholder="请输入合同金额"></el-input>
-                                        </el-form-item>
-                                    </el-col>
+                      <el-switch v-if="scope.row.ship === 0 || dispose || isAdd "
+                                 v-auth="'/order:发货'"
+                                 style="margin-right:10px;"
+                                 v-model="scope.row.ship"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.ship ? '已发货' : '未发货'"
+                                 :disabled="viewDisabled"
+                                 @change="handleDeliver($event,scope.row,4)">
+                      </el-switch>
+                      <el-switch v-else
+                                 :disabled="viewDisabled"
+                                 v-model="scope.row.isEnable"
+                                 :active-value="1"
+                                 :inactive-value="0"
+                                 :active-text="scope.row.isEnable ? '启用' : '禁用'"
+                                 @change="handleEnable($event,scope.row,4)">
+                      </el-switch>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
+          <!-- 合同 -->
+          <el-card shadow="hover"
+                   class="mgb20">
+            <div>
+              <div class="flex-center mgb20 user_header">
+                <p class="addhr_tag"></p>
+                <span>合同信息</span>
+              </div>
+              <div>
+                <el-form :disabled="viewDisabled"
+                         ref="contract"
+                         :model="contract"
+                         :rules="rules"
+                         label-width="80px">
+                  <el-col :span="8"
+                          :offset="4">
+                    <el-form-item label="合同名称">
+                      <el-input v-model="contract.contractName"
+                                placeholder="请输入合同名称"></el-input>
+                    </el-form-item>
 
+                    <el-form-item label="合同金额"
+                                  prop="contractInformationSum">
+                      <el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                                v-model="contract.contractMoney"
+                                placeholder="请输入合同金额"></el-input>
+                    </el-form-item>
+                  </el-col>
 
-                                    <el-col :span="8" :offset="2">
-                                        <el-form-item label="合同编号">
-                                            <el-input v-model="contract.contractNumber"
-                                                      placeholder="请输入合同编号"></el-input>
-                                        </el-form-item>
-                                        <el-form-item label="合同期限">
-                                            <div class="contractDate">
-                                                <el-date-picker
-                                                    v-model="contractTime"
-                                                    style="wifth:100%"
-                                                    type="daterange"
-                                                    value-format="yyyy-MM-dd"
-                                                    @change="contractTimeChange"
-                                                    range-separator="至"
-                                                    start-placeholder="开始日期"
-                                                    end-placeholder="结束日期">
-                                                </el-date-picker>
-                                            </div>
-                                        </el-form-item>
+                  <el-col :span="8"
+                          :offset="2">
+                    <el-form-item label="合同编号">
+                      <el-input v-model="contract.contractNumber"
+                                placeholder="请输入合同编号"></el-input>
+                    </el-form-item>
+                    <el-form-item label="合同期限">
+                      <div class="contractDate">
+                        <el-date-picker v-model="contractTime"
+                                        style="wifth:100%"
+                                        type="daterange"
+                                        value-format="yyyy-MM-dd"
+                                        @change="contractTimeChange"
+                                        range-separator="至"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期">
+                        </el-date-picker>
+                      </div>
+                    </el-form-item>
 
-                                    </el-col>
-                                    <el-col :span="24" :offset="4" class="flex-start">
-                                        <el-form-item label="上传合同">
-                                            <el-upload
-                                                class="contract"
-                                                :headers="{token}"
-                                                :on-remove="handleRemove"
-                                                :on-error="uploadError"
-                                                :on-success="uploadSuccess"
-                                                :before-upload="beforeAvatarUpload"
-                                                :before-remove="beforeRemove"
-                                                :limit="1"
-                                                :on-exceed="handleExceed"
-                                                :action="api.fileupload"
-                                                :file-list="uploadList"
-                                            >
-                                                <el-button size="medium" type="plain" class="uploadTitle">上传</el-button>
-                                            </el-upload>
-                                        </el-form-item>
-                                        <!-- <el-form-item>
+                  </el-col>
+                  <el-col :span="24"
+                          :offset="4"
+                          class="flex-start">
+                    <el-form-item label="上传合同">
+                      <el-upload class="contract"
+                                 :headers="{token}"
+                                 :on-remove="handleRemove"
+                                 :on-error="uploadError"
+                                 :on-success="uploadSuccess"
+                                 :before-upload="beforeAvatarUpload"
+                                 :before-remove="beforeRemove"
+                                 :limit="1"
+                                 :on-exceed="handleExceed"
+                                 :action="api.fileupload"
+                                 :file-list="uploadList">
+                        <el-button size="medium"
+                                   type="plain"
+                                   class="uploadTitle">上传</el-button>
+                      </el-upload>
+                    </el-form-item>
+                    <!-- <el-form-item>
                                             <el-button size="medium" type="plain" style="height:40px">重新上传</el-button>
                                         </el-form-item>                   -->
-                                    </el-col>
-                                </el-form>
-                            </div>
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
+                  </el-col>
+                </el-form>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
 
-            <!-- 选择课程弹框-->
-            <el-dialog :visible.sync="practicalCourseVisible" width="50%" center :close-on-click-modal="false" @close="closeJCourse">
-                <div class="flex-between mgb20">
-                    <div class="flex-center">
-                        <p class="addhr_tag"></p>
-                        <span>{{ classificationId | dialogTitle}}</span>
-                    </div>
-                    <div>
-                        <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model.trim="practicalCourseName" clearable></el-input>
-                    </div>
+      <!-- 选择课程弹框-->
+      <el-dialog :visible.sync="practicalCourseVisible"
+                 width="50%"
+                 center
+                 :close-on-click-modal="false"
+                 @close="closeJCourse">
+        <div class="flex-between mgb20">
+          <div class="flex-center">
+            <p class="addhr_tag"></p>
+            <span>{{ classificationId | dialogTitle}}</span>
+          </div>
+          <div>
+            <el-input placeholder="请输入产品名称"
+                      prefix-icon="el-icon-search"
+                      v-model.trim="practicalCourseName"
+                      clearable></el-input>
+          </div>
+        </div>
+        <el-table v-loading="dataLoading"
+                  :data="practicalCourseList"
+                  stripe
+                  header-align="center"
+                  @selection-change="practicalCoursesSelection"
+                  row-key="mallId">
+          <el-table-column type="selection"
+                           :selectable="practicalCoursesSelectable"
+                           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>
+          <el-table-column prop="typeName"
+                           label="产品类型"
+                           align="center"></el-table-column>
+          <el-table-column prop="supplierName"
+                           label="厂商"
+                           align="center"></el-table-column>
+          <el-table-column prop="professionalClassName"
+                           label="专业类"
+                           align="center"></el-table-column>
+          <el-table-column prop="professionalName"
+                           label="专业"
+                           align="center"></el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination background
+                         layout="total, prev, pager, next"
+                         :total="practicalCourseTotals"
+                         @current-change="practicalCoursesChange"
+                         :current-page="practicalCoursePage">
+          </el-pagination>
+        </div>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="practicalCourseVisible = false">取 消</el-button>
+          <el-button type="primary"
+                     v-preventReClick
+                     @click="practicalCourseSubmit">确 定</el-button>
+        </span>
+      </el-dialog>
+
+      <!-- 选择IP -->
+      <el-dialog :visible.sync="ipVisible"
+                 width="70%"
+                 center>
+        <div class="flex-center mgb20">
+          <p class="hr_tag"></p>
+          <span>地址列表</span>
+        </div>
+        <el-table :data="IPData"
+                  stripe
+                  header-align="center">
+          <el-table-column type="index"
+                           width="100"
+                           label="序号"
+                           align="center">
+          </el-table-column>
+          <el-table-column prop="age"
+                           label="服务器名称"
+                           align="center">
+          </el-table-column>
+          <el-table-column label="IP"
+                           align="center">
+            <template slot-scope="scope">
+              <div class="tab_temp">
+                <div class="flex-center">
+                  <label>内网:</label>
+                  <el-input v-model="scope.row.Intranet"
+                            placeholder="请输入IP地址"></el-input>
                 </div>
-                <el-table v-loading="dataLoading" :data="practicalCourseList" stripe header-align="center"
-                          @selection-change="practicalCoursesSelection" row-key="mallId">
-                    <el-table-column type="selection" :selectable="practicalCoursesSelectable" 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>
-                    <el-table-column prop="typeName" label="产品类型" align="center"></el-table-column>
-                    <el-table-column prop="supplierName" label="厂商" align="center"></el-table-column>
-                    <el-table-column prop="professionalClassName" label="专业类" align="center"></el-table-column>
-                    <el-table-column prop="professionalName" label="专业" align="center"></el-table-column>
-                </el-table>
-                <div class="pagination">
-                    <el-pagination background layout="total, prev, pager, next" :total="practicalCourseTotals"
-                                   @current-change="practicalCoursesChange" :current-page="practicalCoursePage">
-                    </el-pagination>
+                <div class="flex-center mar10">
+                  <label>外网:</label>
+                  <el-input v-model="scope.row.extranet"
+                            placeholder="请输入端口号"></el-input>
                 </div>
-                <span slot="footer" class="dialog-footer">
-                    <el-button @click="practicalCourseVisible = false">取 消</el-button>
-                    <el-button type="primary" v-preventReClick @click="practicalCourseSubmit">确 定</el-button>
-                </span>
-            </el-dialog>
-
-            <!-- 选择IP -->
-            <el-dialog :visible.sync="ipVisible" width="70%" center>
-                <div class="flex-center mgb20">
-                    <p class="hr_tag"></p>
-                    <span>地址列表</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="端口"
+                           align="center">
+            <template slot-scope="scope">
+              <div class="tab_temp">
+                <div class="flex-center">
+                  <label>内网:</label>
+                  <el-input v-model="scope.row.Intranet"
+                            placeholder="请输入内网IP地址"></el-input>
                 </div>
-                <el-table :data="IPData" stripe header-align="center">
-                    <el-table-column type="index" width="100" label="序号" align="center">
-                    </el-table-column>
-                    <el-table-column prop="age" label="服务器名称" align="center">
-                    </el-table-column>
-                    <el-table-column label="IP" align="center">
-                        <template slot-scope="scope">
-                            <div class="tab_temp">
-                                <div class="flex-center">
-                                    <label>内网:</label>
-                                    <el-input v-model="scope.row.Intranet" placeholder="请输入IP地址"></el-input>
-                                </div>
-                                <div class="flex-center mar10">
-                                    <label>外网:</label>
-                                    <el-input v-model="scope.row.extranet" placeholder="请输入端口号"></el-input>
-                                </div>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="端口" align="center">
-                        <template slot-scope="scope">
-                            <div class="tab_temp">
-                                <div class="flex-center">
-                                    <label>内网:</label>
-                                    <el-input v-model="scope.row.Intranet" placeholder="请输入内网IP地址"></el-input>
-                                </div>
-                                <div class="flex-center mar10">
-                                    <label>外网:</label>
-                                    <el-input v-model="scope.row.extranet" placeholder="请输入外网IP地址"></el-input>
-                                </div>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="选择" align="center">
-                        <template slot-scope="scope">
-                            <i class="el-icon-success radio_icon"></i>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <span slot="footer" class="dialog-footer">
-                    <el-button @click="ipVisible = false">取 消</el-button>
-                    <el-button type="primary" @click="IPSure()">确 定</el-button>
-                </span>
-            </el-dialog>
-        </div>
-        <!-- 选择客户 -->
-        <select-client ref="client" @back="backToOrder" v-show="showSelectClient" :refresh="showSelectClient"></select-client>
-
-        <el-dialog title="发货信息填写" :visible.sync="shipVisible" width="380px" class="dialog" :close-on-click-modal="false">
-            <el-input :disabled="viewDisabled" v-model="shipContent" placeholder="请填写需交付的产品登录地址、账号、密码等内容...（300个字以内）" type="textarea" :rows="10" maxlength="300"></el-input>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="shipVisible = false">取消</el-button>
-                <el-button v-if="!viewDisabled" type="primary" @click="submitShip">确定</el-button>
-            </span>
-        </el-dialog>
+                <div class="flex-center mar10">
+                  <label>外网:</label>
+                  <el-input v-model="scope.row.extranet"
+                            placeholder="请输入外网IP地址"></el-input>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="选择"
+                           align="center">
+            <template slot-scope="scope">
+              <i class="el-icon-success radio_icon"></i>
+            </template>
+          </el-table-column>
+        </el-table>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="ipVisible = false">取 消</el-button>
+          <el-button type="primary"
+                     @click="IPSure()">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
+    <!-- 选择客户 -->
+    <select-client ref="client"
+                   @back="backToOrder"
+                   v-show="showSelectClient"
+                   :refresh="showSelectClient"></select-client>
+
+    <el-dialog title="发货信息填写"
+               :visible.sync="shipVisible"
+               width="380px"
+               class="dialog"
+               :close-on-click-modal="false">
+      <el-input :disabled="viewDisabled"
+                v-model="shipContent"
+                placeholder="请填写需交付的产品登录地址、账号、密码等内容...（300个字以内）"
+                type="textarea"
+                :rows="10"
+                maxlength="300"></el-input>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="shipVisible = false">取消</el-button>
+        <el-button v-if="!viewDisabled"
+                   type="primary"
+                   @click="submitShip">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import selectClient from "./selectClient.vue";
 
 export default {
-    components: {
-        selectClient
-    },
-    data() {
-        return {
-            // authority: 权限。0数据平台，1为课程，2职站增值模块，3实训课程（非集成），4实验工具
-            deliverShow: ['pageTypes', 'dataPageTypes', 'modelPageTypes', 'practiceCourseTypes', 'expToolTypes','theoryCourse'],
-            listName: [
-              {
-                id: 1,
-                name: 'coursePermissions'
-              },
-              {
-                id: 2,
-                name: 'theoryCourseList'
-              },
-              {
-                id: 3,
-                name: 'valuePermissions'
-              },
-              {
-                id: 4,
-                name: 'practicalCourses'
-              },
-              {
-                id: 5,
-                name: 'dataPlatformPermissions'
-              },
-              {
-                id: 6,
-                name: 'expTools'
-              },
-            ],
-            pageTypes: false,
-            dataPageTypes: false,
-            modelPageTypes:false,
-            practiceCourseTypes:false,
-            expToolTypes:false,
-            theoryCourse: false,
-            loading: false,// 页面加载
-            isAdd: false, // 是否添加
-            viewDisabled: false,// 查看禁用
-            editDisabled: false,// 编辑禁用
-            renewDisabled: false,// 续费禁用
-            dataLoading: false,// 产品弹框加载
-            whetherSubmit: false,/* 提交否 */
-            dispose:false,
-            showSelectClient: false,// 切换展示选择客户页
-            form: {// 基本信息
-                // orderNumber: '',// 编号
-                provinceId: "",// 省份id
-                orderContact: "",// 联系人
-                email: "",
-                customerId: "",// 客户id
-                orderType: "",
-                cityId: "",
-                phone: "",
-                orderAmount: 0,
-                // orderId: this.$store.state.orderId,
-                customerName: "",// 客户名称
-                teamId: '',
-                businessManagerId: '',
-                profit: 0, // 利润
-                purchaseCost: 0, // 采购成本
-            },
-            coursePermissions: [],// 课程权限
-            dataPlatformPermissions: [],// 数据平台权限
-            valuePermissions: [],
-            practicalCourses: [],
-            expTools: [],
-            contract: { // 合同信息
-                contractName: "",   // 合同名称
-                contractFile: "",  // 合同文件
-                contractMoney: "", // 合同金额
-                contractNumber: "",// 合同编号
-                startTime: "",     // 期限-头
-                endTime: ""       // 期限-尾
-                // orderId: '',       // 绑定订单id
-            },
-            value1:'',
-            contractTime: [],// 合同起止日期绑定值
-            token: "",
-            orderOther: {// 订单其他数据
-            },
-            uploadList: [],
-            rules: {
-                orderNumber: [
-                    { required: true, message: "请输入订单编号", trigger: "blur" }
-                ],
-                customerName: [
-                    { required: true, message: "请选择订单客户", trigger: "change" }
-                ],
-                orderContact: [
-                    { required: true, message: "请输入联系人姓名", trigger: "blur" }
-                ],
-                orderType: [
-                    { required: true, message: "请选择订单类型", trigger: "change" }
-                ],
-                phone: [
-                    { required: true, message: "请输入手机号", trigger: "blur" },
-                    {
-                        pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
-                        message: "请输入正确的手机号",
-                        trigger: "blur"
-                    }
-                ],
-                email: [
-                    { required: true, message: "请输入邮箱地址", trigger: "blur" },
-                    {
-                        pattern: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ],
-                orderAmount: [
-                    // { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
-                    { required: true, message: "请输入订单金额", trigger: "blur" }
-                    // { pattern: /(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0)$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/, message: '请输入正确金额格式,可保留两位小数', trigger: 'blur'}
-                ]
-            },
-            orderTypeList: [{
-                name: "正式",
-                value: 1
-            },
-                {
-                    name: "试用",
-                    value: 2
-                }],
-            provinceList: this.$store.state.provinceList,
-            cityList: [],
-            schoolList: [],
-            teams: [],
-            bmList: [],
-            yearList: [
-                { name: "1个月", value: 30 },
-                { name: "2个月", value: 60 },
-                { name: "3个月", value: 90 },
-                { name: "1年", value: 365 },
-                { name: "2年", value: 730 },
-                { name: "3年", value: 1095 }
-            ],
-            // 课程权限弹框
-            courseVisible: false,
-            courseTotals: 0,
-            coursePage: 1,
-            courseList: [],
-            courseSelection: [],
-            curriculumName: "",
-            curriculumTypeKeys: {
-                0: "理论",
-                1: "实训"
-            }, // 课程类别
-            ipVisible: false,
-            IPData: [
-                {
-                    id: 1,
-                    age: "小额贷系统",
-                    storeName: "1个月",
-                    total: "2019.01.02 11:00",
-                    payamount: "2019.01.02 11:00",
-                    swtich: true,
-                    Intranet: "10.20.202.1",
-                    extranet: "10.20.202.1"
-                },
-                {
-                    id: 2,
-                    age: "小额贷系统",
-                    storeName: "1个月",
-                    total: "2019.01.02 11:00",
-                    payamount: "2019.01.02 11:00",
-                    swtich: true,
-                    Intranet: "",
-                    extranet: ""
-                }
-            ],
-            curArr: "",
-            test: [],
-            // 数据平台权限弹框
-            showPlatform: false,// 弹框显示
-            platfromTotals: 0,// 列表条目
-            platfromPage: 1,// 页码
-            platformList: [],// 数据平台列表
-            platformSelect: [],// 数据平台弹框选中
-            productName: "",// 搜索产品名称
+  components: {
+    selectClient
+  },
+  data () {
+    return {
+      // authority: 权限。0数据平台，1为课程，2职站增值模块，3实训课程（非集成），4实验工具
+      deliverShow: ['pageTypes', 'dataPageTypes', 'modelPageTypes', 'practiceCourseTypes', 'expToolTypes', 'theoryCourse'],
+      listName: [
+        {
+          id: 1,
+          name: 'coursePermissions'
+        },
+        {
+          id: 2,
+          name: 'theoryCourseList'
+        },
+        {
+          id: 3,
+          name: 'valuePermissions'
+        },
+        {
+          id: 4,
+          name: 'practicalCourses'
+        },
+        {
+          id: 5,
+          name: 'dataPlatformPermissions'
+        },
+        {
+          id: 6,
+          name: 'expTools'
+        },
+      ],
+      pageTypes: false,
+      dataPageTypes: false,
+      modelPageTypes: false,
+      practiceCourseTypes: false,
+      expToolTypes: false,
+      theoryCourse: false,
+      loading: false,// 页面加载
+      isAdd: false, // 是否添加
+      viewDisabled: false,// 查看禁用
+      editDisabled: false,// 编辑禁用
+      renewDisabled: false,// 续费禁用
+      dataLoading: false,// 产品弹框加载
+      whetherSubmit: false,/* 提交否 */
+      dispose: false,
+      showSelectClient: false,// 切换展示选择客户页
+      form: {// 基本信息
+        // orderNumber: '',// 编号
+        provinceId: "",// 省份id
+        orderContact: "",// 联系人
+        email: "",
+        customerId: "",// 客户id
+        orderType: "",
+        cityId: "",
+        phone: "",
+        orderAmount: 0,
+        // orderId: this.$store.state.orderId,
+        customerName: "",// 客户名称
+        teamId: '',
+        businessManagerId: '',
+        profit: 0, // 利润
+        purchaseCost: 0, // 采购成本
+      },
+      coursePermissions: [],// 课程权限
+      dataPlatformPermissions: [],// 数据平台权限
+      valuePermissions: [],
+      practicalCourses: [],
+      expTools: [],
+      contract: { // 合同信息
+        contractName: "",   // 合同名称
+        contractFile: "",  // 合同文件
+        contractMoney: "", // 合同金额
+        contractNumber: "",// 合同编号
+        startTime: "",     // 期限-头
+        endTime: ""       // 期限-尾
+        // orderId: '',       // 绑定订单id
+      },
+      value1: '',
+      contractTime: [],// 合同起止日期绑定值
+      token: "",
+      orderOther: {// 订单其他数据
+      },
+      uploadList: [],
+      rules: {
+        orderNumber: [
+          { required: true, message: "请输入订单编号", trigger: "blur" }
+        ],
+        customerName: [
+          { required: true, message: "请选择订单客户", trigger: "change" }
+        ],
+        orderContact: [
+          { required: true, message: "请输入联系人姓名", trigger: "blur" }
+        ],
+        orderType: [
+          { required: true, message: "请选择订单类型", trigger: "change" }
+        ],
+        phone: [
+          { required: true, message: "请输入手机号", trigger: "blur" },
+          {
+            pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        email: [
+          { required: true, message: "请输入邮箱地址", trigger: "blur" },
+          {
+            pattern: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+            message: "请输入正确的邮箱",
+            trigger: "blur"
+          }
+        ],
+        orderAmount: [
+          // { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
+          { required: true, message: "请输入订单金额", trigger: "blur" }
+          // { pattern: /(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0)$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/, message: '请输入正确金额格式,可保留两位小数', trigger: 'blur'}
+        ]
+      },
+      orderTypeList: [{
+        name: "正式",
+        value: 1
+      },
+      {
+        name: "试用",
+        value: 2
+      }],
+      provinceList: this.$store.state.provinceList,
+      cityList: [],
+      schoolList: [],
+      teams: [],
+      bmList: [],
+      yearList: [
+        { name: "1个月", value: 30 },
+        { name: "2个月", value: 60 },
+        { name: "3个月", value: 90 },
+        { name: "1年", value: 365 },
+        { name: "2年", value: 730 },
+        { name: "3年", value: 1095 }
+      ],
+      // 课程权限弹框
+      courseVisible: false,
+      courseTotals: 0,
+      coursePage: 1,
+      courseList: [],
+      courseSelection: [],
+      curriculumName: "",
+      curriculumTypeKeys: {
+        0: "理论",
+        1: "实训"
+      }, // 课程类别
+      ipVisible: false,
+      IPData: [
+        {
+          id: 1,
+          age: "小额贷系统",
+          storeName: "1个月",
+          total: "2019.01.02 11:00",
+          payamount: "2019.01.02 11:00",
+          swtich: true,
+          Intranet: "10.20.202.1",
+          extranet: "10.20.202.1"
+        },
+        {
+          id: 2,
+          age: "小额贷系统",
+          storeName: "1个月",
+          total: "2019.01.02 11:00",
+          payamount: "2019.01.02 11:00",
+          swtich: true,
+          Intranet: "",
+          extranet: ""
+        }
+      ],
+      curArr: "",
+      test: [],
+      // 数据平台权限弹框
+      showPlatform: false,// 弹框显示
+      platfromTotals: 0,// 列表条目
+      platfromPage: 1,// 页码
+      platformList: [],// 数据平台列表
+      platformSelect: [],// 数据平台弹框选中
+      productName: "",// 搜索产品名称
 
-            valueVisible: false,
-            valueCheck: [],
-            
-            // 实训课程弹框
-            practicalCourseVisible: false,// 弹框显示
-            practicalCourseTotals: 0,// 列表条目
-            practicalCoursePage: 1,// 页码
-            practicalCourseList: [],
-            practicalCourseSelect: [],
-            practicalCourseName: '',
+      valueVisible: false,
+      valueCheck: [],
 
-            
-            // 实验工具弹框
-            expToolVisible: false,// 弹框显示
-            expToolTotals: 0,// 列表条目
-            expToolPage: 1,// 页码
-            expToolList: [],
-            expToolSelect: [],
-            expToolName: '',
+      // 实训课程弹框
+      practicalCourseVisible: false,// 弹框显示
+      practicalCourseTotals: 0,// 列表条目
+      practicalCoursePage: 1,// 页码
+      practicalCourseList: [],
+      practicalCourseSelect: [],
+      practicalCourseName: '',
 
-            searchTimer: null,
-            titlesw:'',
-            orderRepeat: [],
-            repeatMsg: '',
-            clients: [],
-            valueList: [],
-            rate: '',
-            shipVisible: false,
-            shipContent: '',
-            curRow: {},
-            // 用于区分栏目 1实训课程 2理论课程 3职站增值应用 4实训课程（非集成）5数据前瞻 6实验工具
-            classificationId: 0,
-            // 理论课程数据
-            theoryCourseList: []
-        };
-    },
-    watch: {
-        practicalCourseName(n) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.getPracticalCourses();
-            }, 500);
-        },
+
+      // 实验工具弹框
+      expToolVisible: false,// 弹框显示
+      expToolTotals: 0,// 列表条目
+      expToolPage: 1,// 页码
+      expToolList: [],
+      expToolSelect: [],
+      expToolName: '',
+
+      searchTimer: null,
+      titlesw: '',
+      orderRepeat: [],
+      repeatMsg: '',
+      clients: [],
+      valueList: [],
+      rate: '',
+      shipVisible: false,
+      shipContent: '',
+      curRow: {},
+      // 用于区分栏目 1实训课程 2理论课程 3职站增值应用 4实训课程（非集成）5数据前瞻 6实验工具
+      classificationId: 0,
+      // 理论课程数据
+      theoryCourseList: []
+    };
+  },
+  watch: {
+    practicalCourseName (n) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initCourses();
+      }, 500);
     },
-    async created() {
-        this.getTeam()
-        this.getClients()
-        this.token = sessionStorage.getItem("token");
-        // 处理添加状态
-        if (this.$route.query.val == 'isAdd') {
-            this.titlesw = '新建订单'
-            this.isAdd = true;
-            this.getCityData();// 取得城市
+  },
+  async created () {
+    this.getTeam()
+    this.getClients()
+    this.token = sessionStorage.getItem("token");
+    // 处理添加状态
+    if (this.$route.query.val == 'isAdd') {
+      this.titlesw = '新建订单'
+      this.isAdd = true;
+      this.getCityData();// 取得城市
+    }
+    // 处于查看状态
+    if (this.$route.query.val == 'watch') {
+      this.titlesw = '查看订单'
+      this.viewDisabled = true;
+      await this.getDetail(this.$route.query.orderId);
+    }
+    // 处于编辑状态
+    if (this.$route.query.val == 'edit') {
+      if (this.$route.query.orderStatus == 0) {
+        this.titlesw = '处理订单'
+        this.dispose = true;
+      } else {
+        this.titlesw = '修改订单'
+      }
+      this.editDisabled = true;
+      await this.getDetail(this.$route.query.orderId);
+    }
+    /* 处于续费状态 */
+    if (this.$route.query.val == 'renew') {
+      this.titlesw = '订单续费'
+      this.renewDisabled = true;
+      await this.getDetail(this.$route.query.orderId);
+    }
+  },
+  methods: {
+    // 读取页面详情
+    getDetail (id) {
+      this.$get(this.api.orderDetail, { orderId: +id }).then(res => {
+        let form = res.orderDetails.order;// 基本信息
+        let contract = res.orderDetails.contractInformation ? res.orderDetails.contractInformation : {}; // 合同
+        if (this.renewDisabled) { // 续费状态下，清空上个订单合同信息
+          this.contract = {
+            contractName: "",
+            contractFile: "",
+            contractMoney: "",
+            contractNumber: "",
+            startTime: "",
+            endTime: ""
+          };
+        } else {
+          this.contract = {
+            contractName: contract.contractName,
+            contractMoney: contract.contractMoney,
+            contractNumber: contract.contractNumber,
+            startTime: contract.startTime ? contract.startTime : "",
+            endTime: contract.endTime ? contract.endTime : "",
+            contractId: contract.contractId,
+            uploadList: {
+              name: contract.contractFile ? contract.contractFile.split("/").pop() : "",
+              url: contract.contractFile
+            }
+          };
+          if (contract.startTime && contract.endTime) {
+            this.contractTime = [contract.startTime, contract.endTime];
+          }
         }
-        // 处于查看状态
-        if (this.$route.query.val == 'watch') {
-            this.titlesw = '查看订单'
-            this.viewDisabled = true;
-            await this.getDetail(this.$route.query.orderId);
+        this.form = {
+          orderNumber: form.orderNumber,
+          createTime: form.createTime,
+          provinceId: form.provinceId,
+          orderContact: form.orderContact,
+          email: form.email,
+          customerId: form.customerId,
+          customerName: form.customerName,
+          orderType: form.orderType,
+          cityId: form.cityId,
+          phone: form.phone,
+          orderAmount: form.orderType === 2 ? 0 : form.orderAmount, // 如果是试用的订单，则订单金额显示为0
+          orderId: form.orderId,
+          options: form.options,
+          teamId: form.teamId,
+          profit: form.profit,
+          purchaseCost: form.purchaseCost,
+          businessManagerId: form.businessManagerId ? +form.businessManagerId : '',
+          businessManagerName: form.businessManagerName
+        };
+        this.$nextTick(() => {
+          form.provinceId && this.getCityData()
+          form.teamId && this.getBm()
+        });
+        const { orderOther } = res.orderDetails
+        const promises = []
+        const { customerId } = form
+        const list = []
+        if (orderOther.find(e => e.authority === 1)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 1,
+              customerId,
+              productId: orderOther.filter(e => e.authority === 1).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
         }
-        // 处于编辑状态
-        if (this.$route.query.val == 'edit') {
-            if(this.$route.query.orderStatus == 0){
-                this.titlesw = '处理订单'
-                this.dispose = true;
-            }else{
-                this.titlesw = '修改订单'
-            }
-            this.editDisabled = true;
-            await this.getDetail(this.$route.query.orderId);
+        if (orderOther.find(e => !e.authority)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 0,
+              customerId,
+              productId: orderOther.filter(e => !e.authority).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
         }
-        /* 处于续费状态 */
-        if (this.$route.query.val == 'renew') {
-            this.titlesw = '订单续费'
-            this.renewDisabled = true;
-            await this.getDetail(this.$route.query.orderId);
+        if (orderOther.find(e => e.authority === 2)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 2,
+              customerId,
+              productId: orderOther.filter(e => e.authority === 2).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
         }
+        if (orderOther.find(e => e.authority === 3)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 3,
+              customerId,
+              productId: orderOther.filter(e => e.authority === 3).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
+        }
+        if (orderOther.find(e => e.authority === 4)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 4,
+              // authority: 3,
+              customerId,
+              productId: orderOther.filter(e => e.authority === 4).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
+        }
+        if (orderOther.find(e => e.authority === 5)) {
+          promises.push(new Promise((resolve, reject) => {
+            this.$post(this.api.renew, {
+              authority: 5,
+              customerId,
+              productId: orderOther.filter(e => e.authority === 5).map(e => e.dataOrCourseId)
+            }).then(({ orderOthers }) => {
+              list.push(...orderOthers)
+              resolve()
+            }).catch(err => { })
+          }))
+        }
+        Promise.all(promises).then(_ => {
+          this.setStartDate(list, orderOther)
+        })
+      });
+    },
+    /**
+     * 订单类型更改触发的事件
+     * type 正式为1
+     *      试用为2
+     */
+    updateOrderType (type) {
+      console.log('options=>', type)
+      if (type == 1) {
+        this.coursePermissions.forEach(item => {
+          this.dealSettlePrice(item)
+        })
+      } else {
+        this.coursePermissions.forEach(item => {
+          item.finalPrice = 0
+          item.settlementPrice = 0
+        })
+      }
+    },
+    setStartDate (renewList, orderOther) {
+      let list = orderOther.map(e => {
+        e.settlementPriceUnit = e.settlementPrice
+        const now = Date.now()
+        const item = renewList.find(n => n.dataOrCourseId == e.dataOrCourseId && n.authority == e.authority) // 匹配renew接口返回的数据
+        console.log("🚀 ~ file: AddOrder.vue ~ line 946 ~ list ~ item", item)
+        // if (item) {
+        // 处于续费
+        const cur = item || e
+        if (this.renewDisabled) {
+          let end = Date.parse(cur.endTime);
+          if (now < end) {
+            let time = new Date(cur.endTime.split(" ")[0])
+            time = new Date(time.setDate(time.getDate() + 1))
+            e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+          } else {
+            const date = new Date()
+            // 过期
+            e.startTime = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+          }
+          e.endTime = "";
+          e.periodOfUse = "";
+        } else if (!this.viewDisabled) { // 如果不是查看
+          e.startTime = cur.startTime.split(" ")[0];
+          e.endTime = cur.endTime.split(" ")[0];
+        }
+        // }
+        if (item && this.renewDisabled) {
+          e.marketValue = item.marketValue
+        }
+        const startTime = new Date(e.startTime)
+        const endTime = new Date(e.endTime)
+        // 1: 未生效，2：生效中，3：已过期
+        e.status = now < startTime ?
+          1 :
+          now > startTime && now < endTime ?
+            2 :
+            3
+        if (e.status === 3) e.isEnable = 0 // 已过期的，变成禁用状态，且不能启用
+        return e;
+      });// 俩列表
+      this.coursePermissions = list.filter(i => i.authority === 1 && (i.mallClassificationId == 1 || !i.mallClassificationId));
+      this.theoryCourseList = list.filter(i => i.authority === 1 && i.mallClassificationId == 2);
+      this.dataPlatformPermissions = list.filter(i => i.authority === 0);
+      this.valuePermissions = list.filter(i => i.authority === 2);
+      this.practicalCourses = list.filter(i => i.authority === 3);
+      this.expTools = list.filter(i => i.authority === 4);
+    },
+    // 获取费率
+    getRate () {
+      this.$post(this.api.getPartnerTeamRates, {
+        teamId: this.form.teamId
+      }).then(({ teamRates }) => {
+        this.rate = teamRates.annualMarketingFee || 0
+      }).catch(res => { })
+    },
+    // 获取全部客户
+    getClients () {
+      // const sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
+      this.$post(this.api.queryCustomer, {
+        countries: this.form.countries,
+        provinceId: '',
+        cityId: '',
+        searchContent: '',
+        page: 1,
+        size: 1000,
+        // supplierId: sid ? sid.supplierId : ''
+      }).then(res => {
+        this.clients = res.message.list
+      }).catch(res => { })
     },
-    methods: {
-        // 读取页面详情
-        getDetail(id) {
-            this.$get(this.api.orderDetail, { orderId: +id }).then(res => {
-                let form = res.orderDetails.order;// 基本信息
-                let contract = res.orderDetails.contractInformation ? res.orderDetails.contractInformation : {}; // 合同
-                if (this.renewDisabled) { // 续费状态下，清空上个订单合同信息
-                    this.contract = {
-                        contractName: "",
-                        contractFile: "",
-                        contractMoney: "",
-                        contractNumber: "",
-                        startTime: "",
-                        endTime: ""
-                    };
-                } else {
-                    this.contract = {
-                        contractName: contract.contractName,
-                        contractMoney: contract.contractMoney,
-                        contractNumber: contract.contractNumber,
-                        startTime: contract.startTime ? contract.startTime : "",
-                        endTime: contract.endTime ? contract.endTime : "",
-                        contractId: contract.contractId,
-                        uploadList: {
-                            name: contract.contractFile ? contract.contractFile.split("/").pop() : "",
-                            url: contract.contractFile
-                        }
-                    };
-                    if (contract.startTime && contract.endTime) {
-                        this.contractTime = [contract.startTime, contract.endTime];
-                    }
-                }
-                this.form = {
-                    orderNumber: form.orderNumber,
-                    createTime: form.createTime,
-                    provinceId: form.provinceId,
-                    orderContact: form.orderContact,
-                    email: form.email,
-                    customerId: form.customerId,
-                    customerName: form.customerName,
-                    orderType: form.orderType,
-                    cityId: form.cityId,
-                    phone: form.phone,
-                    orderAmount: form.orderType === 2 ? 0 : form.orderAmount, // 如果是试用的订单，则订单金额显示为0
-                    orderId: form.orderId,
-                    options: form.options,
-                    teamId: form.teamId,
-                    profit: form.profit,
-                    purchaseCost: form.purchaseCost,
-                    businessManagerId: form.businessManagerId ? +form.businessManagerId : '',
-                    businessManagerName: form.businessManagerName
-                };
-                this.$nextTick(() => {
-                  form.provinceId && this.getCityData()
-                  form.teamId && this.getBm()
-                });
-                const { orderOther } = res.orderDetails
-                const promises = []
-                const { customerId } = form
-                const list = []
-                if (orderOther.find(e => e.authority === 1)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 1,
-                        customerId,
-                        productId: orderOther.filter(e => e.authority === 1).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                if (orderOther.find(e => !e.authority)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 0,
-                        customerId,
-                        productId: orderOther.filter(e => !e.authority).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                if (orderOther.find(e => e.authority === 2)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 2,
-                        customerId,
-                        productId: orderOther.filter(e => e.authority === 2).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                if (orderOther.find(e => e.authority === 3)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 3,
-                        customerId,
-                        productId: orderOther.filter(e => e.authority === 3).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                if (orderOther.find(e => e.authority === 4)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 4,
-                        // authority: 3,
-                        customerId,
-                        productId: orderOther.filter(e => e.authority === 4).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                if (orderOther.find(e => e.authority === 5)) {
-                  promises.push(new Promise((resolve, reject) => {
-                    this.$post(this.api.renew, {
-                        authority: 5,
-                        customerId,
-                        productId: orderOther.filter(e => e.authority === 5).map(e => e.dataOrCourseId)
-                    }).then(({ orderOthers }) => {
-                      list.push(...orderOthers)
-                      resolve()
-                    }).catch(err => {})
-                  }))
-                }
-                Promise.all(promises).then(_ => {
-                  this.setStartDate(list, orderOther)
-                })
+    // 刷新缓存
+    refreshCache () {
+      const { customerId } = this.form
+      const curClient = this.clients.find(e => e.customerId == customerId)
+      this.$post(`${this.api.refreshCache}?schoolId=${curClient ? curClient.schoolId : ''}`).then(res => { }).catch(res => { })
+    },
+    // 新增订单
+    submitOrder () {
+      let purchase = 0 // 总采购成本
+      let profit = 0 // 总利润
+      if (!this.coursePermissions.length && !this.theoryCourseList.length && !this.dataPlatformPermissions.length && !this.valuePermissions.length && !this.practicalCourses.length && !this.expTools.length) {
+        return this.$message.error("请选择产品权限后再确认订单");
+      } else {
+        // 课程权限参数校验
+        if (this.coursePermissions.length) {
+          let courseVerify =
+            this.coursePermissions.some(e => {
+              // if (!e.periodOfUse || e.finalPrice === '') {
+              if (!e.periodOfUse || e.finalPrice === '' || !e.startTime) {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
+              }
             });
-        },
-        /**
-         * 订单类型更改触发的事件
-         * type 正式为1
-         *      试用为2
-         */
-        updateOrderType(type) {
-            console.log('options=>',type)
-            if (type ==1) {
-                this.coursePermissions.forEach(item=>{
-                    this.dealSettlePrice(item)
-                })
-            }else {
-                this.coursePermissions.forEach(item=> {
-                    item.finalPrice =  0
-                    item.settlementPrice = 0
-                })
-            }
-        },
-        setStartDate(renewList, orderOther) {
-            let list = orderOther.map(e => {
-                e.settlementPriceUnit = e.settlementPrice
-                const now = Date.now()
-                const item = renewList.find(n => n.dataOrCourseId == e.dataOrCourseId && n.authority == e.authority) // 匹配renew接口返回的数据
-                console.log("🚀 ~ file: AddOrder.vue ~ line 946 ~ list ~ item", item)
-                // if (item) {
-                    // 处于续费
-                    const cur = item || e
-                    if (this.renewDisabled) {
-                        let end = Date.parse(cur.endTime);
-                        if (now < end) {
-                            let time = new Date(cur.endTime.split(" ")[0])
-                            time = new Date(time.setDate(time.getDate() + 1))
-                            e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-                        } else {
-                          const date = new Date()
-                          // 过期
-                          e.startTime = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
-                        }
-                        e.endTime = "";
-                        e.periodOfUse = "";
-                    } else if (!this.viewDisabled) { // 如果不是查看
-                        e.startTime = cur.startTime.split(" ")[0];
-                        e.endTime = cur.endTime.split(" ")[0];
-                    }
-                // }
-                if (item && this.renewDisabled) {
-                  e.marketValue = item.marketValue
-                }
-                const startTime = new Date(e.startTime)
-                const endTime = new Date(e.endTime)
-                // 1: 未生效，2：生效中，3：已过期
-                e.status = now < startTime ?
-                  1 :
-                  now > startTime && now < endTime ?
-                    2 :
-                    3
-                if (e.status === 3) e.isEnable = 0 // 已过期的，变成禁用状态，且不能启用
-                return e;
-            });// 俩列表
-            this.coursePermissions = list.filter(i => i.authority === 1 && (i.mallClassificationId == 1 || !i.mallClassificationId));
-            this.theoryCourseList = list.filter(i => i.authority === 1 && i.mallClassificationId == 2);
-            this.dataPlatformPermissions = list.filter(i => i.authority === 0);
-            this.valuePermissions = list.filter(i => i.authority === 2);
-            this.practicalCourses = list.filter(i => i.authority === 3);
-            this.expTools = list.filter(i => i.authority === 4);
-        },
-        // 获取费率
-        getRate() {
-          this.$post(this.api.getPartnerTeamRates, {
-            teamId: this.form.teamId
-          }).then(({ teamRates }) => {
-            this.rate = teamRates.annualMarketingFee || 0
-          }).catch(res => {})
-        },
-        // 获取全部客户
-        getClients() {
-          // const sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
-          this.$post(this.api.queryCustomer, {
-            countries: this.form.countries,
-            provinceId: '',
-            cityId: '',
-            searchContent: '',
-            page: 1,
-            size: 1000,
-            // supplierId: sid ? sid.supplierId : ''
-          }).then(res => {
-            this.clients = res.message.list
-          }).catch(res => {})
-        },
-        // 刷新缓存
-        refreshCache() {
-          const { customerId } = this.form
-          const curClient = this.clients.find(e => e.customerId == customerId)
-          this.$post(`${this.api.refreshCache}?schoolId=${curClient ? curClient.schoolId : ''}`).then(res => {}).catch(res => {})
-        },
-        // 新增订单
-        submitOrder() {
-            let purchase = 0 // 总采购成本
-            let profit = 0 // 总利润
-            if (!this.coursePermissions.length && !this.theoryCourseList.length && !this.dataPlatformPermissions.length && !this.valuePermissions.length && !this.practicalCourses.length && !this.expTools.length) {
-                return this.$message.error("请选择产品权限后再确认订单");
-            } else {
-                // 课程权限参数校验
-                if (this.coursePermissions.length) {
-                    let courseVerify =
-                        this.coursePermissions.some(e => {
-                            // if (!e.periodOfUse || e.finalPrice === '') {
-                            if (!e.periodOfUse || e.finalPrice === '' || !e.startTime) {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!courseVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把课程参数输入完整");
-                    }
-                }
-                if (this.theoryCourseList.length) {
-                    let courseVerify =
-                        this.theoryCourseList.some(e => {
-                            // if (!e.periodOfUse || e.finalPrice === '') {
-                            if (!e.periodOfUse || e.finalPrice === '' || !e.startTime) {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!courseVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把课程参数输入完整");
-                    }
-                }
-                // 数据平台权限参数校验
-                if (this.dataPlatformPermissions.length) {
-                    let dataVerify =
-                        this.dataPlatformPermissions.some(e => {
-                            if (!e.periodOfUse || e.finalPrice === '' || !e.accountNum || e.settlementPrice === '') {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!dataVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把产品参数输入完整");
-                    }
-                }
-                if (this.valuePermissions.length) {
-                    let courseVerify =
-                        this.valuePermissions.some(e => {
-                            if (!e.periodOfUse || e.finalPrice === '') {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!courseVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把课程参数输入完整");
-                    }
-                }
-                if (this.practicalCourses.length) {
-                    let courseVerify =
-                        this.practicalCourses.some(e => {
-                            if (!e.periodOfUse || e.finalPrice === '') {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!courseVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把课程参数输入完整");
-                    }
-                }
-                if (this.expTools.length) {
-                    let courseVerify =
-                        this.expTools.some(e => {
-                            if (!e.periodOfUse || e.finalPrice === '') {
-                                return false;
-                            } else {
-                                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
-                                purchase += curPurchase
-                                profit += +e.finalPrice - curPurchase
-                                return true;
-                            }
-                        });
-                    if (!courseVerify) {
-                        this.whetherSubmit = true;
-                        setTimeout(() => {
-                            this.whetherSubmit = false;
-                        }, 4000);
-                        return this.$message.error("请把课程参数输入完整");
-                    }
-                }
-            }
-            this.$refs["form"].validate((valid) => {
-                if (valid) {
-                    if (this.orderRepeat.length) return this.$message.error(this.repeatMsg)
-                    let tempArr = [...this.dataPlatformPermissions, ...this.coursePermissions, ...this.valuePermissions, ...this.practicalCourses, ...this.expTools,...this.theoryCourseList];
-                    console.log('tempArr=>',tempArr)
-                    let renew = tempArr.some(e => e.renew);
-                    if (this.renewDisabled || renew) {/* 续费状态下 */
-                        this.form.orderNature = 2;
-                        if (renew) {
-                            tempArr.forEach(e => {
-                                if (e.renew) delete e.renew
-                            });
-                        }
-                    }
-                    tempArr.forEach(e => {
-                      const time = new Date(e.startTime)
-                      e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-                    })
-                    const { form } = this
-                    form.purchaseCost = Math.round(purchase)
-                    form.profit = Math.round(profit)
-                    let param = {
-                        contractInformation: this.contract,//合同信息
-                        order: form,// 订单基本数据
-                        orderOther: tempArr//俩列表
-                    };
-                    this.loading = true;
-                    console.log(param)
-                    if (this.editDisabled) {
-                        this.$post(this.api.orderUpdate, param).then(res => {
-                            this.refreshCache()
-                            this.$message.success("修改成功");
-                            this.loading = false;
-                            this.$router.back();
-                        }).catch(err => {
-                            this.loading = false;
-                        });
-                    } else {
-                        this.$post(this.api.orderAdd, param).then(res => {
-                            this.refreshCache()
-                            this.$message.success("添加订单成功");
-                            this.loading = false;
-                            this.renewDisabled ? this.$router.push('/order') : this.$router.back();
-                        }).catch(err => {
-                            this.loading = false;
-                        });
-                    }
-                } else {
-                    this.$message("请填上必填项");
-                    return false;
-                }
+          if (!courseVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把课程参数输入完整");
+          }
+        }
+        if (this.theoryCourseList.length) {
+          let courseVerify =
+            this.theoryCourseList.some(e => {
+              // if (!e.periodOfUse || e.finalPrice === '') {
+              if (!e.periodOfUse || e.finalPrice === '' || !e.startTime) {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
+              }
             });
-        },
-        // 处理orderRepeat里的id
-        handleOrderRepeat(id) {
-          this.orderRepeat.includes(id) && this.orderRepeat.splice(this.orderRepeat.findIndex(e => e == id), 1)
-        },
-        /* 处理0开头的期限 */
-        zero(e, row) {
-            if (e[0] == "0") {
-                row.periodOfUse = e.substring(1);
-                this.zero(row.periodOfUse, row);
-            }
-        },
-        // 订单客户框触发选择页面
-        gotoClient() {
-            this.showSelectClient = !this.showSelectClient;
-        },
-        // 选择客户返回传值
-        backToOrder(val) {
-            this.showSelectClient = !this.showSelectClient;
-            if (val.customerId) {
-                this.form.customerName = val.customerName;
-                this.form.customerId = val.customerId;
-                this.form.phone = val.phone;
-                this.form.email = val.email;
-                this.form.orderContact = val.name;
-                this.$get(this.api.queryCustomerDetails, { customerId: val.customerId }).then(res => {
-                    this.form.provinceId = res.result.customer.provinceId;
-                    this.form.cityId = res.result.customer.cityId;
-                    this.getCityData();
-                    this.getSettlemennt()
-                });
-                this.$forceUpdate();
-            }
-        },
-        // 更换了订单客户后重新获取结算价
-        getSettlemennt() {
-          const list = []
-          this.listName.map(e => e.name).forEach(e => {
-            list.push(...this[e])
-          })
-          console.log("🚀 ~ file: AddOrder.vue:1954 ~ getSettlemennt ~ list:", list)
-
-          list.map(e => {
-            this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
-              const mall = res.mallPrice
-              if (mall) {
-                e.settlementPrice = mall.discountRate
+          if (!courseVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把课程参数输入完整");
+          }
+        }
+        // 数据平台权限参数校验
+        if (this.dataPlatformPermissions.length) {
+          let dataVerify =
+            this.dataPlatformPermissions.some(e => {
+              if (!e.periodOfUse || e.finalPrice === '' || !e.accountNum || e.settlementPrice === '') {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
               }
-            }).catch((res) => {})
-          })
-        },
-        closeJCourse() { // 关闭课程选择对话框
-            this.curriculumName = "";
-            this.courseVisible = false;
-        },
-        // 删除课程权限
-        delCourseForm(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.coursePermissions.length === 1) {
-                    return this.$message.warning("续费至少保留一条课程权限");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.coursePermissions.splice(index, 1);
-                }
             });
-        },
-        //删除理论课程
-        delCourseDataForm(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.theoryCourseList.length === 1) {
-                    return this.$message.warning("续费至少保留一条课程权限");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.theoryCourseList.splice(index, 1);
-                }
+          if (!dataVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把产品参数输入完整");
+          }
+        }
+        if (this.valuePermissions.length) {
+          let courseVerify =
+            this.valuePermissions.some(e => {
+              if (!e.periodOfUse || e.finalPrice === '') {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
+              }
             });
-        },
-
-        // 删除数据平台权限
-        delDataForm(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.dataPlatformPermissions.length === 1) {
-                    return this.$message.warning("续费至少保留一条产品信息");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.dataPlatformPermissions.splice(index, 1);
-                }
+          if (!courseVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把课程参数输入完整");
+          }
+        }
+        if (this.practicalCourses.length) {
+          let courseVerify =
+            this.practicalCourses.some(e => {
+              if (!e.periodOfUse || e.finalPrice === '') {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
+              }
             });
-        },
-
-        // 删除职站增值应用产品权限
-        delDataFormList(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.valuePermissions.length === 1) {
-                    return this.$message.warning("续费至少保留一条产品信息");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.valuePermissions.splice(index, 1);
-                }
+          if (!courseVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把课程参数输入完整");
+          }
+        }
+        if (this.expTools.length) {
+          let courseVerify =
+            this.expTools.some(e => {
+              if (!e.periodOfUse || e.finalPrice === '') {
+                return false;
+              } else {
+                const curPurchase = +e.settlementPrice + (e.settlementPrice * (this.rate / 100))
+                purchase += curPurchase
+                profit += +e.finalPrice - curPurchase
+                return true;
+              }
             });
-        },
-
-        
-
-        // 获取选择课程弹框列表
-        getPracticalCourses() {
-            this.dataLoading = true;
-            this.$post(this.api.listOfGoods, {
-              pageNum: this.practicalCoursePage,
-              productClassification: this.classificationId,
-              pageSize: 10,
-              isShelves: 0,
-              productName: this.practicalCourseName,
-              hotTag: 1
-            }).then(({ page }) => {
-                this.practicalCourseList = page.records;
-                this.practicalCourseTotals = page.total;
-                this.dataLoading = false;
+          if (!courseVerify) {
+            this.whetherSubmit = true;
+            setTimeout(() => {
+              this.whetherSubmit = false;
+            }, 4000);
+            return this.$message.error("请把课程参数输入完整");
+          }
+        }
+      }
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.orderRepeat.length) return this.$message.error(this.repeatMsg)
+          let tempArr = [...this.dataPlatformPermissions, ...this.coursePermissions, ...this.valuePermissions, ...this.practicalCourses, ...this.expTools, ...this.theoryCourseList];
+          console.log('tempArr=>', tempArr)
+          let renew = tempArr.some(e => e.renew);
+          if (this.renewDisabled || renew) {/* 续费状态下 */
+            this.form.orderNature = 2;
+            if (renew) {
+              tempArr.forEach(e => {
+                if (e.renew) delete e.renew
+              });
+            }
+          }
+          tempArr.forEach(e => {
+            const time = new Date(e.startTime)
+            e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+          })
+          const { form } = this
+          form.purchaseCost = Math.round(purchase)
+          form.profit = Math.round(profit)
+          let param = {
+            contractInformation: this.contract,//合同信息
+            order: form,// 订单基本数据
+            orderOther: tempArr//俩列表
+          };
+          this.loading = true;
+          console.log(param)
+          if (this.editDisabled) {
+            this.$post(this.api.orderUpdate, param).then(res => {
+              this.refreshCache()
+              this.$message.success("修改成功");
+              this.loading = false;
+              this.$router.back();
             }).catch(err => {
-                this.dataLoading = false;
+              this.loading = false;
             });
-        },
-        practicalCoursesSelectable(row, index) { // 禁止勾选已经选过的数据平台
-            let boolean = true;
-            const { name } = this.listName.find(e => e.id == this.classificationId)
-            this[name].length && this[name].some(e => {
-                if (e.mallId == row.mallId) {
-                    boolean = false;
-                }
+          } else {
+            this.$post(this.api.orderAdd, param).then(res => {
+              this.refreshCache()
+              this.$message.success("添加订单成功");
+              this.loading = false;
+              this.renewDisabled ? this.$router.push('/order') : this.$router.back();
+            }).catch(err => {
+              this.loading = false;
             });
-            return boolean;
-        },
-        // 课程--弹框列表选中
-        practicalCoursesSelection(val) {
-            this.practicalCoursesSelect = val;
-        },
-        // 课程弹框--确定
-        async practicalCourseSubmit() {
-            if (this.practicalCoursesSelect.length > 0) {
-                let that = this;
-                let authority
-                switch (that.classificationId) {
-                    case 1:
-                    authority = 1
-                        break;
-                    case 2:
-                        authority = 1
-                        break;
-                    case 3:
-                        authority = 2
-                        break;
-                    case 4:
-                        authority = 3
-                        break;
-                    case 5:
-                        authority = 0
-                        break;
-                    case 6:
-                        authority = 4
-                        break;
-                    default:
-                        break;
-                }
-                const { orderType } = this.form
-                const { name } = this.listName.find(e => e.id == that.classificationId)
-                let fn = function(e) {
-                  that[name].push({
-                    dataOrCourseId: e.associatedProduct,// id
-                    mallId: e.mallId,
-                    productName: e.productName,// 名称
-                    periodOfUse: "",// 使用期限
-                    startTime: new Date(),// 开始
-                    endTime: "", // 终止
-                    remainingPeriod: "",// 剩余期限
-                    marketValue: '', // 市场价
-                    marketPrice: e.marketUnitPrice, // 市场单价
-                    finalPrice: orderType === 2 ? 0 : '',// 成交价
-                    finalValue: orderType === 2 ? 0 : '', // 成交单价
-                    discountRate: "",// 折扣率
-                    accountNum: "",// 账号数
-                    totalAmount: "",// 总价
-                    isEnable: 0, // 启用否：1启用，0禁用
-                    ship: 0,// 发货否（0未发货，1已发货，默认不发货）
-                    authority, // 区分权限
-                    options: 1,
-                    settlementPrice: orderType === 2 ? 0 : '', // 结算价
-                    settlementPriceUnit: e.settlementPrice || 0, // 结算单价
-                  })
-                };
-                const productId = []
-                this.practicalCoursesSelect.map(e => {// 取得选中的值，进行赋值
-                    e.associatedProduct && productId.push(+e.associatedProduct);
-                    let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理
-                    if (!find) {
-                      this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
-                        const mall = res.mallPrice
-                        if (mall) {
-                          e.settlementPrice = mall.discountRate
-                        }
-                        fn(e);
-                      }).catch((res) => {})
-                    }
-                });
-                this.practicalCourseVisible = false;
-                this.practicalCourseName = "";
-                this.practicalCoursesSelect = [];
+          }
+        } else {
+          this.$message("请填上必填项");
+          return false;
+        }
+      });
+    },
+    // 处理orderRepeat里的id
+    handleOrderRepeat (id) {
+      this.orderRepeat.includes(id) && this.orderRepeat.splice(this.orderRepeat.findIndex(e => e == id), 1)
+    },
+    /* 处理0开头的期限 */
+    zero (e, row) {
+      if (e[0] == "0") {
+        row.periodOfUse = e.substring(1);
+        this.zero(row.periodOfUse, row);
+      }
+    },
+    // 订单客户框触发选择页面
+    gotoClient () {
+      this.showSelectClient = !this.showSelectClient;
+    },
+    // 选择客户返回传值
+    backToOrder (val) {
+      this.showSelectClient = !this.showSelectClient;
+      if (val.customerId) {
+        this.form.customerName = val.customerName;
+        this.form.customerId = val.customerId;
+        this.form.phone = val.phone;
+        this.form.email = val.email;
+        this.form.orderContact = val.name;
+        this.$get(this.api.queryCustomerDetails, { customerId: val.customerId }).then(res => {
+          this.form.provinceId = res.result.customer.provinceId;
+          this.form.cityId = res.result.customer.cityId;
+          this.getCityData();
+          this.getSettlemennt()
+        });
+        this.$forceUpdate();
+      }
+    },
+    // 更换了订单客户后重新获取结算价
+    getSettlemennt () {
+      const list = []
+      this.listName.map(e => e.name).forEach(e => {
+        list.push(...this[e])
+      })
+      console.log("🚀 ~ file: AddOrder.vue:1954 ~ getSettlemennt ~ list:", list)
 
-                /* 调接口，判断是否为客户已有的产品功能 */
-                productId.length && await this.$post(this.api.renew, {
-                    authority,
-                    customerId: this.form.customerId,
-                    productId
-                }).then(res => {
-                    this[name].map(e => {
-                        res.orderOthers.map(el => {
-                            if (el.dataOrCourseId == e.dataOrCourseId && el.authority == authority) {
-                                let time = new Date(el.endTime)
-                                time = new Date(time.setDate(time.getDate() + 1))
-                                e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-                                e.endTime = "";
-                                e.periodOfUse = "";
-                                e.renew = true;
-                            }
-                        });
-                    });
-                });
-            } else {
-                return this.$message.warning("请选择数据");
-            }
-        },
-        // 实训课程弹框--页数变更
-        practicalCoursesChange(val) {
-            this.practicalCoursePage = val;
-            this.getPracticalCourses();
-        },
-        // 删除实训课程权限
-        delPracticalCourses(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.practicalCourses.length === 1) {
-                    return this.$message.warning("续费至少保留一条产品信息");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.practicalCourses.splice(index, 1);
-                }
-            });
-        },
+      list.map(e => {
+        this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
+          const mall = res.mallPrice
+          if (mall) {
+            e.settlementPrice = mall.discountRate
+          }
+        }).catch((res) => { })
+      })
+    },
+    closeJCourse () { // 关闭课程选择对话框
+      this.curriculumName = "";
+      this.courseVisible = false;
+    },
+    // 删除课程权限
+    delCourseForm (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.coursePermissions.length === 1) {
+          return this.$message.warning("续费至少保留一条课程权限");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.coursePermissions.splice(index, 1);
+        }
+      });
+    },
+    //删除理论课程
+    delCourseDataForm (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.theoryCourseList.length === 1) {
+          return this.$message.warning("续费至少保留一条课程权限");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.theoryCourseList.splice(index, 1);
+        }
+      });
+    },
 
-        // 删除实训课程权限
-        delExpTool(index, row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                if (this.renewDisabled && this.expTools.length === 1) {
-                    return this.$message.warning("续费至少保留一条产品信息");
-                } else {
-                    this.handleOrderRepeat(row.dataOrCourseId)
-                    this.expTools.splice(index, 1);
-                }
-            });
-        },
+    // 删除数据平台权限
+    delDataForm (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.dataPlatformPermissions.length === 1) {
+          return this.$message.warning("续费至少保留一条产品信息");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.dataPlatformPermissions.splice(index, 1);
+        }
+      });
+    },
+
+    // 删除职站增值应用产品权限
+    delDataFormList (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.valuePermissions.length === 1) {
+          return this.$message.warning("续费至少保留一条产品信息");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.valuePermissions.splice(index, 1);
+        }
+      });
+    },
 
 
-        // 启用
-        handleEnable(e, row,type) {
-          this[this.deliverShow[type]] = !this[this.deliverShow[type]]
-        },
-        // 一键发货
-        batchDeliver(ship, data) {
-          this[this.deliverShow[data]] = !this[this.deliverShow[data]]
-          // data即各个课程的分类id，详见data里的注释
-          const list = data == 1 ?
-            this.dataPlatformPermissions :
-            data == 2 ?
-              this.valuePermissions :
-              data == 3 ?
-                this.practicalCourses :
-                data == 4 ?
-                  this.expTools :
-                  data === 5 ?
-                  this.theoryCourseList :
-                  this.coursePermissions
 
-          list.map(e => {
-            e.ship = ship
-            if(e.ship === 1) {
-                e.isEnable = 1
-            }
+    // 获取选择课程弹框列表
+    getPracticalCourses () {
+      this.dataLoading = true;
+      this.$post(this.api.listOfGoods, {
+        pageNum: this.practicalCoursePage,
+        productClassification: this.classificationId,
+        pageSize: 10,
+        isShelves: 0,
+        productName: this.practicalCourseName,
+        hotTag: 1
+      }).then(({ page }) => {
+        this.practicalCourseList = page.records;
+        this.practicalCourseTotals = page.total;
+        this.dataLoading = false;
+      }).catch(err => {
+        this.dataLoading = false;
+      });
+    },
+    // 初始化选择课程列表
+    initCourses () {
+      this.practicalCoursePage = 1
+      this.getPracticalCourses()
+    },
+    practicalCoursesSelectable (row, index) { // 禁止勾选已经选过的数据平台
+      let boolean = true;
+      const { name } = this.listName.find(e => e.id == this.classificationId)
+      this[name].length && this[name].some(e => {
+        if (e.mallId == row.mallId) {
+          boolean = false;
+        }
+      });
+      return boolean;
+    },
+    // 课程--弹框列表选中
+    practicalCoursesSelection (val) {
+      this.practicalCoursesSelect = val;
+    },
+    // 课程弹框--确定
+    async practicalCourseSubmit () {
+      if (this.practicalCoursesSelect.length > 0) {
+        let that = this;
+        let authority
+        switch (that.classificationId) {
+          case 1:
+            authority = 1
+            break;
+          case 2:
+            authority = 1
+            break;
+          case 3:
+            authority = 2
+            break;
+          case 4:
+            authority = 3
+            break;
+          case 5:
+            authority = 0
+            break;
+          case 6:
+            authority = 4
+            break;
+          default:
+            break;
+        }
+        const { orderType } = this.form
+        const { name } = this.listName.find(e => e.id == that.classificationId)
+        let fn = function (e) {
+          that[name].push({
+            dataOrCourseId: e.associatedProduct,// id
+            mallId: e.mallId,
+            productName: e.productName,// 名称
+            periodOfUse: "",// 使用期限
+            startTime: new Date(),// 开始
+            endTime: "", // 终止
+            remainingPeriod: "",// 剩余期限
+            marketValue: '', // 市场价
+            marketPrice: e.marketUnitPrice, // 市场单价
+            finalPrice: orderType === 2 ? 0 : '',// 成交价
+            finalValue: orderType === 2 ? 0 : '', // 成交单价
+            discountRate: "",// 折扣率
+            accountNum: "",// 账号数
+            totalAmount: "",// 总价
+            isEnable: 0, // 启用否：1启用，0禁用
+            ship: 0,// 发货否（0未发货，1已发货，默认不发货）
+            authority, // 区分权限
+            options: 1,
+            settlementPrice: orderType === 2 ? 0 : '', // 结算价
+            settlementPriceUnit: e.settlementPrice || 0, // 结算单价
           })
-          if (this.editDisabled) {
-            // this.refreshCache()
-            // this.$post(this.api.bulkShipping, {
-            //   orderOthers: list
-            // }).then(res => {})
-          }
-        },
-        // 发货
-        handleDeliver(e, row,type) {
-          this[this.deliverShow[type]] = row.ship === 1
-          if(row.ship === 1)  {
-            row.isEnable = 1
-          }
-          if ((type == 3 || type == 4) && row.ship) this.showShip(row) // 非集成课程发货了后显示填写发货信息弹框
-        },
-        // 如果非数字，则返回0
-        handleNaN(val) {
-            return isNaN(val) ? 0 : val
-        },
-        // 课程计算折扣率
-        calculateDiscountCourse(val, row) {
-          const { finalPrice, marketValue } = row
-          // (原价-现价)÷原价 x100%
-          if (finalPrice) row.discountRate = marketValue == 0 ? '0%' : ((marketValue - finalPrice) / marketValue * 100).toFixed(2) + "%";
-        },
-        // 数据计算折扣率
-        calculateDiscount(val, row) {
-          const { finalValue, marketValue } = row
-          // (原价-现价)÷原价 x100%
-          if (finalValue) row.discountRate = marketValue == 0 ? '0%' : ((marketValue - finalValue) / marketValue * 100).toFixed(2) + "%";
-        },
-        //  合同起止日期选择
-        contractTimeChange(val) {
-            if (val.length > 0) {
-                this.contract.startTime = val[0];
-                this.contract.endTime = val[1];
-            }
-        },
-        // 计算订单总额
-        allAmount($event, row) {
-            this.dealSettlePrice(row)
-            let total = 0
-            const list = [...this.coursePermissions, ...this.dataPlatformPermissions, ...this.practicalCourses, ...this.expTools]
-            list.map(e => total += +e.finalPrice)
-            this.form.orderAmount = total
-        },
-        // 成交价修改后，计算成交单价 计算规则：成交价/账号数/时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
-        dealFinalValue(val, row) {
-          const { periodOfUse, options, accountNum, finalPrice } = row
-          if (periodOfUse && accountNum && finalPrice) {
-            row.finalValue = (finalPrice / accountNum / periodOfUse).toFixed(2)
-            this.calculateDiscount(val, row)
-          }
-        },
-        // 计算成交价。计算规则：成交单价*账号数*时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
-        dealComputers(e, row) {
-          const { finalValue, accountNum, periodOfUse, finalPrice } = row
-          if (periodOfUse) {
-            if (accountNum) {
-              // 有成交单价，则成交价=成交单价*账号数*时间
-              if (finalValue) {
-                row.finalPrice = Math.round(finalValue * periodOfUse * accountNum)
-              } else if (!finalValue && finalPrice) {
-                // 有成交价，没有成交单价，则成交单价=成交价/账号数/时间
-                row.finalValue = (finalPrice / periodOfUse / accountNum).toFixed(2)
-                this.calculateDiscount(e, row)
+        };
+        const productId = []
+        this.practicalCoursesSelect.map(e => {// 取得选中的值，进行赋值
+          e.associatedProduct && productId.push(+e.associatedProduct);
+          let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理
+          if (!find) {
+            this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
+              const mall = res.mallPrice
+              if (mall) {
+                e.settlementPrice = mall.discountRate
               }
-            } else if (finalValue && finalValue) {
-              // 有成交价、成交单价，没有数量，则数量=成交价/时间/成交单价
-              row.accountNum = Math.floor(finalPrice / periodOfUse / finalValue)
-            }
+              fn(e);
+            }).catch((res) => { })
           }
-          this.dealSettlePrice(row)
-          this.allAmount(e, row)
-        },
-        // 计算结算价
-        dealSettlePrice(row) {
-          const unit = row.options // 使用期限单位
-          const useUnit = row.periodOfUse // 使用期限
-          if (this.form.orderType !== 2) {
-            // 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)（单位是万）
-            const priceUnit = row.settlementPriceUnit
-            const sPrice = ((!unit ? 
-                priceUnit / 365 * useUnit :
-                unit === 1 ?
-                  priceUnit / 12 * useUnit :
-                  priceUnit * useUnit) * (row.authority ?
-                    1 :
-                    row.accountNum)).toFixed(2)
-            console.log("🚀 ~ file: AddOrder.vue:2287 ~ dealSettlePrice ~ sPrice:", row,sPrice)
+        });
+        this.practicalCourseVisible = false;
+        this.practicalCourseName = "";
+        this.practicalCoursesSelect = [];
 
-            row.settlementPrice = this.handleNaN(sPrice)
-          }
-        },
-        // 使用期限转换以及计算剩余天数
-        deadLine(e,row,options, isDate) {
-            let optionsData = ''
-            if(e > 0){
-                if (options == 1){
-                    optionsData = e === '12' ? 31536000000 : e*30*24*60*60*1000
-                }else if(options == 2){
-                    optionsData = e*365*24*60*60*1000
-                }else{
-                    optionsData = e*24*60*60*1000
-                }
-            }else{
-                optionsData = 0
-            }
-            let time = new Date(row.startTime).getTime();
+        /* 调接口，判断是否为客户已有的产品功能 */
+        productId.length && await this.$post(this.api.renew, {
+          authority,
+          customerId: this.form.customerId,
+          productId
+        }).then(res => {
+          this[name].map(e => {
+            res.orderOthers.map(el => {
+              if (el.dataOrCourseId == e.dataOrCourseId && el.authority == authority) {
+                let time = new Date(el.endTime)
+                time = new Date(time.setDate(time.getDate() + 1))
+                e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+                e.endTime = "";
+                e.periodOfUse = "";
+                e.renew = true;
+              }
+            });
+          });
+        });
+      } else {
+        return this.$message.warning("请选择数据");
+      }
+    },
+    // 实训课程弹框--页数变更
+    practicalCoursesChange (val) {
+      this.practicalCoursePage = val;
+      this.getPracticalCourses();
+    },
+    // 删除实训课程权限
+    delPracticalCourses (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.practicalCourses.length === 1) {
+          return this.$message.warning("续费至少保留一条产品信息");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.practicalCourses.splice(index, 1);
+        }
+      });
+    },
 
-            let endTime = time + optionsData
-            row.endTime = time + optionsData
-            var timestamp =  endTime;
-            var dt = new Date(timestamp);    //根据时间戳生成的时间对象
-            row.endTime = (dt.getFullYear()) + "-" + (dt.getMonth() + 1) + "-" + (dt.getDate())
-            let endYear = timestamp - time
-            let endYears = endYear/1000/60/60/24
-            row.remainingPeriod = endYears
-            const unit = row.options // 使用期限单位
-            const useUnit = row.periodOfUse // 使用期限
-            let price = row.marketPrice // 市场单价
-            // 结算单价是元/年，所以如果选择的不是年，要进行换算（日：/365,月：/12)
-            if (useUnit && price) row.marketValue = ((!unit ?
-              price / 365 * useUnit :
-              unit === 1 ?
-                price / 12 * useUnit :
-                price * useUnit)).toFixed(2)
-            this.dealComputers(e, row)
+    // 删除实训课程权限
+    delExpTool (index, row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        if (this.renewDisabled && this.expTools.length === 1) {
+          return this.$message.warning("续费至少保留一条产品信息");
+        } else {
+          this.handleOrderRepeat(row.dataOrCourseId)
+          this.expTools.splice(index, 1);
+        }
+      });
+    },
 
-            row.authority ? this.calculateDiscountCourse(e, row) : this.calculateDiscount(e, row)
 
-            // 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
-            if (isDate) {
-                const cId = row.dataOrCourseId
-                const date = new Date(row.startTime)
-                const orderRepeat = this.orderRepeat
-                this.$post(this.api.getOrderOtherTime, {
-                    customerId: this.form.customerId,
-                    id: row.dataOrCourseId,
-                    startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(),
-                    endTime: row.endTime,
-                    authority: row.authority
-                }).then(res => {
-                    orderRepeat.includes(cId) && orderRepeat.splice(orderRepeat.findIndex(e => e === cId), 1)
-                    if (res.endTime) {
-                        let time = new Date(res.endTime)
-                        time = new Date(time.setDate(time.getDate() + 1))
-                        row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-                    }
-                }).catch(res => {
-                    this.repeatMsg = res.message
-                    orderRepeat.includes(cId) || orderRepeat.push(cId)
-                })
-            }
-        },
-        // 打开填写发货信息弹框
-        showShip(row) {
-          this.curRow = row
-          this.shipContent = row.shipContent
-          this.shipVisible = true
-        },
-        // 发货信息弹框提交
-        submitShip() {
-          this.curRow.shipContent = this.shipContent
-          this.shipVisible = false
-        },
-        // 清除省份
-        clearprovince() {
-            this.form.cityId = "";
-            this.form.customerId = "";
-            this.form.orderContact = "";
-            this.form.phone = "";
-            this.form.email = "";
-        },
-        // 获取城市
-        getCity() {
-            this.clearprovince();
-            this.getCityData();
-        },
-        getCityData() {
-            let data = {
-                provinceId: this.form.provinceId
-            };
-            return this.$get(this.api.queryCity, data).then(res => {
-                this.cityList = res.list;
-            }).catch(res => {})
-        },
-        // 清除城市
-        clearcity() {
-            this.form.customerId = "";
-            this.form.orderContact = "";
-            this.form.phone = "";
-            this.form.email = "";
-        },
-        // 获取学校/客户名称
-        getSchool() {
-            this.clearcity();
-            this.getSchoolData();
-        },
-        getSchoolData() {
-            let data = {
-                provinceId: this.form.provinceId,
-                cityId: this.form.cityId
-            };
-            this.$get(this.api.queryOrderCustomer, data).then(res => {
-                this.schoolList = res.message;
-            }).catch(res => {
-            });
-        },
-        // 团队
-        getTeam() {
-          this.$get(this.api.getAllTeam).then(({ team }) => {
-            this.teams = team
-          }).catch(err => {})
-        },
-        // 团队选择回调
-        teamChange() {
-          this.form.businessManagerId = ''
-          this.form.businessManagerName = ''
-          this.getBm()
-          this.getRate()
-        },
-        // 城市合伙人人员
-        getBm() {
-          this.$post(this.api.partnerAccountList, {
-            type: 1,
-            partnerClassificationId: this.form.teamId,
-            keyWord: '',
-            pageNum: 1,
-            pageSize: 100000
-          }).then(({ pageList }) => {
-            this.bmList = pageList.records
-          }).catch(err => {})
-        },
-        clearcustomer() {
-            this.form.orderContact = "";
-            this.form.phone = "";
-            this.form.email = "";
-        },
-        // 获取学校/客户信息
-        getcustomer() {
-            let data = {
-                customerId: this.form.customerId
-            };
-            this.$get(this.api.queryOrderCustomerContact, data).then(res => {
-                this.form.orderContact = res.message[0].adminName;
-                this.form.phone = res.message[0].adminPhone;
-                this.form.email = res.message[0].email;
-            }).catch(res => {
-            });
-        },
-        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) { // 自定义的合计计算方法
-            const { columns, data } = param;
-            var sums = 0;
-            data.map(e => {
-                sums += Number(e.transactionPrice);
-            });
-            this.form.orderAmount = sums;
-            return sums;
-        },
-        // 上传文件超出
-        handleExceed(files, fileList) {
-            this.$message.warning(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择`
-            );
-        },
-        // 上传前
-        beforeAvatarUpload(file) {
-            const size = file.size / 1024 / 1024 < 10;
-            let type = file.name.split(".").pop();
-            let str = ["jpg", "jpeg", "gif", "png", "doc", "docx", "pdf"].includes(type.toLowerCase());
-            if (!str) {
-                this.$message.error("只能上传图片，word文件和pdf文件");
-            } else if (!size) {
-                this.$message.error("上传头像图片大小不能超过 10MB!");
-            }
-            return str && size;
-        },
-        // 上传成功
-        uploadSuccess(res, file, fileList) {
-            this.contract.contractFile = res.data.filesResult.fileUrl;
-        },
-        // 上传报错
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试",
-                type: "error",
-                center: true
-            });
-        },
-        // 删除上传文件前的确认
-        beforeRemove(file, fileList) {
-            let type = file.name.split(".").pop();
-            let str = ["jpg", "jpeg", "gif", "png", "doc", "pdf"].includes(type.toLowerCase());
-            const size = file.size / 1024 / 1024 < 10;
-            if (!size || !str) {
-                return true;
-            } else {
-                return this.$confirm(`确定移除 ${file.name}？`);
-            }
-        },
-        // 删除文件钩子
-        handleRemove(file, fileList) {
-            this.contract.contractFile = "";
-        },
-        configure() {
-            this.ipVisible = true;
-        },
-        IPSure() {
-            this.ipVisible = false;
-        },
-        goBack() {
-            this.$router.go(-1);
-        },
-        /**
-         *  添加实训课程产品权限,理论课程 ,数据前瞻平台权限,职站增值应用产品权限,实训课程（非集成）,实验工具
-         * type
-         */
-        addCourseJurisdiction(type) {
-            if (!this.form.customerId) return this.$message.warning("请先选择客户");
-            this.classificationId = type
-            this.practicalCourseVisible = true;
-            this.getPracticalCourses();
-        },
-       
+    // 启用
+    handleEnable (e, row, type) {
+      this[this.deliverShow[type]] = !this[this.deliverShow[type]]
     },
-    filters: {
-        dialogTitle(options) {
-            console.log(options)
-            switch (options) {
-                case 1:
-                    return '实训课程产品列表'
-                case 2:
-                    return '理论课程列表'
-                case 3:
-                    return '职站增值应用列表'
-                case 4:
-                    return '实训课程（非集成）列表'
-                case 5:
-                    return '数据前瞻平台权限列表'
-                case 6:
-                    return '实验工具列表'
-                default:
-                    break;
-            }
+    // 一键发货
+    batchDeliver (ship, data) {
+      this[this.deliverShow[data]] = !this[this.deliverShow[data]]
+      // data即各个课程的分类id，详见data里的注释
+      const list = data == 1 ?
+        this.dataPlatformPermissions :
+        data == 2 ?
+          this.valuePermissions :
+          data == 3 ?
+            this.practicalCourses :
+            data == 4 ?
+              this.expTools :
+              data === 5 ?
+                this.theoryCourseList :
+                this.coursePermissions
+
+      list.map(e => {
+        e.ship = ship
+        if (e.ship === 1) {
+          e.isEnable = 1
+        }
+      })
+      if (this.editDisabled) {
+        // this.refreshCache()
+        // this.$post(this.api.bulkShipping, {
+        //   orderOthers: list
+        // }).then(res => {})
+      }
+    },
+    // 发货
+    handleDeliver (e, row, type) {
+      this[this.deliverShow[type]] = row.ship === 1
+      if (row.ship === 1) {
+        row.isEnable = 1
+      }
+      if ((type == 3 || type == 4) && row.ship) this.showShip(row) // 非集成课程发货了后显示填写发货信息弹框
+    },
+    // 如果非数字，则返回0
+    handleNaN (val) {
+      return isNaN(val) ? 0 : val
+    },
+    // 课程计算折扣率
+    calculateDiscountCourse (val, row) {
+      const { finalPrice, marketValue } = row
+      // (原价-现价)÷原价 x100%
+      if (finalPrice) row.discountRate = marketValue == 0 ? '0%' : ((marketValue - finalPrice) / marketValue * 100).toFixed(2) + "%";
+    },
+    // 数据计算折扣率
+    calculateDiscount (val, row) {
+      const { finalValue, marketValue } = row
+      // (原价-现价)÷原价 x100%
+      if (finalValue) row.discountRate = marketValue == 0 ? '0%' : ((marketValue - finalValue) / marketValue * 100).toFixed(2) + "%";
+    },
+    //  合同起止日期选择
+    contractTimeChange (val) {
+      if (val.length > 0) {
+        this.contract.startTime = val[0];
+        this.contract.endTime = val[1];
+      }
+    },
+    // 计算订单总额
+    allAmount ($event, row) {
+      this.dealSettlePrice(row)
+      let total = 0
+      const list = [...this.coursePermissions, ...this.dataPlatformPermissions, ...this.practicalCourses, ...this.expTools]
+      list.map(e => total += +e.finalPrice)
+      this.form.orderAmount = total
+    },
+    // 成交价修改后，计算成交单价 计算规则：成交价/账号数/时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
+    dealFinalValue (val, row) {
+      const { periodOfUse, options, accountNum, finalPrice } = row
+      if (periodOfUse && accountNum && finalPrice) {
+        row.finalValue = (finalPrice / accountNum / periodOfUse).toFixed(2)
+        this.calculateDiscount(val, row)
+      }
+    },
+    // 计算成交价。计算规则：成交单价*账号数*时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
+    dealComputers (e, row) {
+      const { finalValue, accountNum, periodOfUse, finalPrice } = row
+      if (periodOfUse) {
+        if (accountNum) {
+          // 有成交单价，则成交价=成交单价*账号数*时间
+          if (finalValue) {
+            row.finalPrice = Math.round(finalValue * periodOfUse * accountNum)
+          } else if (!finalValue && finalPrice) {
+            // 有成交价，没有成交单价，则成交单价=成交价/账号数/时间
+            row.finalValue = (finalPrice / periodOfUse / accountNum).toFixed(2)
+            this.calculateDiscount(e, row)
+          }
+        } else if (finalValue && finalValue) {
+          // 有成交价、成交单价，没有数量，则数量=成交价/时间/成交单价
+          row.accountNum = Math.floor(finalPrice / periodOfUse / finalValue)
         }
+      }
+      this.dealSettlePrice(row)
+      this.allAmount(e, row)
+    },
+    // 计算结算价
+    dealSettlePrice (row) {
+      const unit = row.options // 使用期限单位
+      const useUnit = row.periodOfUse // 使用期限
+      if (this.form.orderType !== 2) {
+        // 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)（单位是万）
+        const priceUnit = row.settlementPriceUnit
+        const sPrice = ((!unit ?
+          priceUnit / 365 * useUnit :
+          unit === 1 ?
+            priceUnit / 12 * useUnit :
+            priceUnit * useUnit) * (row.authority ?
+              1 :
+              row.accountNum)).toFixed(2)
+        console.log("🚀 ~ file: AddOrder.vue:2287 ~ dealSettlePrice ~ sPrice:", row, sPrice)
+
+        row.settlementPrice = this.handleNaN(sPrice)
+      }
+    },
+    // 使用期限转换以及计算剩余天数
+    deadLine (e, row, options, isDate) {
+      let optionsData = ''
+      if (e > 0) {
+        if (options == 1) {
+          optionsData = e === '12' ? 31536000000 : e * 30 * 24 * 60 * 60 * 1000
+        } else if (options == 2) {
+          optionsData = e * 365 * 24 * 60 * 60 * 1000
+        } else {
+          optionsData = e * 24 * 60 * 60 * 1000
+        }
+      } else {
+        optionsData = 0
+      }
+      let time = new Date(row.startTime).getTime();
+
+      let endTime = time + optionsData
+      row.endTime = time + optionsData
+      var timestamp = endTime;
+      var dt = new Date(timestamp);    //根据时间戳生成的时间对象
+      row.endTime = (dt.getFullYear()) + "-" + (dt.getMonth() + 1) + "-" + (dt.getDate())
+      let endYear = timestamp - time
+      let endYears = endYear / 1000 / 60 / 60 / 24
+      row.remainingPeriod = endYears
+      const unit = row.options // 使用期限单位
+      const useUnit = row.periodOfUse // 使用期限
+      let price = row.marketPrice // 市场单价
+      // 结算单价是元/年，所以如果选择的不是年，要进行换算（日：/365,月：/12)
+      if (useUnit && price) row.marketValue = ((!unit ?
+        price / 365 * useUnit :
+        unit === 1 ?
+          price / 12 * useUnit :
+          price * useUnit)).toFixed(2)
+      this.dealComputers(e, row)
+
+      row.authority ? this.calculateDiscountCourse(e, row) : this.calculateDiscount(e, row)
+
+      // 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
+      if (isDate) {
+        const cId = row.dataOrCourseId
+        const date = new Date(row.startTime)
+        const orderRepeat = this.orderRepeat
+        this.$post(this.api.getOrderOtherTime, {
+          customerId: this.form.customerId,
+          id: row.dataOrCourseId,
+          startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(),
+          endTime: row.endTime,
+          authority: row.authority
+        }).then(res => {
+          orderRepeat.includes(cId) && orderRepeat.splice(orderRepeat.findIndex(e => e === cId), 1)
+          if (res.endTime) {
+            let time = new Date(res.endTime)
+            time = new Date(time.setDate(time.getDate() + 1))
+            row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+          }
+        }).catch(res => {
+          this.repeatMsg = res.message
+          orderRepeat.includes(cId) || orderRepeat.push(cId)
+        })
+      }
+    },
+    // 打开填写发货信息弹框
+    showShip (row) {
+      this.curRow = row
+      this.shipContent = row.shipContent
+      this.shipVisible = true
+    },
+    // 发货信息弹框提交
+    submitShip () {
+      this.curRow.shipContent = this.shipContent
+      this.shipVisible = false
+    },
+    // 清除省份
+    clearprovince () {
+      this.form.cityId = "";
+      this.form.customerId = "";
+      this.form.orderContact = "";
+      this.form.phone = "";
+      this.form.email = "";
+    },
+    // 获取城市
+    getCity () {
+      this.clearprovince();
+      this.getCityData();
+    },
+    getCityData () {
+      let data = {
+        provinceId: this.form.provinceId
+      };
+      return this.$get(this.api.queryCity, data).then(res => {
+        this.cityList = res.list;
+      }).catch(res => { })
+    },
+    // 清除城市
+    clearcity () {
+      this.form.customerId = "";
+      this.form.orderContact = "";
+      this.form.phone = "";
+      this.form.email = "";
+    },
+    // 获取学校/客户名称
+    getSchool () {
+      this.clearcity();
+      this.getSchoolData();
+    },
+    getSchoolData () {
+      let data = {
+        provinceId: this.form.provinceId,
+        cityId: this.form.cityId
+      };
+      this.$get(this.api.queryOrderCustomer, data).then(res => {
+        this.schoolList = res.message;
+      }).catch(res => {
+      });
+    },
+    // 团队
+    getTeam () {
+      this.$get(this.api.getAllTeam).then(({ team }) => {
+        this.teams = team
+      }).catch(err => { })
+    },
+    // 团队选择回调
+    teamChange () {
+      this.form.businessManagerId = ''
+      this.form.businessManagerName = ''
+      this.getBm()
+      this.getRate()
+    },
+    // 城市合伙人人员
+    getBm () {
+      this.$post(this.api.partnerAccountList, {
+        type: 1,
+        partnerClassificationId: this.form.teamId,
+        keyWord: '',
+        pageNum: 1,
+        pageSize: 100000
+      }).then(({ pageList }) => {
+        this.bmList = pageList.records
+      }).catch(err => { })
+    },
+    clearcustomer () {
+      this.form.orderContact = "";
+      this.form.phone = "";
+      this.form.email = "";
+    },
+    // 获取学校/客户信息
+    getcustomer () {
+      let data = {
+        customerId: this.form.customerId
+      };
+      this.$get(this.api.queryOrderCustomerContact, data).then(res => {
+        this.form.orderContact = res.message[0].adminName;
+        this.form.phone = res.message[0].adminPhone;
+        this.form.email = res.message[0].email;
+      }).catch(res => {
+      });
+    },
+    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) { // 自定义的合计计算方法
+      const { columns, data } = param;
+      var sums = 0;
+      data.map(e => {
+        sums += Number(e.transactionPrice);
+      });
+      this.form.orderAmount = sums;
+      return sums;
+    },
+    // 上传文件超出
+    handleExceed (files, fileList) {
+      this.$message.warning(
+        `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择`
+      );
+    },
+    // 上传前
+    beforeAvatarUpload (file) {
+      const size = file.size / 1024 / 1024 < 10;
+      let type = file.name.split(".").pop();
+      let str = ["jpg", "jpeg", "gif", "png", "doc", "docx", "pdf"].includes(type.toLowerCase());
+      if (!str) {
+        this.$message.error("只能上传图片，word文件和pdf文件");
+      } else if (!size) {
+        this.$message.error("上传头像图片大小不能超过 10MB!");
+      }
+      return str && size;
+    },
+    // 上传成功
+    uploadSuccess (res, file, fileList) {
+      this.contract.contractFile = res.data.filesResult.fileUrl;
+    },
+    // 上传报错
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试",
+        type: "error",
+        center: true
+      });
+    },
+    // 删除上传文件前的确认
+    beforeRemove (file, fileList) {
+      let type = file.name.split(".").pop();
+      let str = ["jpg", "jpeg", "gif", "png", "doc", "pdf"].includes(type.toLowerCase());
+      const size = file.size / 1024 / 1024 < 10;
+      if (!size || !str) {
+        return true;
+      } else {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    // 删除文件钩子
+    handleRemove (file, fileList) {
+      this.contract.contractFile = "";
+    },
+    configure () {
+      this.ipVisible = true;
+    },
+    IPSure () {
+      this.ipVisible = false;
+    },
+    goBack () {
+      this.$router.go(-1);
+    },
+    /**
+     *  添加实训课程产品权限,理论课程 ,数据前瞻平台权限,职站增值应用产品权限,实训课程（非集成）,实验工具
+     * type
+     */
+    addCourseJurisdiction (type) {
+      if (!this.form.customerId) return this.$message.warning("请先选择客户");
+      this.classificationId = type
+      this.practicalCourseVisible = true;
+      this.initCourses();
+    },
+
+  },
+  filters: {
+    dialogTitle (options) {
+      console.log(options)
+      switch (options) {
+        case 1:
+          return '实训课程产品列表'
+        case 2:
+          return '理论课程列表'
+        case 3:
+          return '职站增值应用列表'
+        case 4:
+          return '实训课程（非集成）列表'
+        case 5:
+          return '数据前瞻平台权限列表'
+        case 6:
+          return '实验工具列表'
+        default:
+          break;
+      }
     }
+  }
 };
 </script>
 
@@ -2579,16 +3035,16 @@ export default {
 /deep/ .course-input .el-input__inner {
     width: 100px;
 }
-.time-input{
-  width: 90px !important;
+.time-input {
+    width: 90px !important;
 }
-/deep/.time-select{
-  margin-left: 5px;
-  .el-input {
-    width: 70px !important;
-  }
+/deep/.time-select {
+    margin-left: 5px;
+    .el-input {
+        width: 70px !important;
+    }
 }
-/deep/.orderTables .el-select>.el-input{
+/deep/.orderTables .el-select > .el-input {
     width: 35%;
 }
 /deep/ .course-input .red .el-input__inner,
@@ -2607,17 +3063,17 @@ export default {
     width: 100%;
 }
 .info .el-select {
-  width: 100%;
+    width: 100%;
 }
 .mag {
     margin-right: 20px;
 }
 .small {
-  display: flex;
-  align-items: center;
-  .el-input {
-    margin-right: 5px;
-  }
+    display: flex;
+    align-items: center;
+    .el-input {
+        margin-right: 5px;
+    }
 }
 .uploadTitle {
     width: 100%;
@@ -2646,7 +3102,7 @@ export default {
 }
 .radio_icon {
     font-size: 26px;
-    color: #9278FF;
+    color: #9278ff;
 }
 .ellipsis {
     overflow: hidden;
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index cf5c90b..10fde97 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -1,423 +1,699 @@
 <template>
-    <div>
-        <el-card shadow="hover" class="m-b-20">
-            <div class="flex-between">
-                <el-page-header @back="back" :content="isDetail ? '查看产品' :(id ? '编辑产品' : '新增产品')"></el-page-header>
-            </div>
-        </el-card>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between">
+        <el-page-header @back="back"
+                        :content="isDetail ? '查看产品' :(id ? '编辑产品' : '新增产品')"></el-page-header>
+      </div>
+    </el-card>
 
-        <el-card shadow="hover" class="m-b-20">
-          <el-form class="model" ref="form" label-width="110px" :disabled="isDetail">
-              <el-row>
-                <el-col :span="14" :offset="5">
-                    <el-form-item class="req" label="关联产品" prop="curriculumName">
-                      <div>
-                        <el-radio v-model="form.mall.isAssociatedProduct" :label="0" @change="associatedProductChange">是</el-radio>
-                        <el-button v-if="!form.mall.isAssociatedProduct" class="m-l-5" type="primary" @click="setProduct">请选择</el-button>
-                        <span class="m-l-5">{{ form.mall.associatedProductName }}</span>
-                      </div>
-                      <div>
-                        <el-radio v-model="form.mall.isAssociatedProduct" :label="1" @change="associatedProductChange">否</el-radio>
-                      </div>
-                    </el-form-item>
-                </el-col>
-                <!-- 关联产品选择了否才显示产品链接 -->
-                <el-col v-if="form.mall.isAssociatedProduct" :span="14" :offset="5">
-                  <el-form-item label="产品链接">
-                    <div v-if="form.mallNonAssociatedLinks && form.mallNonAssociatedLinks.length" class="subject">
-                      <div v-for="(item, i) in form.mallNonAssociatedLinks" :key="i" class="line">
-                        <el-form-item label="链接名称">
-                          <el-input placeholder="请输入链接名称" v-model.trim="item.urlName"></el-input>
-                        </el-form-item>
-                        <el-form-item label="链接">
-                          <el-input placeholder="请输入链接" v-model.trim="item.url"></el-input>
-                        </el-form-item>
-                        <i v-if="i && !isDetail" class="del el-icon-delete" @click="form.mallNonAssociatedLinks.splice(i, 1)"></i>
-                      </div>
-                    </div>
-                    <div v-if="!isDetail" class="subject-plus" @click="addLink">
-                      <i class="el-icon-circle-plus-outline"></i>
-                    </div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-form class="model"
+               ref="form"
+               label-width="110px"
+               :disabled="isDetail">
+        <el-row>
+          <el-col :span="14"
+                  :offset="5">
+            <el-form-item class="req"
+                          label="关联产品"
+                          prop="curriculumName">
+              <div>
+                <el-radio v-model="form.mall.isAssociatedProduct"
+                          :label="0"
+                          @change="associatedProductChange">是</el-radio>
+                <el-button v-if="!form.mall.isAssociatedProduct"
+                           class="m-l-5"
+                           type="primary"
+                           @click="setProduct">请选择</el-button>
+                <span class="m-l-5">{{ form.mall.associatedProductName }}</span>
+              </div>
+              <div>
+                <el-radio v-model="form.mall.isAssociatedProduct"
+                          :label="1"
+                          @change="associatedProductChange">否</el-radio>
+              </div>
+            </el-form-item>
+          </el-col>
+          <!-- 关联产品选择了否才显示产品链接 -->
+          <el-col v-if="form.mall.isAssociatedProduct"
+                  :span="14"
+                  :offset="5">
+            <el-form-item label="产品链接">
+              <div v-if="form.mallNonAssociatedLinks && form.mallNonAssociatedLinks.length"
+                   class="subject">
+                <div v-for="(item, i) in form.mallNonAssociatedLinks"
+                     :key="i"
+                     class="line">
+                  <el-form-item label="链接名称">
+                    <el-input placeholder="请输入链接名称"
+                              v-model.trim="item.urlName"></el-input>
                   </el-form-item>
-                </el-col>
-                <el-col :span="6" :offset="5">
-                    <el-form-item class="req" label="产品名称" prop="categoryId">
-                        <el-input placeholder="请输入产品名称" v-model.trim="form.mall.productName" id="focus-el"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="分类标签" prop="professionalId">
-                        <el-select style="width: 234px;" v-model="form.tagsIds" multiple>
-                          <template v-for="item in labels">
-                            <el-option
-                              v-if="item.tagsId"
-                              :key="item.tagsId"
-                              :label="item.tagsName"
-                              :value="item.tagsId">
-                            </el-option>
-                          </template>
-                        </el-select>
-                        <el-button style="margin-left: 5px" type="primary" @click="setLabel">自定义</el-button>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6" :offset="2">
-                    <el-form-item class="req" label="产品分类">
-                        <el-select v-model="form.classificationIds" clearable placeholder="请选择产品分类" :disabled="!!(form.mall.associatedProduct && form.classificationIds)">
-                            <el-option v-for="(item, i) in productCategoryList" :key="i" :label="item.classificationName" :value="item.classificationId"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="req" label="产品类型" prop="professionalCategoryId">
-                        <el-select style="width: 234px;" v-model="form.typeIds">
-                          <template v-for="item in classifications">
-                            <el-option
-                              v-if="item.typeId"
-                              :key="item.typeId"
-                              :label="item.typeName"
-                              :value="item.typeId">
-                            </el-option>
-                          </template>
-                        </el-select>
-                        <el-button v-auth="'/shop:产品管理:产品类型自定义'" style="margin-left: 5px" type="primary" @click="setClass">自定义</el-button>
-                    </el-form-item>
-                    <el-form-item class="req" label="供应厂商" prop="supplier">
-                      <el-select v-model="form.supplierIds" clearable placeholder="请选择供应厂商" multiple :disabled="selectedProduct">
-                          <el-option v-for="(item, i) in suppliers" :key="i" :label="item.supplierName" :value="item.supplierId"></el-option>
-                      </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="14" :offset="5">
-                  <el-form-item class="req" label="适用学科专业" prop="supplier">
-                    <div class="subject">
-                      <div v-for="(item, i) in form.mallDisciplines" :key="i" class="line">
-                        <el-form-item label="学科类别" prop="supplier">
-                          <el-select v-model="item.categoryId" clearable
-                                      @change="getProfessionalClass(item)">
-                              <el-option label="不限" value=""></el-option>
-                              <el-option v-for="(item,index) in subjectList" :key="index"
-                                          :label="item.disciplineName"
-                                          :value="item.disciplineId"></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="专业类" prop="supplier">
-                          <el-select v-model="item.professionalCategoryId" clearable
-                                      :disabled="item.categoryId ? false : true"
-                                      @change="getProfessional(item)">
-                              <el-option label="不限" value=""></el-option>
-                              <el-option v-for="(item,index) in item.professionalClassList" :key="index"
-                                          :label="item.professionalClassName"
-                                          :value="item.professionalClassId"></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="专业" prop="supplier">
-                          <el-select v-model="item.professionalId" clearable
-                                      :disabled="item.professionalCategoryId ? false : true">
-                              <el-option label="不限" value=""></el-option>
-                              <el-option v-for="(item,index) in item.professionalList" :key="index"
-                                          :label="item.professionalName"
-                                          :value="item.professionalId"></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <i v-if="i && !isDetail" class="del el-icon-delete" @click="form.mallDisciplines.splice(i, 1)"></i>
-                      </div>
-                    </div>
-                    <div v-if="!isDetail" class="subject-plus" @click="addSubject">
-                      <i class="el-icon-circle-plus-outline"></i>
-                    </div>
+                  <el-form-item label="链接">
+                    <el-input placeholder="请输入链接"
+                              v-model.trim="item.url"></el-input>
                   </el-form-item>
-                </el-col>
-                <el-col :span="6" :offset="5">
-                  <el-form-item label="匹配课程" prop="briefIntroduction">
-                      <el-input placeholder="请输入匹配课程"
-                                v-model="form.mall.matchingCourse"></el-input>
+                  <i v-if="i && !isDetail"
+                     class="del el-icon-delete"
+                     @click="form.mallNonAssociatedLinks.splice(i, 1)"></i>
+                </div>
+              </div>
+              <div v-if="!isDetail"
+                   class="subject-plus"
+                   @click="addLink">
+                <i class="el-icon-circle-plus-outline"></i>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"
+                  :offset="5">
+            <el-form-item class="req"
+                          label="产品名称"
+                          prop="categoryId">
+              <el-input placeholder="请输入产品名称"
+                        v-model.trim="form.mall.productName"
+                        id="focus-el"></el-input>
+            </el-form-item>
+
+            <el-form-item label="分类标签"
+                          prop="professionalId">
+              <el-select style="width: 234px;"
+                         v-model="form.tagsIds"
+                         multiple>
+                <template v-for="item in labels">
+                  <el-option v-if="item.tagsId"
+                             :key="item.tagsId"
+                             :label="item.tagsName"
+                             :value="item.tagsId">
+                  </el-option>
+                </template>
+              </el-select>
+              <el-button style="margin-left: 5px"
+                         type="primary"
+                         @click="setLabel">自定义</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"
+                  :offset="2">
+            <el-form-item class="req"
+                          label="产品分类">
+              <el-select v-model="form.classificationIds"
+                         clearable
+                         placeholder="请选择产品分类"
+                         :disabled="!!(form.mall.associatedProduct && form.classificationIds)">
+                <el-option v-for="(item, i) in productCategoryList"
+                           :key="i"
+                           :label="item.classificationName"
+                           :value="item.classificationId"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="产品类型"
+                          prop="professionalCategoryId">
+              <el-select style="width: 234px;"
+                         v-model="form.typeIds">
+                <template v-for="item in classifications">
+                  <el-option v-if="item.typeId"
+                             :key="item.typeId"
+                             :label="item.typeName"
+                             :value="item.typeId">
+                  </el-option>
+                </template>
+              </el-select>
+              <el-button v-auth="'/shop:产品管理:产品类型自定义'"
+                         style="margin-left: 5px"
+                         type="primary"
+                         @click="setClass">自定义</el-button>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="供应厂商"
+                          prop="supplier">
+              <el-select v-model="form.supplierIds"
+                         clearable
+                         placeholder="请选择供应厂商"
+                         multiple
+                         :disabled="selectedProduct">
+                <el-option v-for="(item, i) in suppliers"
+                           :key="i"
+                           :label="item.supplierName"
+                           :value="item.supplierId"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14"
+                  :offset="5">
+            <el-form-item class="req"
+                          label="适用学科专业"
+                          prop="supplier">
+              <div class="subject">
+                <div v-for="(item, i) in form.mallDisciplines"
+                     :key="i"
+                     class="line">
+                  <el-form-item label="学科类别"
+                                prop="supplier">
+                    <el-select v-model="item.categoryId"
+                               @change="getProfessionalClass(item)">
+                      <el-option v-for="(item,index) in subjectList"
+                                 :key="index"
+                                 :label="item.disciplineName"
+                                 :value="item.disciplineId"></el-option>
+                    </el-select>
                   </el-form-item>
-                </el-col>
-                <el-col :span="6" :offset="2">
-                  <el-form-item label="预计课时" prop="briefIntroduction">
-                      <el-select v-model="form.mall.courseHours" clearable placeholder="请选择预计课时">
-                          <el-option label="32课时" value="32课时"></el-option>
-                          <el-option label="64课时" value="64课时"></el-option>
-                      </el-select>
+                  <el-form-item label="专业类"
+                                prop="supplier">
+                    <el-select v-model="item.professionalCategoryId"
+                               :disabled="item.categoryId ? false : true"
+                               @change="getProfessional(item)">
+                      <el-option v-for="(item,index) in item.professionalClassList"
+                                 :key="index"
+                                 :label="item.professionalClassName"
+                                 :value="item.professionalClassId"></el-option>
+                    </el-select>
                   </el-form-item>
-                </el-col>
-                <el-col :span="14" :offset="5">
-                  <el-form-item label="适用场景" prop="briefIntroduction">
-                      <el-input placeholder="请输入适用场景"
-                                v-model="form.mall.applicationScenario"></el-input>
+                  <el-form-item label="专业"
+                                prop="supplier">
+                    <el-select v-model="item.professionalId"
+                               :disabled="item.professionalCategoryId ? false : true">
+                      <el-option v-for="(item,index) in item.professionalList"
+                                 :key="index"
+                                 :label="item.professionalName"
+                                 :value="item.professionalId"></el-option>
+                    </el-select>
                   </el-form-item>
-                  <el-form-item class="req" label="封面图">
-                      <el-upload
-                          class="avatar-uploader"
-                          accept=".jpg,.png,.jpeg"
-                          :before-remove="beforeCoverRemove"
-                          :on-success="uploadSuccess"
-                          :limit="1"
-                          :action="api.fileupload"
-                          :headers="headers"
-                          name="file"
-                      >
-                          <img v-if="form.mall.coverDrawing" :src="form.mall.coverDrawing" class="avatar">
-                          <div class="uploader-default" v-else>
-                              <i class="el-icon-plus"></i>
-                              <p>上传封面</p>
-                          </div>
+                  <i v-if="i && !isDetail"
+                     class="del el-icon-delete"
+                     @click="form.mallDisciplines.splice(i, 1)"></i>
+                </div>
+              </div>
+              <div v-if="!isDetail"
+                   class="subject-plus"
+                   @click="addSubject">
+                <i class="el-icon-circle-plus-outline"></i>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"
+                  :offset="5">
+            <el-form-item label="匹配课程"
+                          prop="briefIntroduction">
+              <el-input placeholder="请输入匹配课程"
+                        v-model="form.mall.matchingCourse"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"
+                  :offset="2">
+            <el-form-item label="预计课时"
+                          prop="briefIntroduction">
+              <el-select v-model="form.mall.courseHours"
+                         clearable
+                         placeholder="请选择预计课时">
+                <el-option label="32课时"
+                           value="32课时"></el-option>
+                <el-option label="64课时"
+                           value="64课时"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14"
+                  :offset="5">
+            <el-form-item label="适用场景"
+                          prop="briefIntroduction">
+              <el-input placeholder="请输入适用场景"
+                        v-model="form.mall.applicationScenario"></el-input>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="封面图">
+              <el-upload class="avatar-uploader"
+                         accept=".jpg,.png,.jpeg"
+                         :before-remove="beforeCoverRemove"
+                         :on-success="uploadSuccess"
+                         :limit="1"
+                         :action="api.fileupload"
+                         :headers="headers"
+                         name="file">
+                <img v-if="form.mall.coverDrawing"
+                     :src="form.mall.coverDrawing"
+                     class="avatar">
+                <div class="uploader-default"
+                     v-else>
+                  <i class="el-icon-plus"></i>
+                  <p>上传封面</p>
+                </div>
 
-                          <div slot="tip" class="el-upload__tip">
-                              <p>只能上传jpg/png文件</p>
-                              <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
-                          </div>
-                      </el-upload>
-                  </el-form-item>
-                  <el-form-item label="界面图" prop="miniProgramPictureAddress">
-                      <el-upload
-                          accept=".jpg,.png,.jpeg"
-                          :before-upload="beforeUpload"
-                          :on-success="uploadSuccessInterface"
-                          :action="api.fileupload"
-                          :headers="headers"
-                          :show-file-list="false"
-                          name="file"
-                      >
-                        <div style="text-align: left;">
-                          <el-button>上传界面图</el-button>
-                        </div>
-                      </el-upload>
-                      <div v-if="form.mall.interfaceDiagrams.length" class="pics">
-                        <div v-for="(item, i) in form.mall.interfaceDiagrams" :key="i" class="pic">
-                          <img :src="item">
-                          <div>
-                            <el-button class="del" size="small" type="primary" @click="form.mall.interfaceDiagrams.splice(i, 1)">删除</el-button>
-                          </div>
-                        </div>
-                      </div>
-                  </el-form-item>
-                  <el-form-item label="小程序图标" prop="miniProgramPictureAddress">
-                      <el-upload
-                          class="avatar-uploader"
-                          accept=".jpg,.png,.jpeg"
-                          :before-remove="beforeMiniRemove"
-                          :on-success="uploadSuccessMini"
-                          :limit="1"
-                          :action="api.fileupload"
-                          :headers="headers"
-                          name="file"
-                      >
-                          <img v-if="form.mall.appletIcon" :src="form.mall.appletIcon" class="avatar">
-                          <div class="uploader-default" v-else>
-                              <i class="el-icon-plus"></i>
-                              <p>上传封面</p>
-                          </div>
+                <div slot="tip"
+                     class="el-upload__tip">
+                  <p>只能上传jpg/png文件</p>
+                  <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
+                </div>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="界面图"
+                          prop="miniProgramPictureAddress">
+              <el-upload accept=".jpg,.png,.jpeg"
+                         :before-upload="beforeUpload"
+                         :on-success="uploadSuccessInterface"
+                         :action="api.fileupload"
+                         :headers="headers"
+                         :show-file-list="false"
+                         name="file">
+                <div style="text-align: left;">
+                  <el-button>上传界面图</el-button>
+                </div>
+              </el-upload>
+              <div v-if="form.mall.interfaceDiagrams.length"
+                   class="pics">
+                <div v-for="(item, i) in form.mall.interfaceDiagrams"
+                     :key="i"
+                     class="pic">
+                  <img :src="item">
+                  <div>
+                    <el-button class="del"
+                               size="small"
+                               type="primary"
+                               @click="form.mall.interfaceDiagrams.splice(i, 1)">删除</el-button>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+            <el-form-item label="小程序图标"
+                          prop="miniProgramPictureAddress">
+              <el-upload class="avatar-uploader"
+                         accept=".jpg,.png,.jpeg"
+                         :before-remove="beforeMiniRemove"
+                         :on-success="uploadSuccessMini"
+                         :limit="1"
+                         :action="api.fileupload"
+                         :headers="headers"
+                         name="file">
+                <img v-if="form.mall.appletIcon"
+                     :src="form.mall.appletIcon"
+                     class="avatar">
+                <div class="uploader-default"
+                     v-else>
+                  <i class="el-icon-plus"></i>
+                  <p>上传封面</p>
+                </div>
 
-                          <div slot="tip" class="el-upload__tip">
-                              <p>只能上传jpg/png文件</p>
-                              <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
-                          </div>
-                      </el-upload>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="14" :offset="5">
-                  <el-form-item class="req" label="市场建议单价" prop="briefIntroduction">
-                      <el-input type="number" style="width: 250px" placeholder="请输入市场建议单价" v-model.number="form.mall.marketUnitPrice" @change="calcAllSettlement">
-                        <template slot="append">{{ isData ? '元/账号/年' : '元/年' }}</template> 
-                      </el-input>
-                  </el-form-item>
-                  <el-form-item class="req" label="厂商结算价" prop="briefIntroduction">
-                    <template v-for="(item, i) in form.mallPrices">
-                      <div v-if="!item.settlementPriceType && item.area === 0" :key="i">
-                        普适地区
-                        <el-select style="width: 250px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择" @change="calcSettlement(item)">
-                            <el-option label="手动录入" :value="0"></el-option>
-                            <el-option label="按折扣" :value="1"></el-option>
-                        </el-select>
-                        <el-input type="number" style="width: 200px" v-model.number="item.settlementPrice" @change="calcSettlement(item)">
-                            <template slot="append">{{ handleUnit(item) }}</template>
-                        </el-input>
-                        <span v-if="item.entryType && item.discountRate" class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
-                      </div>
-                    </template>
-                    <div style="display: flex;align-items: center;margin-top: 10px;">
-                      除外地区
-                      <i v-if="!isDetail" class="el-icon-circle-plus-outline plus" style="margin: 0 0 0 10px;" @click="addArea(0)"></i>
-                    </div>
-                    <div v-if="form.mallPrices.length && form.mallPrices.find(e => !e.settlementPriceType && e.area !== 0)" class="subject mini">
-                      <template v-for="(item, i) in form.mallPrices">
-                        <div v-if="!item.settlementPriceType && item.area !== 0" :key="i" class="line">
-                          <el-select style="width: 150px" v-model="item.area" clearable placeholder="请选择地区" @change="getCity(item, 1)">
-                            <el-option v-for="(item, i) in provinces" :key="i" :label="item.provinceName" :value="item.provinceId"></el-option>
-                          </el-select>
-                          <el-select style="width: 150px;margin: 0 10px;" v-model="item.cityId" clearable placeholder="请选择城市" :disabled="item.area ? false : true">
-                            <el-option v-for="(item, i) in item.cities" :key="i" :label="item.cityName" :value="item.cityId"></el-option>
-                          </el-select>
-                          <el-select style="width: 150px;margin-right: 10px;" v-model="item.entryType" clearable placeholder="请选择" @change="calcSettlement(item)">
-                            <el-option v-for="(item, i) in entryTypes" :key="i" :label="item.name" :value="item.id"></el-option>
-                          </el-select>
-                          <el-input type="number" style="width: 200px" v-model.number="item.settlementPrice" @change="calcSettlement(item)">
-                              <template slot="append">{{ handleUnit(item) }}</template>
-                          </el-input>
-                          <span v-if="item.entryType && item.discountRate" class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
-                          <i v-if="!isDetail" class="del el-icon-delete" @click="form.mallPrices.splice(i, 1)"></i>
-                        </div>
-                      </template>
-                    </div>
-                  </el-form-item>
-                  <el-form-item class="req" label="平台结算价" prop="briefIntroduction">
-                    <template v-for="(item, i) in form.mallPrices">
-                      <div v-if="item.settlementPriceType && item.area === 0" :key="i">
-                        普适地区
-                        <el-select style="width: 250px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择" @change="calcSettlement(item)">
-                            <el-option label="手动录入" :value="0"></el-option>
-                            <el-option label="按折扣" :value="1"></el-option>
-                        </el-select>
-                        <el-input type="number" style="width: 200px" v-model.number="item.settlementPrice" @change="calcSettlement(item)">
-                            <template slot="append">{{ handleUnit(item) }}</template>
-                        </el-input>
-                        <span v-if="item.entryType && item.discountRate" class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
-                      </div>
-                    </template>
-                    <div style="display: flex;align-items: center;margin-top: 10px;">
-                      除外地区
-                      <i v-if="!isDetail" class="el-icon-circle-plus-outline plus" style="margin: 0 0 0 10px;" @click="addArea(1)"></i>
-                    </div>
-                    <div v-if="form.mallPrices.length && form.mallPrices.find(e => e.settlementPriceType && e.area !== 0)" class="subject">
-                      <template v-for="(item, i) in form.mallPrices">
-                        <div v-if="item.settlementPriceType && item.area !== 0" :key="i" class="line">
-                          <el-select style="width: 150px" v-model="item.area" clearable placeholder="请选择地区" @change="getCity(item, 1)">
-                            <el-option v-for="(item, i) in provinces" :key="i" :label="item.provinceName" :value="item.provinceId"></el-option>
-                          </el-select>
-                          <el-select style="width: 150px;margin: 0 10px;" v-model="item.cityId" clearable placeholder="请选择城市" :disabled="item.area ? false : true">
-                            <el-option v-for="(item, i) in item.cities" :key="i" :label="item.cityName" :value="item.cityId"></el-option>
-                          </el-select>
-                          <el-select style="width: 150px;margin: 0 10px;" v-model="item.entryType" clearable placeholder="请选择" @change="calcSettlement(item)">
-                            <el-option v-for="(item, i) in entryTypes" :key="i" :label="item.name" :value="item.id"></el-option>
-                          </el-select>
-                          <el-input type="number" style="width: 200px" v-model.number="item.settlementPrice" @change="calcSettlement(item)">
-                              <template slot="append">{{ handleUnit(item) }}</template>
-                          </el-input>
-                          <span v-if="item.entryType && item.discountRate" class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
-                          <i v-if="!isDetail" class="del el-icon-delete" @click="form.mallPrices.splice(i, 1)"></i>
-                        </div>
-                      </template>
-                    </div>
-                  </el-form-item>
-                  <el-form-item class="req" label="产品简介" prop="briefIntroduction">
-                    <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mall.productIntroduction" :init="editorConfig" :disabled="isDetail" />
-                  </el-form-item>
-                  <el-form-item class="req" label="详情介绍" prop="briefIntroduction">
-                      <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mall.detailedIntroduction" :init="editorConfig" :disabled="isDetail" />
-                  </el-form-item>
-                  <el-form-item prop="file" label="产品参数">
-                    <el-upload
-                      :before-remove="beforeFileRemove"
-                      :on-success="uploadSuccessFile"
-                      :action="api.fileUploadNakadai"
-                      :file-list="form.mallAnnex"
-                      :headers="headers"
-                    >
-                      <el-button>上传文件</el-button>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-          </el-form>
-          <div v-if="!isDetail" class="btns">
-            <el-button v-if="form.mall.isShelves" type="primary" @click="submit(0)">保存并上架</el-button>
-            <template v-else>
-              <el-button type="primary" @click="submit(0)">确认</el-button>
-              <el-button @click="submit(1)">保存草稿</el-button>
-            </template>
-            <el-button @click="back">取消</el-button>
-          </div>
-        </el-card>
-        
-        <el-dialog title="产品类型设置" :visible.sync="classVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeClass">
-          <div class="plus">
-            <i class="el-icon-circle-plus-outline" @click="addClass"></i>
-          </div>
-          <el-table :data="classifications" ref="table" header-align="center" row-key="id">
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="typeName" label="类型名称" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input
-                  v-if="scope.row.edit"
-                  placeholder="请输入类型名称"
-                  v-model="scope.row.typeName"
-                  clearable
-                  maxlength="30"
-                ></el-input>
-                <span v-else>{{ scope.row.typeName }}</span>
+                <div slot="tip"
+                     class="el-upload__tip">
+                  <p>只能上传jpg/png文件</p>
+                  <p>课程封面图将按1:1显示，最佳分辨率80*80</p>
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14"
+                  :offset="5">
+            <el-form-item class="req"
+                          label="市场建议单价"
+                          prop="briefIntroduction">
+              <el-input type="number"
+                        style="width: 250px"
+                        placeholder="请输入市场建议单价"
+                        v-model.number="form.mall.marketUnitPrice"
+                        @change="calcAllSettlement">
+                <template slot="append">{{ isData ? '元/账号/年' : '元/年' }}</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="厂商结算价"
+                          prop="briefIntroduction">
+              <template v-for="(item, i) in form.mallPrices">
+                <div v-if="!item.settlementPriceType && item.area === 0"
+                     :key="i">
+                  普适地区
+                  <el-select style="width: 250px;margin: 0 10px;"
+                             v-model="item.entryType"
+                             clearable
+                             placeholder="请选择"
+                             @change="calcSettlement(item)">
+                    <el-option label="手动录入"
+                               :value="0"></el-option>
+                    <el-option label="按折扣"
+                               :value="1"></el-option>
+                  </el-select>
+                  <el-input type="number"
+                            style="width: 200px"
+                            v-model.number="item.settlementPrice"
+                            @change="calcSettlement(item)">
+                    <template slot="append">{{ handleUnit(item) }}</template>
+                  </el-input>
+                  <span v-if="item.entryType && item.discountRate"
+                        class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
+                </div>
               </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="70">
-              <template slot-scope="scope">
-                <i v-if="scope.row.edit" class="el-icon-check icon" @click="submitClass(scope.row)"></i>
-                <i v-else class="el-icon-edit icon" @click="editClass(scope.row)"></i>
-                <i class="el-icon-delete icon" @click="delClass(scope.row, scope.$index)"></i>
-              </template>
-            </el-table-column>
-          </el-table>
-          <span slot="footer">
-            <el-button @click="closeClass">返回</el-button>
-          </span>
-        </el-dialog>
-        
-        <el-dialog title="分类标签设置" :visible.sync="labelVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeLabel">
-          <div class="plus">
-            <i class="el-icon-circle-plus-outline" @click="addLabel"></i>
-          </div>
-          <el-table :data="labels" ref="table" header-align="center" row-key="id">
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="tagsName" label="主题名称" align="center" min-width="130">
-              <template slot-scope="scope">
-                <el-input
-                  v-if="scope.row.edit"
-                  placeholder="请输入主题名称"
-                  v-model="scope.row.tagsName"
-                  clearable
-                  maxlength="30"
-                ></el-input>
-                <span v-else>{{ scope.row.tagsName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="70">
-              <template slot-scope="scope">
-                <i v-if="scope.row.edit" class="el-icon-check icon" @click="submitLabel(scope.row)"></i>
-                <i v-else class="el-icon-edit icon" @click="editLabel(scope.row)"></i>
-                <i class="el-icon-delete icon" @click="delLabel(scope.row, scope.$index)"></i>
-              </template>
-            </el-table-column>
-          </el-table>
-          <span slot="footer">
-            <el-button @click="closeLabel">返回</el-button>
-          </span>
-        </el-dialog>
-        
-        <el-dialog title="关联产品" :visible.sync="productVisible" width="800px" :close-on-click-modal="false" class="product-dia">
-          <p class="tips">(已关联产品的不可重复关联)</p>
-          <div class="tabs">
-              <a class="item" v-for="(item, i) in tabs" :key="i" :class="{active: i == productActive}" @click="tabChange(i)">{{ item }}</a>
-          </div>
-          <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="productKeyword" clearable style="width: 200px;margin-bottom: 10px;"></el-input>
-          <el-table :data="products" class="table" ref="table" stripe header-align="center" row-key="id">
-            <el-table-column width="80" align="center">
-              <template slot-scope="scope">
-                <el-radio class="product-radio" v-model="selectProduct" :label="scope.row.cid" :disabled="scope.row.associatedProductIdentification"></el-radio>
+              <div style="display: flex;align-items: center;margin-top: 10px;">
+                除外地区
+                <i v-if="!isDetail"
+                   class="el-icon-circle-plus-outline plus"
+                   style="margin: 0 0 0 10px;"
+                   @click="addArea(0)"></i>
+              </div>
+              <div v-if="form.mallPrices.length && form.mallPrices.find(e => !e.settlementPriceType && e.area !== 0)"
+                   class="subject mini">
+                <template v-for="(item, i) in form.mallPrices">
+                  <div v-if="!item.settlementPriceType && item.area !== 0"
+                       :key="i"
+                       class="line">
+                    <el-select style="width: 150px"
+                               v-model="item.area"
+                               clearable
+                               placeholder="请选择地区"
+                               @change="getCity(item, 1)">
+                      <el-option v-for="(item, i) in provinces"
+                                 :key="i"
+                                 :label="item.provinceName"
+                                 :value="item.provinceId"></el-option>
+                    </el-select>
+                    <el-select style="width: 150px;margin: 0 10px;"
+                               v-model="item.cityId"
+                               clearable
+                               placeholder="请选择城市"
+                               :disabled="item.area ? false : true">
+                      <el-option v-for="(item, i) in item.cities"
+                                 :key="i"
+                                 :label="item.cityName"
+                                 :value="item.cityId"></el-option>
+                    </el-select>
+                    <el-select style="width: 150px;margin-right: 10px;"
+                               v-model="item.entryType"
+                               clearable
+                               placeholder="请选择"
+                               @change="calcSettlement(item)">
+                      <el-option v-for="(item, i) in entryTypes"
+                                 :key="i"
+                                 :label="item.name"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                    <el-input type="number"
+                              style="width: 200px"
+                              v-model.number="item.settlementPrice"
+                              @change="calcSettlement(item)">
+                      <template slot="append">{{ handleUnit(item) }}</template>
+                    </el-input>
+                    <span v-if="item.entryType && item.discountRate"
+                          class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
+                    <i v-if="!isDetail"
+                       class="del el-icon-delete"
+                       @click="form.mallPrices.splice(i, 1)"></i>
+                  </div>
+                </template>
+              </div>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="平台结算价"
+                          prop="briefIntroduction">
+              <template v-for="(item, i) in form.mallPrices">
+                <div v-if="item.settlementPriceType && item.area === 0"
+                     :key="i">
+                  普适地区
+                  <el-select style="width: 250px;margin: 0 10px;"
+                             v-model="item.entryType"
+                             clearable
+                             placeholder="请选择"
+                             @change="calcSettlement(item)">
+                    <el-option label="手动录入"
+                               :value="0"></el-option>
+                    <el-option label="按折扣"
+                               :value="1"></el-option>
+                  </el-select>
+                  <el-input type="number"
+                            style="width: 200px"
+                            v-model.number="item.settlementPrice"
+                            @change="calcSettlement(item)">
+                    <template slot="append">{{ handleUnit(item) }}</template>
+                  </el-input>
+                  <span v-if="item.entryType && item.discountRate"
+                        class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
+                </div>
               </template>
-            </el-table-column>
-            <el-table-column type="index" width="100" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (page - 1) * pageSize + 1 }}
+              <div style="display: flex;align-items: center;margin-top: 10px;">
+                除外地区
+                <i v-if="!isDetail"
+                   class="el-icon-circle-plus-outline plus"
+                   style="margin: 0 0 0 10px;"
+                   @click="addArea(1)"></i>
+              </div>
+              <div v-if="form.mallPrices.length && form.mallPrices.find(e => e.settlementPriceType && e.area !== 0)"
+                   class="subject">
+                <template v-for="(item, i) in form.mallPrices">
+                  <div v-if="item.settlementPriceType && item.area !== 0"
+                       :key="i"
+                       class="line">
+                    <el-select style="width: 150px"
+                               v-model="item.area"
+                               clearable
+                               placeholder="请选择地区"
+                               @change="getCity(item, 1)">
+                      <el-option v-for="(item, i) in provinces"
+                                 :key="i"
+                                 :label="item.provinceName"
+                                 :value="item.provinceId"></el-option>
+                    </el-select>
+                    <el-select style="width: 150px;margin: 0 10px;"
+                               v-model="item.cityId"
+                               clearable
+                               placeholder="请选择城市"
+                               :disabled="item.area ? false : true">
+                      <el-option v-for="(item, i) in item.cities"
+                                 :key="i"
+                                 :label="item.cityName"
+                                 :value="item.cityId"></el-option>
+                    </el-select>
+                    <el-select style="width: 150px;margin: 0 10px;"
+                               v-model="item.entryType"
+                               clearable
+                               placeholder="请选择"
+                               @change="calcSettlement(item)">
+                      <el-option v-for="(item, i) in entryTypes"
+                                 :key="i"
+                                 :label="item.name"
+                                 :value="item.id"></el-option>
+                    </el-select>
+                    <el-input type="number"
+                              style="width: 200px"
+                              v-model.number="item.settlementPrice"
+                              @change="calcSettlement(item)">
+                      <template slot="append">{{ handleUnit(item) }}</template>
+                    </el-input>
+                    <span v-if="item.entryType && item.discountRate"
+                          class="m-l-20">{{ item.discountRate }} {{ isData ? '元/账号/年' : '元/年' }}</span>
+                    <i v-if="!isDetail"
+                       class="del el-icon-delete"
+                       @click="form.mallPrices.splice(i, 1)"></i>
+                  </div>
                 </template>
-            </el-table-column>
-            <el-table-column prop="curriculumName" label="产品名称" min-width="150" align="center"></el-table-column>
-          </el-table>
-          <div class="pagination">
-              <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-              </el-pagination>
-          </div>
-          <span slot="footer" class="dialog-footer">
-              <el-button @click="productVisible = false">取消</el-button>
-              <el-button type="primary" @click="submitProduct">确定</el-button>
-          </span>
-        </el-dialog>
-    </div>
+              </div>
+            </el-form-item>
+            <el-form-item class="req"
+                          label="产品简介"
+                          prop="briefIntroduction">
+              <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                      v-model="form.mall.productIntroduction"
+                      :init="editorConfig"
+                      :disabled="isDetail" />
+            </el-form-item>
+            <el-form-item class="req"
+                          label="详情介绍"
+                          prop="briefIntroduction">
+              <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                      v-model="form.mall.detailedIntroduction"
+                      :init="editorConfig"
+                      :disabled="isDetail" />
+            </el-form-item>
+            <el-form-item prop="file"
+                          label="产品参数">
+              <el-upload :before-remove="beforeFileRemove"
+                         :on-success="uploadSuccessFile"
+                         :action="api.fileUploadNakadai"
+                         :file-list="form.mallAnnex"
+                         :headers="headers">
+                <el-button>上传文件</el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="!isDetail"
+           class="btns">
+        <el-button v-if="form.mall.isShelves"
+                   type="primary"
+                   @click="submit(0)">保存并上架</el-button>
+        <template v-else>
+          <el-button type="primary"
+                     @click="submit(0)">确认</el-button>
+          <el-button @click="submit(1)">保存草稿</el-button>
+        </template>
+        <el-button @click="back">取消</el-button>
+      </div>
+    </el-card>
+
+    <el-dialog title="产品类型设置"
+               :visible.sync="classVisible"
+               width="500px"
+               :close-on-click-modal="false"
+               class="manage-dia"
+               :before-close="closeClass">
+      <div class="plus">
+        <i class="el-icon-circle-plus-outline"
+           @click="addClass"></i>
+      </div>
+      <el-table :data="classifications"
+                ref="table"
+                header-align="center"
+                row-key="id">
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="typeName"
+                         label="类型名称"
+                         align="center"
+                         min-width="130">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.edit"
+                      placeholder="请输入类型名称"
+                      v-model="scope.row.typeName"
+                      clearable
+                      maxlength="30"></el-input>
+            <span v-else>{{ scope.row.typeName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="70">
+          <template slot-scope="scope">
+            <i v-if="scope.row.edit"
+               class="el-icon-check icon"
+               @click="submitClass(scope.row)"></i>
+            <i v-else
+               class="el-icon-edit icon"
+               @click="editClass(scope.row)"></i>
+            <i class="el-icon-delete icon"
+               @click="delClass(scope.row, scope.$index)"></i>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer">
+        <el-button @click="closeClass">返回</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="分类标签设置"
+               :visible.sync="labelVisible"
+               width="500px"
+               :close-on-click-modal="false"
+               class="manage-dia"
+               :before-close="closeLabel">
+      <div class="plus">
+        <i class="el-icon-circle-plus-outline"
+           @click="addLabel"></i>
+      </div>
+      <el-table :data="labels"
+                ref="table"
+                header-align="center"
+                row-key="id">
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="tagsName"
+                         label="主题名称"
+                         align="center"
+                         min-width="130">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.edit"
+                      placeholder="请输入主题名称"
+                      v-model="scope.row.tagsName"
+                      clearable
+                      maxlength="30"></el-input>
+            <span v-else>{{ scope.row.tagsName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="70">
+          <template slot-scope="scope">
+            <i v-if="scope.row.edit"
+               class="el-icon-check icon"
+               @click="submitLabel(scope.row)"></i>
+            <i v-else
+               class="el-icon-edit icon"
+               @click="editLabel(scope.row)"></i>
+            <i class="el-icon-delete icon"
+               @click="delLabel(scope.row, scope.$index)"></i>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer">
+        <el-button @click="closeLabel">返回</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="关联产品"
+               :visible.sync="productVisible"
+               width="800px"
+               :close-on-click-modal="false"
+               class="product-dia">
+      <p class="tips">(已关联产品的不可重复关联)</p>
+      <div class="tabs">
+        <a class="item"
+           v-for="(item, i) in tabs"
+           :key="i"
+           :class="{active: i == productActive}"
+           @click="tabChange(i)">{{ item }}</a>
+      </div>
+      <el-input placeholder="请输入产品名称"
+                prefix-icon="el-icon-search"
+                v-model="productKeyword"
+                clearable
+                style="width: 200px;margin-bottom: 10px;"></el-input>
+      <el-table :data="products"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                row-key="id">
+        <el-table-column width="80"
+                         align="center">
+          <template slot-scope="scope">
+            <el-radio class="product-radio"
+                      v-model="selectProduct"
+                      :label="scope.row.cid"
+                      :disabled="scope.row.associatedProductIdentification"></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column type="index"
+                         width="100"
+                         label="序号"
+                         align="center">
+          <template slot-scope="scope">
+            {{ scope.$index + (page - 1) * pageSize + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="curriculumName"
+                         label="产品名称"
+                         min-width="150"
+                         align="center"></el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :total="total"
+                       @current-change="handleCurrentChange"
+                       :current-page="page">
+        </el-pagination>
+      </div>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="productVisible = false">取消</el-button>
+        <el-button type="primary"
+                   @click="submitProduct">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -427,742 +703,748 @@ import quill from "@/components/quill";
 import Editor from '@tinymce/tinymce-vue'
 import editorConfig from '@/utils/editor'
 export default {
-    name: "courseAddEdit",
-    data() {
-        return {
-            headers: {
-                token: sessionStorage.getItem("token")
-            },
-            editorConfig,
-            isDetail: this.$route.query.show == 1,
-            id: this.$route.query.id || '',
-            form: {
-              supplierIds: [],
-              tagsIds: [],
-              typeIds: [],
-              mall: {
-                isAssociatedProduct: 0,
-                appletIcon: '',
-                applicationScenario: '',
-                associatedProduct: '',
-                associatedProductName: '',
-                authority: '',
-                courseHours: '',
-                coverDrawing: '',
-                detailedIntroduction: '',
-                interfaceDiagram: '',
-                interfaceDiagrams: [],
-                isShelves: '',
-                marketUnitPrice: '',
-                matchingCourse: '',
-                productIntroduction: '',
-                productName: '',
-                state: 1,
-              },
-              mallNonAssociatedLinks: [
-                {
-                  url: '',
-                  urlName: '',
-                }
-              ],
-              mallAnnex: [],
-              mallDisciplines: [
-                {
-                  professionalClassList: [],
-                  professionalList: [],
-                  categoryId: '',
-                  professionalCategoryId: '',
-                  professionalId: '',
-                }
-              ],
-              mallPrices: [
-                {
-                  area: 0,
-                  cityId: '',
-                  entryType: 0,
-                  settlementPrice: '',
-                  settlementPriceType: 0,
-                  discountRate: ''
-                },
-                {
-                  area: 0,
-                  cityId: '',
-                  entryType: 0,
-                  settlementPrice: '',
-                  settlementPriceType: 1,
-                  discountRate: ''
-                }
-              ],
-            },
-            productVisible: false,
-            tabs: ['理论课程', '实训课程', '数据前瞻', '职站增值应用'],
-            products: [],
-            multipleSelection: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            selectProduct: '',
-            productKeyword: '',
-            productActive: 0,
-            productCategoryList: [],
-            suppliers: [],
-            labels: [],
-            labelVisible: false,
-            classifications: [],
-            classVisible: false,
-            subjectList: [], //专业学科
-            ProfessionalClassList: [], //专业类
-            ProfessionalList: [], //专业
-            classificationList: [],
-            provinces: [],
-            entryTypes: [
-              {
-                id: 0,
-                name: '手动录入'
-              },{
-                id: 1,
-                name: '折扣价'
-              }
-            ],
-            searchTimer: null,
-            selectedProduct: false,
-            isData: false,
-            uploadList: [],
-            submiting: false,
-            pass: false,
-            updateTime: 0,
-            nameRepeat: false
-        };
-    },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+  name: "courseAddEdit",
+  data () {
+    return {
+      headers: {
+        token: sessionStorage.getItem("token")
+      },
+      editorConfig,
+      isDetail: this.$route.query.show == 1,
+      id: this.$route.query.id || '',
       form: {
-        handler(val){
-          console.log("🚀 ~ file: index.vue:511 ~ handler ~ val:", val)
-          this.updateTime++
+        supplierIds: [],
+        tagsIds: [],
+        typeIds: [],
+        mall: {
+          isAssociatedProduct: 0,
+          appletIcon: '',
+          applicationScenario: '',
+          associatedProduct: '',
+          associatedProductName: '',
+          authority: '',
+          courseHours: '',
+          coverDrawing: '',
+          detailedIntroduction: '',
+          interfaceDiagram: '',
+          interfaceDiagrams: [],
+          isShelves: '',
+          marketUnitPrice: '',
+          matchingCourse: '',
+          productIntroduction: '',
+          productName: '',
+          state: 1,
         },
-        deep:true
+        mallNonAssociatedLinks: [
+          {
+            url: '',
+            urlName: '',
+          }
+        ],
+        mallAnnex: [],
+        mallDisciplines: [
+          {
+            professionalClassList: [],
+            professionalList: [],
+            categoryId: 1,
+            professionalCategoryId: 1,
+            professionalId: 1,
+          }
+        ],
+        mallPrices: [
+          {
+            area: 0,
+            cityId: '',
+            entryType: 0,
+            settlementPrice: '',
+            settlementPriceType: 0,
+            discountRate: ''
+          },
+          {
+            area: 0,
+            cityId: '',
+            entryType: 0,
+            settlementPrice: '',
+            settlementPriceType: 1,
+            discountRate: ''
+          }
+        ],
       },
-      productKeyword: function(val) {
-          clearTimeout(this.searchTimer);
-          this.searchTimer = setTimeout(() => {
-              this.initProduct();
-          }, 500);
-      }
+      productVisible: false,
+      tabs: ['理论课程', '实训课程', '数据前瞻', '职站增值应用'],
+      products: [],
+      multipleSelection: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      selectProduct: '',
+      productKeyword: '',
+      productActive: 0,
+      productCategoryList: [],
+      suppliers: [],
+      labels: [],
+      labelVisible: false,
+      classifications: [],
+      classVisible: false,
+      subjectList: [], //专业学科
+      ProfessionalClassList: [], //专业类
+      ProfessionalList: [], //专业
+      classificationList: [],
+      provinces: [],
+      entryTypes: [
+        {
+          id: 0,
+          name: '手动录入'
+        }, {
+          id: 1,
+          name: '折扣价'
+        }
+      ],
+      searchTimer: null,
+      selectedProduct: false,
+      isData: false,
+      uploadList: [],
+      submiting: false,
+      pass: false,
+      updateTime: 0,
+      nameRepeat: false
+    };
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler (val) {
+        console.log("🚀 ~ file: index.vue:511 ~ handler ~ val:", val)
+        this.updateTime++
+      },
+      deep: true
     },
-    // 页面离开的时候如果没有保存则提示
-    beforeRouteLeave(to, from, next) {
-      if (this.submiting) {
-        next()
-      } else if (!this.pass) {
-        // 更改了信息才需要提示
-        if (this.updateTime) {
-          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.submit(this.form.state, next)
-          }).catch(() => {
-            next()
-          })
-        } else {
+    productKeyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initProduct();
+      }, 500);
+    }
+  },
+  // 页面离开的时候如果没有保存则提示
+  beforeRouteLeave (to, from, next) {
+    if (this.submiting) {
+      next()
+    } else if (!this.pass) {
+      // 更改了信息才需要提示
+      if (this.updateTime) {
+        this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.submit(this.form.state, next)
+        }).catch(() => {
           next()
-        }
+        })
       } else {
         next()
       }
+    } else {
+      next()
+    }
+  },
+  mounted () {
+    this.id ? this.getData() : this.getOp()
+    this.getProvince()
+    setTimeout(() => {
+      this.updateTime = 0
+    }, 1000)
+  },
+  components: {
+    Editor
+  },
+  methods: {
+    getData () {
+      this.$get(`${this.api.detailsOfGoods}?mallId=${this.id}`).then(res => {
+        const e = res.orderDetails
+        if (e.classificationIds && e.classificationIds.length) e.classificationIds = e.classificationIds[0]
+        if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0]
+        e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : []
+        e.mallAnnex.forEach(e => e.name = e.fileName)
+        this.form = e
+        this.getOp()
+        this.$nextTick(() => {
+          this.form.mallPrices.forEach(e => {
+            e.area && this.getCity(e)
+          })
+          this.form.mallDisciplines.forEach(e => {
+            this.$set(e, 'professionalClassList', [])
+            this.$set(e, 'professionalList', [])
+            e.categoryId && this.getProfessionalClassData(e)
+            e.professionalCategoryId && this.getProfessionalData(e)
+            if (!e.categoryId) this.$set(e, 'categoryId', '')
+            if (!e.professionalCategoryId) this.$set(e, 'professionalCategoryId', '')
+            if (!e.professionalId) this.$set(e, 'professionalId', '')
+          })
+          setTimeout(() => {
+            this.updateTime = 0
+          }, 1000)
+        })
+      }).catch(err => { })
     },
-    mounted() {
-      this.id ? this.getData() : this.getOp()
+    // 获取页面上的下拉列表
+    getOp () {
+      this.getCategory()
+      this.getLabel()
+      this.getClass()
+      this.getSupplier()
       this.getSubject()
-      this.getProvince()
-      setTimeout(() => {
-        this.updateTime = 0
-      }, 1000)
-    },
-    components: {
-        Editor
     },
-    methods: {
-      getData() {
-          this.$get(`${this.api.detailsOfGoods}?mallId=${this.id}`).then(res => {
-            const e = res.orderDetails
-            if (e.classificationIds && e.classificationIds.length) e.classificationIds = e.classificationIds[0]
-            if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0]
-            e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : []
-            e.mallAnnex.forEach(e => e.name = e.fileName)
-            this.form = e
-            this.getOp()
-            this.$nextTick(() => {
-              this.form.mallPrices.forEach(e => {
-                e.area && this.getCity(e)
-              })
-              this.form.mallDisciplines.forEach(e => {
-                this.$set(e, 'professionalClassList', [])
-                this.$set(e, 'professionalList', [])
-                e.categoryId && this.getProfessionalClassData(e)
-                e.professionalCategoryId && this.getProfessionalData(e)
-              })
-              setTimeout(() => {
-                this.updateTime = 0
-              }, 1000)
-            })
-          }).catch(err => {})
-      },
-      // 获取页面上的下拉列表
-      getOp() {
-        this.getCategory()
-        this.getLabel()
-        this.getClass()
-        this.getSupplier()
-      },
-      
-      // 关联产品单选回调
-      associatedProductChange(val) {
-        if (val === 1) {
-          const { mall } = this.form
-          mall.associatedProduct = ''
-          mall.associatedProductName = ''
-          this.selectedProduct = false
-        }
-      },
-      // 显示关联产品弹框
-      setProduct() {
-        this.productVisible = true
-        this.getProduct()
-      },
-      // 获取关联产品
-      getProduct() {
-        const active = this.productActive
-        const keyword = this.productKeyword
-        // 理论、实训
-        if (!active || active == 1) {
-          const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
-          this.$post(this.api.curriculumList, {
-              curriculumName: keyword,
-              curriculumType: active,
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              supplierId: sid ? sid.supplierId : '',
-              isShelves: 1
-          }).then(({ page }) => {
-              this.products = page.records
-              this.total = page.total
-          }).catch(err => {})
-        } else if (active == 2) { // 数据前瞻
-          this.$post(this.api.listByEntity,{
-            pageNum: this.page,
-            pageSize: this.pageSize,
-            productName: keyword,
-            supplierId: '1',
-            status: 1
-          }).then(res => {
-            const list = res.pageList.records
-            list.forEach(e => {
-              e.cid = e.id
-              e.curriculumName = e.productName
-            })
-            this.products = list
-            this.total = res.pageList.total
-          }).catch(res => {})
-        } else { // 职站增值应用
-          this.$post(this.api.getValueModule + '?platformId=1').then(res => {
-            const list = res.valueList
-            list.forEach(e => {
-              e.cid = e.id
-              e.curriculumName = e.moduleName
-            })
-            this.products = list
-            this.total = list.length
-          }).catch(err => {})
-        }
-      },
-      initProduct() {
-        this.page = 1
-        this.getProduct()
-      },
-      // 关联产品切换
-      tabChange(i) {
-        this.page = 1
-        this.productKeyword = ''
-        this.productActive = i
-        this.getProduct()
-      },
-      // 关联产品分页
-      handleCurrentChange(val) {
-        this.page = val;
-        this.getProduct();
-      },
-      // 关联产品提交
-      submitProduct() {
-        const id = this.selectProduct
-        if (!id) return Util.errorMsg('请选择产品！')
-        const { form } = this
-        const { mall } = form
-        const active = this.productActive
+
+    // 关联产品单选回调
+    associatedProductChange (val) {
+      if (val === 1) {
+        const { mall } = this.form
+        mall.associatedProduct = ''
+        mall.associatedProductName = ''
         this.selectedProduct = false
-        this.isData = false
-        // 实训、理论需要查询课程详情，把课程信息带过来
-        if (!active || active == 1) {
-          this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => {
-            form.supplierIds = data.supplier.split(',').map(e => +e)
+      }
+    },
+    // 显示关联产品弹框
+    setProduct () {
+      this.productVisible = true
+      this.getProduct()
+    },
+    // 获取关联产品
+    getProduct () {
+      const active = this.productActive
+      const keyword = this.productKeyword
+      // 理论、实训
+      if (!active || active == 1) {
+        const sid = this.$store.state.dataPer.find(e => e.permissionName === '课程管理')
+        this.$post(this.api.curriculumList, {
+          curriculumName: keyword,
+          curriculumType: active,
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          supplierId: sid ? sid.supplierId : '',
+          isShelves: 1
+        }).then(({ page }) => {
+          this.products = page.records
+          this.total = page.total
+        }).catch(err => { })
+      } else if (active == 2) { // 数据前瞻
+        this.$post(this.api.listByEntity, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          productName: keyword,
+          supplierId: '1',
+          status: 1
+        }).then(res => {
+          const list = res.pageList.records
+          list.forEach(e => {
+            e.cid = e.id
+            e.curriculumName = e.productName
+          })
+          this.products = list
+          this.total = res.pageList.total
+        }).catch(res => { })
+      } else { // 职站增值应用
+        this.$post(this.api.getValueModule + '?platformId=1').then(res => {
+          const list = res.valueList
+          list.forEach(e => {
+            e.cid = e.id
+            e.curriculumName = e.moduleName
+          })
+          this.products = list
+          this.total = list.length
+        }).catch(err => { })
+      }
+    },
+    initProduct () {
+      this.page = 1
+      this.getProduct()
+    },
+    // 关联产品切换
+    tabChange (i) {
+      this.page = 1
+      this.productKeyword = ''
+      this.productActive = i
+      this.getProduct()
+    },
+    // 关联产品分页
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getProduct();
+    },
+    // 关联产品提交
+    submitProduct () {
+      const id = this.selectProduct
+      if (!id) return Util.errorMsg('请选择产品！')
+      const { form } = this
+      const { mall } = form
+      const active = this.productActive
+      this.selectedProduct = false
+      this.isData = false
+      // 实训、理论需要查询课程详情，把课程信息带过来
+      if (!active || active == 1) {
+        this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => {
+          form.supplierIds = data.supplier.split(',').map(e => +e)
+          this.selectedProduct = true
+          form.classificationIds = !data.curriculumType ? 2 : data.curriculumType
+          form.mallDisciplines = [{
+            professionalClassList: [],
+            professionalList: [],
+            categoryId: data.categoryId,
+            professionalId: data.professionalId,
+            professionalCategoryId: data.professionalCategoryId,
+          }]
+          form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = data.settlementPrice
+          this.getProfessionalClassData(form.mallDisciplines[0])
+          this.getProfessionalData(form.mallDisciplines[0])
+          mall.courseHours = data.expectedCourse
+          mall.coverDrawing = data.coverUrl
+          mall.appletIcon = data.miniProgramPictureAddress
+          mall.productIntroduction = data.briefIntroduction
+          mall.marketUnitPrice = data.marketPrice
+        }).catch(err => { })
+      } else {
+        form.classificationIds = active == 2 ? 5 : 3
+        // 数据前瞻要获取供应厂商、市场建议单价等
+        if (active == 2) {
+          const item = this.products.find(e => e.cid == id)
+          if (item) {
+            form.supplierIds = [+item.supplier]
             this.selectedProduct = true
-            form.classificationIds = !data.curriculumType ? 2 : data.curriculumType
-            form.mallDisciplines = [{
-              professionalClassList: [],
-              professionalList: [],
-              categoryId: data.categoryId,
-              professionalId: data.professionalId,
-              professionalCategoryId: data.professionalCategoryId,
-            }]
-            form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = data.settlementPrice
-            this.getProfessionalClassData(form.mallDisciplines[0])
-            this.getProfessionalData(form.mallDisciplines[0])
-            mall.courseHours = data.expectedCourse
-            mall.coverDrawing = data.coverUrl
-            mall.appletIcon = data.miniProgramPictureAddress
-            mall.productIntroduction = data.briefIntroduction
-            mall.marketUnitPrice = data.marketPrice
-          }).catch(err => {})
-        } else {
-          form.classificationIds = active == 2 ? 5 : 3
-          // 数据前瞻要获取供应厂商、市场建议单价等
-          if (active == 2) {
-            const item = this.products.find(e => e.cid == id)
-            if (item) {
-              form.supplierIds = [+item.supplier]
-              this.selectedProduct = true
-              mall.marketUnitPrice = item.market
-              form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = item.settlementPrice
-              this.isData = true
-            }
+            mall.marketUnitPrice = item.market
+            form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = item.settlementPrice
+            this.isData = true
           }
         }
-        mall.associatedProduct = id
-        mall.associatedProductName = this.products.find(e => e.cid == id).curriculumName
-        this.productVisible = false
-      },
+      }
+      mall.associatedProduct = id
+      mall.associatedProductName = this.products.find(e => e.cid == id).curriculumName
+      this.productVisible = false
+    },
 
-      // 获取产品分类
-      getCategory() {
-        this.$get(this.api.productCategoryList).then(res => {
-          this.productCategoryList = res.classificationList
-        }).catch(err => {})
-      },
+    // 获取产品分类
+    getCategory () {
+      this.$get(this.api.productCategoryList).then(res => {
+        this.productCategoryList = res.classificationList
+      }).catch(err => { })
+    },
+
+
+    // 获取供应厂商
+    getSupplier () {
+      this.$get(this.api.supplierList).then(res => {
+        this.suppliers = res.supplierList
+      }).catch(err => { })
+    },
 
-      
-      // 获取供应厂商
-      getSupplier() {
-        this.$get(this.api.supplierList).then(res => {
-          this.suppliers = res.supplierList
-        }).catch(err => {})
-      },
 
-      
-      // 获取分类标签
-      getLabel() {
-        this.$get(this.api.tagsList).then(res => {
-          this.labels = res.tagsList
-          // 编辑的时候要根据标签列表去除掉已经保存的删除了的标签
-          if (this.id) {
-            console.log("🚀 ~ file: index.vue:735 ~ this.$get ~ id:", this.id)
-            const ids = []
-            this.form.tagsIds.forEach(item => {
-              this.labels.forEach(e => {
-                if (item == e.tagsId) {
-                  ids.push(item)
-                }
-              })
+    // 获取分类标签
+    getLabel () {
+      this.$get(this.api.tagsList).then(res => {
+        this.labels = res.tagsList
+        // 编辑的时候要根据标签列表去除掉已经保存的删除了的标签
+        if (this.id) {
+          console.log("🚀 ~ file: index.vue:735 ~ this.$get ~ id:", this.id)
+          const ids = []
+          this.form.tagsIds.forEach(item => {
+            this.labels.forEach(e => {
+              if (item == e.tagsId) {
+                ids.push(item)
+              }
             })
-            this.form.tagsIds = ids
-          }
-        }).catch(err => {})
-      },
-      // 显示标签弹框
-      setLabel() {
-        this.labelVisible = true
-      },
-      // 新增标签
-      addLabel() {
-        this.labels.push({
-          edit: true,
-          tagsId: '',
-          tagsName: ''
-        })
-      },
-      // 编辑标签
-      editLabel(row) {
-        this.$set(row, 'edit', 1)
-      },
-      // 删除标签
-      delLabel(row, i) {
-        if (row.tagsId) {
-          this.$confirm('确定要删除吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$post(`${this.api.deleteTags}?tagsId=${row.tagsId}`).then(res => {
-              Util.successMsg('删除成功')
-              this.getLabel()
-            }).catch(res => {})
-          }).catch(() => {})
-        } else {
-          this.labels.splice(i, 1)
+          })
+          this.form.tagsIds = ids
         }
-      },
-      // 提交标签
-      async submitLabel(row, showMsg = 1) {
-        if (!row.tagsName) return Util.errorMsg('请输入主题名称')
-        row.tagsId ?
-          await this.$post(this.api.updateTags, {
-            tagsName: row.tagsName,
-            tagsId: row.tagsId
-          }) :
-          await this.$post(`${this.api.addTags}?tagsName=${row.tagsName}`)
-        showMsg && Util.successMsg(row.tagsId ? '修改成功' : '新增成功')
-        this.getLabel()
-      },
-      // 关闭标签
-      closeLabel() {
-        const list = this.labels
-        if (list.find(e => e.edit && e.tagsName)) {
-          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            list.map(e => {
-              e.edit && e.tagsName && this.submitLabel(e, 0)
-            })
-            this.labelVisible = false
-          }).catch(() => {
-            this.labelVisible = false
+      }).catch(err => { })
+    },
+    // 显示标签弹框
+    setLabel () {
+      this.labelVisible = true
+    },
+    // 新增标签
+    addLabel () {
+      this.labels.push({
+        edit: true,
+        tagsId: '',
+        tagsName: ''
+      })
+    },
+    // 编辑标签
+    editLabel (row) {
+      this.$set(row, 'edit', 1)
+    },
+    // 删除标签
+    delLabel (row, i) {
+      if (row.tagsId) {
+        this.$confirm('确定要删除吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.$post(`${this.api.deleteTags}?tagsId=${row.tagsId}`).then(res => {
+            Util.successMsg('删除成功')
+            this.getLabel()
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.labels.splice(i, 1)
+      }
+    },
+    // 提交标签
+    async submitLabel (row, showMsg = 1) {
+      if (!row.tagsName) return Util.errorMsg('请输入主题名称')
+      row.tagsId ?
+        await this.$post(this.api.updateTags, {
+          tagsName: row.tagsName,
+          tagsId: row.tagsId
+        }) :
+        await this.$post(`${this.api.addTags}?tagsName=${row.tagsName}`)
+      showMsg && Util.successMsg(row.tagsId ? '修改成功' : '新增成功')
+      this.getLabel()
+    },
+    // 关闭标签
+    closeLabel () {
+      const list = this.labels
+      if (list.find(e => e.edit && e.tagsName)) {
+        this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          list.map(e => {
+            e.edit && e.tagsName && this.submitLabel(e, 0)
           })
-        } else {
           this.labelVisible = false
-        }
-      },
+        }).catch(() => {
+          this.labelVisible = false
+        })
+      } else {
+        this.labelVisible = false
+      }
+    },
 
 
-      
-      // 获取产品类型
-      getClass() {
-        this.$get(this.api.productTypeList).then(res => {
-          const list = res.typeList
-          // 编辑的时候要根据产品类型列表去除掉已经保存的删除了的产品类型
-          if (this.id) {
-            console.log("🚀 ~ file: index.vue:735 ~ this.$get ~ id:", this.id)
-            const id = this.form.typeIds
-            if (id && !list.find(e => e.typeId == id)) this.form.typeIds = ''
-          }
-          this.classifications = list
-        }).catch(err => {})
-      },
-      // 显示产品类型弹框
-      setClass() {
-        this.classVisible = true
-      },
-      // 新增产品类型
-      addClass() {
-        this.classifications.push({
-          edit: true,
-          typeId: '',
-          classificationName: ''
-        })
-      },
-      // 编辑产品类型
-      editClass(row) {
-        this.$set(row, 'edit', 1)
-      },
-      // 删除产品类型
-      delClass(row, i) {
-        if (row.typeId) {
-          this.$confirm('确定要删除吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$post(`${this.api.deleteProductType}?typeId=${row.typeId}`).then(res => {
-              Util.successMsg('删除成功')
-              this.getClass()
-            }).catch(res => {})
-          }).catch(() => {})
-        } else {
-          this.classifications.splice(i, 1)
+
+    // 获取产品类型
+    getClass () {
+      this.$get(this.api.productTypeList).then(res => {
+        const list = res.typeList
+        // 编辑的时候要根据产品类型列表去除掉已经保存的删除了的产品类型
+        if (this.id) {
+          const id = this.form.typeIds
+          if (id && !list.find(e => e.typeId == id)) this.form.typeIds = ''
         }
-      },
-      // 提交产品类型
-      async submitClass(row, showMsg = 1) {
-        if (!row.typeName) return Util.errorMsg('请输入分类名称')
-        row.typeId ?
-          await this.$post(this.api.updateProductType, {
-            typeName: row.typeName,
-            typeId: row.typeId
-          }) :
-          await this.$post(`${this.api.addProductType}?typeName=${row.typeName}`)
-        showMsg && Util.successMsg(row.typeId ? '修改成功' : '新增成功')
-        this.getClass()
-      },
-      // 关闭产品类型
-      closeClass() {
-        const list = this.classifications
-        if (list.find(e => e.edit && e.typeName)) {
-          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            list.map(e => {
-              e.edit && e.typeName && this.submitClass(e, 0)
-            })
-            this.classVisible = false
-          }).catch(() => {
-            this.classVisible = false
+        this.classifications = list
+      }).catch(err => { })
+    },
+    // 显示产品类型弹框
+    setClass () {
+      this.classVisible = true
+    },
+    // 新增产品类型
+    addClass () {
+      this.classifications.push({
+        edit: true,
+        typeId: '',
+        classificationName: ''
+      })
+    },
+    // 编辑产品类型
+    editClass (row) {
+      this.$set(row, 'edit', 1)
+    },
+    // 删除产品类型
+    delClass (row, i) {
+      if (row.typeId) {
+        this.$confirm('确定要删除吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.$post(`${this.api.deleteProductType}?typeId=${row.typeId}`).then(res => {
+            Util.successMsg('删除成功')
+            this.getClass()
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.classifications.splice(i, 1)
+      }
+    },
+    // 提交产品类型
+    async submitClass (row, showMsg = 1) {
+      if (!row.typeName) return Util.errorMsg('请输入分类名称')
+      row.typeId ?
+        await this.$post(this.api.updateProductType, {
+          typeName: row.typeName,
+          typeId: row.typeId
+        }) :
+        await this.$post(`${this.api.addProductType}?typeName=${row.typeName}`)
+      showMsg && Util.successMsg(row.typeId ? '修改成功' : '新增成功')
+      this.getClass()
+    },
+    // 关闭产品类型
+    closeClass () {
+      const list = this.classifications
+      if (list.find(e => e.edit && e.typeName)) {
+        this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          list.map(e => {
+            e.edit && e.typeName && this.submitClass(e, 0)
           })
-        } else {
           this.classVisible = false
+        }).catch(() => {
+          this.classVisible = false
+        })
+      } else {
+        this.classVisible = false
+      }
+      // 所选的分类被删了后，要清空所选的分类id
+      if (!list.find(e => e.id == this.form.classificationId)) this.form.classificationId = ''
+    },
+    // 添加非关联产品链接
+    addLink () {
+      this.form.mallNonAssociatedLinks.push(
+        {
+          mallId: this.id,
+          url: '',
+          urlName: '',
         }
-        // 所选的分类被删了后，要清空所选的分类id
-        if (!list.find(e => e.id == this.form.classificationId)) this.form.classificationId = ''
-      },
-      // 添加非关联产品链接
-      addLink() {
-        this.form.mallNonAssociatedLinks.push(
-          {
-            mallId: this.id,
-            url: '',
-            urlName: '',
-          }
-        )
-      },
-
-
-      // 添加学科
-      addSubject() {
-        this.form.mallDisciplines.push(
-          {
-            professionalClassList: [],
-            professionalList: [],
-            categoryId: '',
-            professionalCategoryId: '',
-            professionalId: '',
-          }
-        )
-      },
-      // 获取学科类别
-      getSubject() {
-        this.$get(this.api.courseDiscipline).then(res => {
-            this.subjectList = res.list;
-        }).catch(err => {})
-      },
-      // 清除学科类别
-      clearClass(item) {
-          item.professionalCategoryId = "";
-          item.professionalId = "";
-      },
-      // 获取专业类
-      getProfessionalClass(item) {
-          this.clearClass(item);
-          this.getProfessionalClassData(item);
-      },
-      getProfessionalClassData(item) {
-        this.$get(this.api.courseProfessionalClass, {
-          disciplineId: item.categoryId
-        }).then(res => {
-          item.professionalClassList = res.list
-        }).catch(err => {})
-      },
-      // 清除专业类
-      clearProfess(item) {
-        item.professionalId = "";
-      },
-      // 获取专业
-      getProfessional(item) {
-          this.clearProfess(item);
-          this.getProfessionalData(item);
-      },
-      getProfessionalData(item) {
-        this.$get(this.api.courseProfessional, {
-          professionalClassId: item.professionalCategoryId
-        }).then(res => {
-          item.professionalList = res.list
-        }).catch(err => {})
-      },
+      )
+    },
 
 
-      // 添加厂商结算价
-      addArea(type) {
-        this.form.mallPrices.push({
-          area: '',
-          cityId: '',
-          entryType: 0,
-          settlementPrice: '',
-          settlementPriceType: type,
-          discountRate: ''
+    // 添加学科
+    addSubject () {
+      const e = {
+        professionalClassList: [],
+        professionalList: [],
+        categoryId: 1,
+        professionalCategoryId: 1,
+        professionalId: 1,
+      }
+      this.form.mallDisciplines.push(e)
+      this.getProfessionalClassData(e)
+    },
+    // 获取学科类别
+    getSubject () {
+      this.$get(this.api.courseDiscipline).then(res => {
+        this.subjectList = res.list
+        this.form.mallDisciplines.forEach(e => {
+          e.categoryId === 1 && this.getProfessionalClass(e)
         })
-      },
-      // 计算折扣后的结算价（所有结算价）
-      calcAllSettlement() {
-        // 选的按折扣才需要计算
-        const unit = this.form.mall.marketUnitPrice
-        unit !== '' && this.form.mallPrices.forEach(item => {
-          if (item.entryType && item.settlementPrice !== '' && item.settlementPrice !== undefined) {
-            this.$set(item, 'discountRate', item.settlementPrice / 10 * unit)
-          } else {
-            this.$set(item, 'discountRate', item.settlementPrice)
-          }
+      }).catch(err => { })
+    },
+    // 清除学科类别
+    clearClass (item) {
+      item.professionalCategoryId = item.categoryId === 1 ? 1 : ''
+      item.professionalId = item.categoryId === 1 ? 1 : ''
+    },
+    // 获取专业类
+    getProfessionalClass (item) {
+      this.clearClass(item);
+      this.getProfessionalClassData(item);
+    },
+    getProfessionalClassData (item) {
+      this.$get(this.api.courseProfessionalClass, {
+        disciplineId: item.categoryId
+      }).then(res => {
+        item.professionalClassList = res.list
+        this.form.mallDisciplines.forEach(e => {
+          e.professionalCategoryId === 1 && this.getProfessional(e)
         })
-      },
-      // 计算折扣后的结算价（单个结算价）
-      calcSettlement(item) {
-        // 选的按折扣才需要计算
-        const unit = this.form.mall.marketUnitPrice
-        if (item.entryType && unit !== '' && item.settlementPrice !== '' && item.settlementPrice !== undefined) {
+      }).catch(err => { })
+    },
+    // 清除专业类
+    clearProfess (item) {
+      item.professionalId = item.professionalCategoryId === 1 ? 1 : ''
+    },
+    // 获取专业
+    getProfessional (item) {
+      this.clearProfess(item);
+      this.getProfessionalData(item);
+    },
+    getProfessionalData (item) {
+      this.$get(this.api.courseProfessional, {
+        professionalClassId: item.professionalCategoryId
+      }).then(res => {
+        item.professionalList = res.list
+      }).catch(err => { })
+    },
+
+
+    // 添加厂商结算价
+    addArea (type) {
+      this.form.mallPrices.push({
+        area: '',
+        cityId: '',
+        entryType: 0,
+        settlementPrice: '',
+        settlementPriceType: type,
+        discountRate: ''
+      })
+    },
+    // 计算折扣后的结算价（所有结算价）
+    calcAllSettlement () {
+      // 选的按折扣才需要计算
+      const unit = this.form.mall.marketUnitPrice
+      unit !== '' && this.form.mallPrices.forEach(item => {
+        if (item.entryType && item.settlementPrice !== '' && item.settlementPrice !== undefined) {
           this.$set(item, 'discountRate', item.settlementPrice / 10 * unit)
         } else {
           this.$set(item, 'discountRate', item.settlementPrice)
         }
-      },
-      // 处理价格单位
-      handleUnit(item) {
-        return item.entryType ? '折' : this.isData ? '元/账号/年' : '元/年'
-      },
-      // 查询省份
-      getProvince(){
-        this.$get(this.api.queryProvince).then(({ list }) => {
-          this.provinces = list
-        }).catch(res => {})
-      },
-      // 查询城市
-      getCity(item, clear) {
-        this.$get(this.api.queryCity, {
-          provinceId: item.area
-        }).then(({ list }) => {
-          this.$set(item, 'cities', list)
-          if (clear) item.cityId = ''
-        }).catch(res => {})
-      },
+      })
+    },
+    // 计算折扣后的结算价（单个结算价）
+    calcSettlement (item) {
+      // 选的按折扣才需要计算
+      const unit = this.form.mall.marketUnitPrice
+      if (item.entryType && unit !== '' && item.settlementPrice !== '' && item.settlementPrice !== undefined) {
+        this.$set(item, 'discountRate', item.settlementPrice / 10 * unit)
+      } else {
+        this.$set(item, 'discountRate', item.settlementPrice)
+      }
+    },
+    // 处理价格单位
+    handleUnit (item) {
+      return item.entryType ? '折' : this.isData ? '元/账号/年' : '元/年'
+    },
+    // 查询省份
+    getProvince () {
+      this.$get(this.api.queryProvince).then(({ list }) => {
+        this.provinces = list
+      }).catch(res => { })
+    },
+    // 查询城市
+    getCity (item, clear) {
+      this.$get(this.api.queryCity, {
+        provinceId: item.area
+      }).then(({ list }) => {
+        this.$set(item, 'cities', list)
+        if (clear) item.cityId = ''
+      }).catch(res => { })
+    },
 
-      uploadSuccess(res) {
-        this.form.mall.coverDrawing = res.data.filesResult.fileUrl
-      },
-      beforeCoverRemove() {
-        this.form.mall.coverDrawing = ''
-      },
-      uploadSuccessMini(res) {
-        this.form.mall.appletIcon = res.data.filesResult.fileUrl;
-      },
-      beforeMiniRemove() {
-        this.form.mall.appletIcon = ''
-      },
-      uploadSuccessInterface(res) { // 文件上传成功时的钩子
-          this.form.mall.interfaceDiagrams.push(res.data.filesResult.fileUrl)
-      },
-      uploadSuccessFile(res) { // 文件上传成功时的钩子
-        const e = res.filesResult
-        this.form.mallAnnex = [{
-          mallId: this.id,
-          filePath: e.fileUrl,
-          fileName: e.originalFileName,
-          name: e.originalFileName,
-        }]
-      },
-      beforeFileRemove() {
-        this.form.mallAnnex = []
-      },
-      // 界面图上传前回调
-      beforeUpload() {
-        if (this.form.mall.interfaceDiagrams.length > 2) {
-          Util.errorMsg('当前限制选择 3 个文件，如需更换，请删除上一个文件再重新选择！')
-          return false
-        }
-      },
-      submit(state, next) {
-        const form = JSON.parse(JSON.stringify(this.form))
-        const { mall } = form
-        if (!mall.productName) return Util.errorMsg('请输入产品名称！')
-        if (!state) {
-          if (!mall.isAssociatedProduct && !mall.associatedProduct) return Util.errorMsg('请选择产品！')
-          if (!form.classificationIds) return Util.errorMsg('请选择产品分类！')
-          if (!form.typeIds) return Util.errorMsg('请选择产品类型！')
-          if (!form.supplierIds.length) return Util.errorMsg('请选择供应厂商！')
-          if (!mall.coverDrawing) return Util.errorMsg('请上传封面图！')
-          if (!mall.marketUnitPrice) return Util.errorMsg('请输入市场建议单价！')
-          let priceInvalid = 0
-          for (const e of form.mallPrices) {
-            if (e.settlementPrice === '' || e.settlementPrice === undefined) {
-              priceInvalid = 1
-              Util.errorMsg(`请输入${e.settlementPriceType ? '平台' : '厂商'}结算价！`)
-              break
-            }
-            if (e.area === '') {
-              priceInvalid = 1
-              Util.errorMsg(`请选择地区！`)
-              break
-            }
+    uploadSuccess (res) {
+      this.form.mall.coverDrawing = res.data.filesResult.fileUrl
+    },
+    beforeCoverRemove () {
+      this.form.mall.coverDrawing = ''
+    },
+    uploadSuccessMini (res) {
+      this.form.mall.appletIcon = res.data.filesResult.fileUrl;
+    },
+    beforeMiniRemove () {
+      this.form.mall.appletIcon = ''
+    },
+    uploadSuccessInterface (res) { // 文件上传成功时的钩子
+      this.form.mall.interfaceDiagrams.push(res.data.filesResult.fileUrl)
+    },
+    uploadSuccessFile (res) { // 文件上传成功时的钩子
+      const e = res.filesResult
+      this.form.mallAnnex = [{
+        mallId: this.id,
+        filePath: e.fileUrl,
+        fileName: e.originalFileName,
+        name: e.originalFileName,
+      }]
+    },
+    beforeFileRemove () {
+      this.form.mallAnnex = []
+    },
+    // 界面图上传前回调
+    beforeUpload () {
+      if (this.form.mall.interfaceDiagrams.length > 2) {
+        Util.errorMsg('当前限制选择 3 个文件，如需更换，请删除上一个文件再重新选择！')
+        return false
+      }
+    },
+    submit (state, next) {
+      const form = JSON.parse(JSON.stringify(this.form))
+      const { mall } = form
+      if (!mall.productName) return Util.errorMsg('请输入产品名称！')
+      if (!state) {
+        if (!mall.isAssociatedProduct && !mall.associatedProduct) return Util.errorMsg('请选择产品！')
+        if (!form.classificationIds) return Util.errorMsg('请选择产品分类！')
+        if (!form.typeIds) return Util.errorMsg('请选择产品类型！')
+        if (!form.supplierIds.length) return Util.errorMsg('请选择供应厂商！')
+        if (!mall.coverDrawing) return Util.errorMsg('请上传封面图！')
+        if (!mall.marketUnitPrice) return Util.errorMsg('请输入市场建议单价！')
+        let priceInvalid = 0
+        for (const e of form.mallPrices) {
+          if (e.settlementPrice === '' || e.settlementPrice === undefined) {
+            priceInvalid = 1
+            Util.errorMsg(`请输入${e.settlementPriceType ? '平台' : '厂商'}结算价！`)
+            break
+          }
+          if (e.area === '') {
+            priceInvalid = 1
+            Util.errorMsg(`请选择地区！`)
+            break
           }
-          if (priceInvalid) return
-          if (!mall.productIntroduction) return Util.errorMsg('请输入产品简介！')
-          if (!mall.detailedIntroduction) return Util.errorMsg('请输入详情介绍！')
-        }
-        form.classificationIds = [form.classificationIds]
-        form.typeIds = [form.typeIds]
-        mall.interfaceDiagram = mall.interfaceDiagrams.join()
-        const links = []
-        form.mallNonAssociatedLinks.forEach(e => {
-          (e.urlName || e.url) && links.push(e)
-        })
-        form.mallNonAssociatedLinks = links
-        form.mall.state = state
-        form.mall.isShelves = state
-        if (this.submiting) return false
-        this.submiting = true
-        if (form.mall.mallId) {
-            this.$post(this.api.renewalOfGoods, form).then(res => {
-                this.pass = true
-                this.submiting = false;
-                Util.successMsg("修改成功");
-                next ? next() : this.$router.back()
-            }).catch(err => {
-                this.submiting = false;
-            });
-        } else {
-            this.$post(this.api.addGoods, form).then(res => {
-                this.pass = true
-                this.submiting = false;
-                Util.successMsg("新增成功");
-                next ? next() : this.$router.back()
-            }).catch(err => {
-                this.submiting = false;
-            });
         }
-      },
-      // 返回
-      back() {
-        this.pass = true
-          console.log("🚀 ~ file: index.vue:1100 ~ back ~ this.updateTime:", this.updateTime)
-
-        // 更改了信息才需要提示
-        if (this.updateTime) {
-          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
-            type: 'warning',
-            confirmButtonText: '是',
-            cancelButtonText: '否',
-          }).then(() => {
-            this.submit(this.form.mall.state)
-          }).catch(() => {
-            this.$router.back()
-          })
-        } else {
+        if (priceInvalid) return
+        if (!mall.productIntroduction) return Util.errorMsg('请输入产品简介！')
+        if (!mall.detailedIntroduction) return Util.errorMsg('请输入详情介绍！')
+      }
+      form.classificationIds = [form.classificationIds]
+      form.typeIds = [form.typeIds]
+      mall.interfaceDiagram = mall.interfaceDiagrams.join()
+      const links = []
+      form.mallNonAssociatedLinks.forEach(e => {
+        (e.urlName || e.url) && links.push(e)
+      })
+      form.mallNonAssociatedLinks = links
+      form.mall.state = state
+      form.mall.isShelves = state
+      if (this.submiting) return false
+      this.submiting = true
+      if (form.mall.mallId) {
+        this.$post(this.api.renewalOfGoods, form).then(res => {
+          this.pass = true
+          this.submiting = false;
+          Util.successMsg("修改成功");
+          next ? next() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false;
+        });
+      } else {
+        this.$post(this.api.addGoods, form).then(res => {
+          this.pass = true
+          this.submiting = false;
+          Util.successMsg("新增成功");
+          next ? next() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false;
+        });
+      }
+    },
+    // 返回
+    back () {
+      this.pass = true
+      // 更改了信息才需要提示
+      if (this.updateTime) {
+        this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+          type: 'warning',
+          confirmButtonText: '是',
+          cancelButtonText: '否',
+        }).then(() => {
+          this.submit(this.form.mall.state)
+        }).catch(() => {
           this.$router.back()
-        }
-      },
-    }
+        })
+      } else {
+        this.$router.back()
+      }
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .m-l-5 {
-  margin-left: 5px;
+    margin-left: 5px;
 }
 .m-l-20 {
-  margin-left: 20px;
+    margin-left: 20px;
 }
 .model {
-  height: calc(100vh - 350px);
-  overflow: auto;
+    height: calc(100vh - 350px);
+    overflow: auto;
 }
 $avatar-width: 104px;
 /deep/ .avatar-uploader {
@@ -1175,7 +1457,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
@@ -1222,100 +1504,101 @@ $avatar-width: 104px;
     }
 }
 .pics {
-  display: flex;
-  margin-top: 10px;
-  text-align: center;
-  .pic {
-    margin-right: 20px;
-  }
-  img {
-    width: $avatar-width;
-    height: $avatar-width;
-  }
+    display: flex;
+    margin-top: 10px;
+    text-align: center;
+    .pic {
+        margin-right: 20px;
+    }
+    img {
+        width: $avatar-width;
+        height: $avatar-width;
+    }
 }
 
 /deep/ .d-inline-block {
     width: 216px;
 
-    .el-select, .el-input {
+    .el-select,
+    .el-input {
         width: 100%;
     }
 }
 .manage-dia {
-  .icon {
-    margin-right: 5px;
-    font-size: 14px;
-    cursor: pointer;
-  }
+    .icon {
+        margin-right: 5px;
+        font-size: 14px;
+        cursor: pointer;
+    }
 }
 .product-dia {
-  .tips {
-    position: absolute;
-    top: 23px;
-    left: 100px;
-    font-size: 12px;
-    color: #f00;
-  }
+    .tips {
+        position: absolute;
+        top: 23px;
+        left: 100px;
+        font-size: 12px;
+        color: #f00;
+    }
 }
 .plus {
-  margin-bottom: 10px;
-  font-size: 18px;
-  color: #9278FF;
-  text-align: right;
-  cursor: pointer;
+    margin-bottom: 10px;
+    font-size: 18px;
+    color: #9278ff;
+    text-align: right;
+    cursor: pointer;
 }
 .subject {
-  padding: 10px;
-  border: 1px dashed #ccc;
-  &.mini {
-    // width: 790px;
-  }
-  .line {
-    position: relative;
-    display: flex;
-    padding-right: 50px;
-    margin-bottom: 10px;
-    &:last-child {
-      margin-bottom: 0;
+    padding: 10px;
+    border: 1px dashed #ccc;
+    &.mini {
+        // width: 790px;
+    }
+    .line {
+        position: relative;
+        display: flex;
+        padding-right: 50px;
+        margin-bottom: 10px;
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+    .el-form-item {
+        margin-bottom: 0;
+    }
+    .del {
+        position: absolute;
+        top: 11px;
+        right: 20px;
+        cursor: pointer;
     }
-  }
-  .el-form-item {
-    margin-bottom: 0;
-  }
-  .del {
-    position: absolute;
-    top: 11px;
-    right: 20px;
-    cursor: pointer;
-  }
 }
 .subject-plus {
-  margin-top: 5px;
-  text-align: center;
-  font-size: 18px;
-  color: #9076FF;
-  cursor: pointer;
+    margin-top: 5px;
+    text-align: center;
+    font-size: 18px;
+    color: #9076ff;
+    cursor: pointer;
 }
 /deep/.req {
-  .el-form-item__label {
-    &:before {
-      content: '*';
-      margin-right: 5px;
-      font-size: 18px;
-      vertical-align: middle;
-      color: #f00;
+    .el-form-item__label {
+        &:before {
+            content: '*';
+            margin-right: 5px;
+            font-size: 18px;
+            vertical-align: middle;
+            color: #f00;
+        }
     }
-  }
 }
 .tabs {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 /deep/.product-radio {
-  .el-radio__label {
-    display: none;
-  }
+    .el-radio__label {
+        display: none;
+    }
 }
 .btns {
-  text-align: center;
+    text-align: center;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/shop/list/market/index.vue b/src/views/shop/list/market/index.vue
index 1d9d668..f111c4f 100644
--- a/src/views/shop/list/market/index.vue
+++ b/src/views/shop/list/market/index.vue
@@ -1,76 +1,118 @@
 <template>
-    <!--   营销推广管理     -->
-    <div style="padding-top: 24px">
-        <div style="margin-bottom: 10px;text-align: right;">
-          <el-button v-auth="'/shop:营销推广管理:新增'" type="primary" round @click="add">新增</el-button>
-        </div>
-        <el-table :data="list" class="table" ref="table" stripe header-align="center" row-key="id">
-            <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="图片" min-width="150" align="center">
-              <template slot-scope="scope">
-                <img width="100" :src="scope.row.banner" alt="">
-              </template>
-            </el-table-column>
-            <el-table-column prop="title" label="标题" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="url" label="链接" min-width="150" align="center"></el-table-column>
-            <el-table-column label="操作" align="center" width="250">
-                <template slot-scope="scope">
-                    <el-switch
-                        v-model="scope.row.isOpen"
-                        :active-value="0"
-                        :inactive-value="1"
-                        @change="switchOff($event, scope.row)"
-                        v-auth="'/shop:营销推广管理:禁用'">
-                    </el-switch>
-                    <el-button style="margin-left: 10px;" v-auth="'/shop:营销推广管理:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
-                    <el-button v-auth="'/shop:营销推广管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+  <!--   营销推广管理     -->
+  <div style="padding-top: 24px">
+    <div style="margin-bottom: 10px;text-align: right;">
+      <el-button v-auth="'/shop:营销推广管理:新增'"
+                 type="primary"
+                 round
+                 @click="add">新增</el-button>
+    </div>
+    <el-table :data="list"
+              class="table"
+              ref="table"
+              stripe
+              header-align="center"
+              row-key="id">
+      <el-table-column type="index"
+                       width="100"
+                       label="序号"
+                       align="center"></el-table-column>
+      <el-table-column prop="courseName"
+                       label="图片"
+                       min-width="150"
+                       align="center">
+        <template slot-scope="scope">
+          <img width="100"
+               :src="scope.row.banner"
+               alt="">
+        </template>
+      </el-table-column>
+      <el-table-column prop="title"
+                       label="标题"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="url"
+                       label="链接"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="250">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.isOpen"
+                     :active-value="0"
+                     :inactive-value="1"
+                     @change="switchOff($event, scope.row)"
+                     v-auth="'/shop:营销推广管理:禁用'">
+          </el-switch>
+          <el-button style="margin-left: 10px;"
+                     v-auth="'/shop:营销推广管理:编辑'"
+                     type="text"
+                     @click="edit(scope.row)">编辑</el-button>
+          <el-button v-auth="'/shop:营销推广管理:删除'"
+                     type="text"
+                     @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        
-        <el-dialog :title="(form.id ? '编辑' : '新增') + 'banner'" :visible.sync="bannerVisible" width="500px" class="dialog" :close-on-click-modal="false">
-            <el-form ref="form" label-width="60px">
-                <el-form-item label="图片">
-                  <el-upload
-                    class="avatar-uploader"
-                    accept=".jpg,.png,.jpeg,.gif"
-                    :on-change="changeFile"
-                    :show-file-list="false"
-                    :action="this.api.fileupload"
-                    :auto-upload="false"
-                  >
-                    <img v-if="form.banner" :src="form.banner" class="avatar">
-                    <div class="uploader-default" v-else>
-                        <i class="el-icon-plus"></i>
-                        <p>上传图片</p>
-                    </div>
-                  </el-upload>
-                </el-form-item>
-                <el-form-item label="标题">
-                  <el-input v-model="form.title" placeholder="请输入标题" maxlength="100"></el-input>
-                </el-form-item>
-                <el-form-item label="链接">
-                  <el-input v-model="form.url" placeholder="请输入链接" maxlength="100"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="bannerVisible = false">取消</el-button>
-                <el-button type="primary" @click="submitBanner">确定</el-button>
-            </span>
-        </el-dialog>
+    <el-dialog :title="(form.id ? '编辑' : '新增') + 'banner'"
+               :visible.sync="bannerVisible"
+               width="500px"
+               class="dialog"
+               :close-on-click-modal="false">
+      <el-form ref="form"
+               label-width="60px">
+        <el-form-item label="图片">
+          <el-upload class="avatar-uploader"
+                     accept=".jpg,.png,.jpeg,.gif"
+                     :on-change="changeFile"
+                     :show-file-list="false"
+                     :action="this.api.fileupload"
+                     :auto-upload="false">
+            <img v-if="form.banner"
+                 :src="form.banner"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传图片</p>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="标题">
+          <el-input v-model="form.title"
+                    placeholder="请输入标题"
+                    maxlength="100"></el-input>
+        </el-form-item>
+        <el-form-item label="链接">
+          <el-input v-model="form.url"
+                    placeholder="请输入链接"
+                    maxlength="100"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="bannerVisible = false">取消</el-button>
+        <el-button type="primary"
+                   @click="submitBanner">确定</el-button>
+      </span>
+    </el-dialog>
 
-        <!-- 剪裁组件弹窗 -->
-        <el-dialog title="图片裁剪" append-to-body :visible.sync="cropperModel" width="1100px" :close-on-click-modal="false">
-          <Cropper
-            ref="cropper"
-            :img-file.sync="file"
-            :is-upload="isUpload"
-            :fixed="true"
-            :fixedNumber.sync="fixedNumber"
-            @upload="customUpload" />
-        </el-dialog>
-    </div>
+    <!-- 剪裁组件弹窗 -->
+    <el-dialog title="图片裁剪"
+               append-to-body
+               :visible.sync="cropperModel"
+               width="1100px"
+               :close-on-click-modal="false">
+      <Cropper ref="cropper"
+               :img-file.sync="file"
+               :is-upload="isUpload"
+               :fixed="true"
+               :fixedNumber.sync="fixedNumber"
+               @upload="customUpload" />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -79,166 +121,166 @@ import Setting from '@/setting'
 import Cropper from '@/components/img-upload/Cropper'
 import Axios from 'axios'
 export default {
-    data() {
-        return {
-          headers: {
-              token: sessionStorage.getItem("token")
-          },
-          list: [],
-          bannerVisible: false,
-          form: {
-            id: '',
-            banner: '',
-            title: '',
-            url: '',
-          },
-          cropperModel: false,
-          isUpload: false,
-          fixedNumber: [5.7, 1],
-          file: ''
-        };
+  data () {
+    return {
+      headers: {
+        token: sessionStorage.getItem("token")
+      },
+      list: [],
+      bannerVisible: false,
+      form: {
+        id: '',
+        banner: '',
+        title: '',
+        url: '',
+      },
+      cropperModel: false,
+      isUpload: false,
+      fixedNumber: [5.48, 1],
+      file: ''
+    };
+  },
+  components: {
+    Cropper
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      this.$post(this.api.listMarketing, {
+        pageNum: 1,
+        pageSize: 1000
+      }).then(({ page }) => {
+        this.list = page.records;
+        this.total = page.total;
+      }).catch(res => {
+      });
     },
-    components: {
-      Cropper
+    // 图片裁剪上传事件
+    customUpload (data) {
+      const formData = new FormData()
+      formData.append('file', data, this.file.name)
+      this.imgUpload(formData)
     },
-    mounted() {
-      this.getList()
+    // 压缩图片
+    compress (img) {
+      const canvas = document.createElement('canvas')
+      const ctx = canvas.getContext('2d')
+      // let initSize = img.src.length;
+      const width = img.width
+      const height = img.height
+      canvas.width = width
+      canvas.height = height
+      // 铺底色
+      ctx.fillStyle = '#fff'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+      ctx.drawImage(img, 0, 0, width, height)
+      // 进行压缩
+      const ndata = canvas.toDataURL('image/jpeg', 0.8)
+      return ndata
     },
-    methods: {
-        getList() {
-            this.$post(this.api.listMarketing, {
-              pageNum: 1,
-              pageSize: 1000
-            }).then(({ page }) => {
-                this.list = page.records;
-                this.total = page.total;
-            }).catch(res => {
-            });
-        },
-        // 图片裁剪上传事件
-        customUpload(data) {
-          const formData = new FormData()
-          formData.append('file', data, this.file.name)
-          this.imgUpload(formData)
-        },
-        // 压缩图片
-        compress(img) {
-          const canvas = document.createElement('canvas')
-          const ctx = canvas.getContext('2d')
-          // let initSize = img.src.length;
-          const width = img.width
-          const height = img.height
-          canvas.width = width
-          canvas.height = height
-          // 铺底色
-          ctx.fillStyle = '#fff'
-          ctx.fillRect(0, 0, canvas.width, canvas.height)
-          ctx.drawImage(img, 0, 0, width, height)
-          // 进行压缩
-          const ndata = canvas.toDataURL('image/jpeg', 0.8)
-          return ndata
-        },
-        // base64转成bolb对象
-        dataURItoBlob(base64Data) {
-          let byteString
-          if (base64Data.split(',')[0].indexOf('base64') >= 0) {
-            byteString = atob(base64Data.split(',')[1])
-          } else {
-            byteString = unescape(base64Data.split(',')[1])
-          }
-          const mimeString = base64Data
-            .split(',')[0]
-            .split(':')[1]
-            .split(';')[0]
-          const ia = new Uint8Array(byteString.length)
-          for (let i = 0; i < byteString.length; i++) {
-            ia[i] = byteString.charCodeAt(i)
-          }
-          return new Blob([ia], {
-            type: mimeString
-          })
-        },
-        // 图片上传到服务器
-        imgUpload(formData) {
-          this.isUpload = true
-          Axios({
-            method: 'post',
-            url: this.api.fileUploadNakadai,
-            data: formData,
-            headers: {
-              'Content-Type': 'multipart/form-data',
-              ...this.headers
-            },
-          }).then(({ data }) => {
-            this.form.banner = data.filesResult.fileUrl
-          }).catch(res => {})
-          this.$refs.cropper.isDisabled = false
-          this.isUpload = false
-          this.cropperModel = false
-        },
-        // 图片改变钩子
-        changeFile(file) {
-          const { size, name } = file
-          const ext = name.substring(name.lastIndexOf('.') + 1)
-          if (!Util.isImg(ext)) {
-            this.$message.error('请上传图片！')
-            return false
-          }
-          this.file = file
-          this.cropperModel = true
-          this.$nextTick(() => {
-            this.$refs.cropper.updateImg({
-              url: window.URL.createObjectURL(file.raw),
-              size: file.size
-            })
-          })
-        },
-        add() {
-          this.form = {
-            id: '',
-            banner: '',
-            title: '',
-            url: '',
-          }
-          this.bannerVisible = true
-        },
-        edit(row) {
-          this.form = JSON.parse(JSON.stringify(row))
-          this.bannerVisible = true
-        },
-        // banner弹框提交
-        submitBanner() {
-          const { form } = this
-          if (!form.banner) return Util.errorMsg('请上传图片')
-          this.$post(this.api[form.id ? 'updateMarketing' : 'saveMarketing'], form).then(res => {
-            this.getList()
-            this.bannerVisible = false
-          }).catch(res => {})
-        },
-        handleDelete(row) {
-            this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    this.$post(`${this.api.delMarketing}?ids=${row.id}`).then(res => {
-                        Util.successMsg("删除成功");
-                        this.getList();
-                    }).catch(res => {
-                    });
-                })
-                .catch(() => {
-                });
+    // base64转成bolb对象
+    dataURItoBlob (base64Data) {
+      let byteString
+      if (base64Data.split(',')[0].indexOf('base64') >= 0) {
+        byteString = atob(base64Data.split(',')[1])
+      } else {
+        byteString = unescape(base64Data.split(',')[1])
+      }
+      const mimeString = base64Data
+        .split(',')[0]
+        .split(':')[1]
+        .split(';')[0]
+      const ia = new Uint8Array(byteString.length)
+      for (let i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i)
+      }
+      return new Blob([ia], {
+        type: mimeString
+      })
+    },
+    // 图片上传到服务器
+    imgUpload (formData) {
+      this.isUpload = true
+      Axios({
+        method: 'post',
+        url: this.api.fileUploadNakadai,
+        data: formData,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+          ...this.headers
         },
-        switchOff(val, row) {
-          this.$post(`${this.api.bannerEnableOrDisable}?id=${row.id}&isDisable=${row.isOpen}`).then(res => {}).catch(err => {})
-        }
+      }).then(({ data }) => {
+        this.form.banner = data.filesResult.fileUrl
+      }).catch(res => { })
+      this.$refs.cropper.isDisabled = false
+      this.isUpload = false
+      this.cropperModel = false
+    },
+    // 图片改变钩子
+    changeFile (file) {
+      const { size, name } = file
+      const ext = name.substring(name.lastIndexOf('.') + 1)
+      if (!Util.isImg(ext)) {
+        this.$message.error('请上传图片！')
+        return false
+      }
+      this.file = file
+      this.cropperModel = true
+      this.$nextTick(() => {
+        this.$refs.cropper.updateImg({
+          url: window.URL.createObjectURL(file.raw),
+          size: file.size
+        })
+      })
+    },
+    add () {
+      this.form = {
+        id: '',
+        banner: '',
+        title: '',
+        url: '',
+      }
+      this.bannerVisible = true
+    },
+    edit (row) {
+      this.form = JSON.parse(JSON.stringify(row))
+      this.bannerVisible = true
+    },
+    // banner弹框提交
+    submitBanner () {
+      const { form } = this
+      if (!form.banner) return Util.errorMsg('请上传图片')
+      this.$post(this.api[form.id ? 'updateMarketing' : 'saveMarketing'], form).then(res => {
+        this.getList()
+        this.bannerVisible = false
+      }).catch(res => { })
+    },
+    handleDelete (row) {
+      this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.$post(`${this.api.delMarketing}?ids=${row.id}`).then(res => {
+            Util.successMsg("删除成功");
+            this.getList();
+          }).catch(res => {
+          });
+        })
+        .catch(() => {
+        });
+    },
+    switchOff (val, row) {
+      this.$post(`${this.api.bannerEnableOrDisable}?id=${row.id}&isDisable=${row.isOpen}`).then(res => { }).catch(err => { })
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .m-l-10 {
-  margin-left: 10px;
+    margin-left: 10px;
 }
 
 $avatar-width: 104px;
@@ -253,7 +295,7 @@ $avatar-width: 104px;
         overflow: hidden;
 
         &:hover {
-            border-color: #409EFF;
+            border-color: #409eff;
         }
 
         .uploader-default {
diff --git a/src/views/shop/list/product/index.vue b/src/views/shop/list/product/index.vue
index ebb5acb..50bce0b 100644
--- a/src/views/shop/list/product/index.vue
+++ b/src/views/shop/list/product/index.vue
@@ -1,356 +1,440 @@
 <template>
-    <!--   产品管理     -->
-    <div style="padding-top: 24px">
-        <div class="tool">
-            <ul class="filter" style="align-items: flex-start">
-                <li>
-                    <label>学科类：</label>
-                    <el-select v-model="form.categoryId" clearable
-                                @change="getProfessionalClass()" @clear="clearClass()">
-                        <el-option v-for="(item,index) in subjectList" :key="index"
-                                    :label="item.disciplineName"
-                                    :value="item.disciplineId"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>专业类：</label>
-                    <el-select v-model="form.professionalCategoryId" clearable
-                                :disabled="form.categoryId ? false : true"
-                                @change="getProfessional" @clear="clearProfess()">
-                        <el-option v-for="(item,index) in professionalClassList" :key="index"
-                                    :label="item.professionalClassName"
-                                    :value="item.professionalClassId"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>专业：</label>
-                    <el-select v-model="form.professionalId" clearable
-                                :disabled="form.professionalCategoryId ? false : true"
-                                @change="initData">
-                        <el-option v-for="(item,index) in professionalList" :key="index"
-                                    :label="item.professionalName"
-                                    :value="item.professionalId"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>产品分类：</label>
-                    <el-select v-model="form.productClassification" clearable placeholder="请选择产品分类" @change="initData">
-                        <el-option v-for="(item, i) in productCategoryList" :key="i" :label="item.classificationName" :value="item.classificationId"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>搜索：</label>
-                    <el-input placeholder="请输入" suffix-icon="el-icon-search" v-model="form.productName" clearable size="small"></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button v-auth="'/shop:产品管理:新增'" type="primary" round @click="addCourse">新增</el-button>
-            </div>
-        </div>
+  <!--   产品管理     -->
+  <div style="padding-top: 24px">
+    <div class="tool">
+      <ul class="filter"
+          style="align-items: flex-start">
+        <li>
+          <label>学科类：</label>
+          <el-select v-model="form.categoryId"
+                     clearable
+                     @change="getProfessionalClass()"
+                     @clear="clearClass()">
+            <el-option v-for="(item,index) in subjectList"
+                       :key="index"
+                       :label="item.disciplineName"
+                       :value="item.disciplineId"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>专业类：</label>
+          <el-select v-model="form.professionalCategoryId"
+                     clearable
+                     :disabled="form.categoryId ? false : true"
+                     @change="getProfessional"
+                     @clear="clearProfess()">
+            <el-option v-for="(item,index) in professionalClassList"
+                       :key="index"
+                       :label="item.professionalClassName"
+                       :value="item.professionalClassId"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>专业：</label>
+          <el-select v-model="form.professionalId"
+                     clearable
+                     :disabled="form.professionalCategoryId ? false : true"
+                     @change="initData">
+            <el-option v-for="(item,index) in professionalList"
+                       :key="index"
+                       :label="item.professionalName"
+                       :value="item.professionalId"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>产品分类：</label>
+          <el-select v-model="form.productClassification"
+                     clearable
+                     placeholder="请选择产品分类"
+                     @change="initData">
+            <el-option v-for="(item, i) in productCategoryList"
+                       :key="i"
+                       :label="item.classificationName"
+                       :value="item.classificationId"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>搜索：</label>
+          <el-input placeholder="请输入"
+                    suffix-icon="el-icon-search"
+                    v-model="form.productName"
+                    clearable
+                    size="small"></el-input>
+        </li>
+      </ul>
+      <div>
+        <el-button v-auth="'/shop:产品管理:新增'"
+                   type="primary"
+                   round
+                   @click="addCourse">新增</el-button>
+      </div>
+    </div>
 
-        <el-table :data="list" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id" @sort-change="sortChange">
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="100" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (page - 1) * pageSize + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="productName" label="产品名称" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="supplierName" label="厂商" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="classificationName" label="产品分类" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="typeName" label="产品类型" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="associatedProductName" label="关联产品" min-width="140" align="center"></el-table-column>
-            <el-table-column prop="courseName" label="状态" min-width="140" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.isShelves ? '下架' : '上架' }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="orderQuantity" label="订单量" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="userName" label="最近编辑人" min-width="150" align="center"></el-table-column>
-            <el-table-column prop="selected" label="精选" min-width="150" align="center" sortable="custom">
-              <template slot-scope="scope">
-                <i v-auth="'/shop:产品管理:精选'" :class="['icon', scope.row.selected ? 'el-icon-check' : 'el-icon-close']" @click="selected(scope.row)"></i>
-              </template>
-            </el-table-column>
-            <el-table-column label="上架/下架" align="center" width="90">
-                <template slot-scope="scope">
-                    <el-switch
-                        v-model="scope.row.isShelves"
-                        :active-value="0"
-                        :inactive-value="1"
-                        @change="changeSwitch($event, scope.row)"
-                        v-auth="'/shop:产品管理:上下架'">
-                    </el-switch>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="120">
-              <template slot-scope="scope">
-                <template v-if="scope.row.isShelves">
-                    <el-button v-auth="'/shop:产品管理:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
-                    <el-button v-auth="'/shop:产品管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-                <el-button v-else v-auth="'/shop:产品管理:查看'" type="text" @click="edit(scope.row, 1)">查看</el-button>
-              </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-            </el-pagination>
-        </div>
+    <el-table :data="list"
+              class="table"
+              ref="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id"
+              @sort-change="sortChange">
+      <el-table-column type="selection"
+                       width="80"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="100"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + (page - 1) * pageSize + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="productName"
+                       label="产品名称"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="supplierName"
+                       label="厂商"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="classificationName"
+                       label="产品分类"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="typeName"
+                       label="产品类型"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="associatedProductName"
+                       label="关联产品"
+                       min-width="140"
+                       align="center"></el-table-column>
+      <el-table-column prop="courseName"
+                       label="状态"
+                       min-width="140"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.row.isShelves ? '下架' : '上架' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderQuantity"
+                       label="订单量"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="userName"
+                       label="最近编辑人"
+                       min-width="150"
+                       align="center"></el-table-column>
+      <el-table-column prop="selected"
+                       label="精选"
+                       min-width="150"
+                       align="center"
+                       sortable="custom">
+        <template slot-scope="scope">
+          <i v-auth="'/shop:产品管理:精选'"
+             :class="['icon', scope.row.selected ? 'el-icon-check' : 'el-icon-close']"
+             @click="selected(scope.row)"></i>
+        </template>
+      </el-table-column>
+      <el-table-column label="上架/下架"
+                       align="center"
+                       width="90">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.isShelves"
+                     :active-value="0"
+                     :inactive-value="1"
+                     @change="changeSwitch($event, scope.row)"
+                     v-auth="'/shop:产品管理:上下架'">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="120">
+        <template slot-scope="scope">
+          <template v-if="scope.row.isShelves">
+            <el-button v-auth="'/shop:产品管理:编辑'"
+                       type="text"
+                       @click="edit(scope.row)">编辑</el-button>
+            <el-button v-auth="'/shop:产品管理:删除'"
+                       type="text"
+                       @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+          <el-button v-else
+                     v-auth="'/shop:产品管理:查看'"
+                     type="text"
+                     @click="edit(scope.row, 1)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
+      </el-pagination>
     </div>
+  </div>
 </template>
 
 <script>
 import Util from "@/libs/util";
 import Setting from '@/setting'
 export default {
-    data() {
-        return {
-          timer: null,
-          form: {
-            hotTag: 1,
-            sort: 0,
-            categoryId: '',
-            productClassification: '',
-            productName: '',
-            professionalCategoryId: '',
-            professionalId: '',
-          },
-          subjectList: [], //专业学科
-          professionalClassList: [], //专业类
-          professionalList: [], //专业
-          productCategoryList: [],
-          list: [],
-          multipleSelection: [],
-          page: +this.$route.query.page || 1, // 当前页码
-          pageSize: 10,
-          total: 0
-        };
+  data () {
+    return {
+      timer: null,
+      form: {
+        hotTag: 1,
+        sort: 0,
+        categoryId: '',
+        productClassification: '',
+        productName: '',
+        professionalCategoryId: '',
+        professionalId: '',
+      },
+      subjectList: [], //专业学科
+      professionalClassList: [], //专业类
+      professionalList: [], //专业
+      productCategoryList: [],
+      list: [],
+      multipleSelection: [],
+      page: +this.$route.query.page || 1, // 当前页码
+      pageSize: 10,
+      total: 0
+    };
+  },
+  watch: {
+    'form.productName': function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getSubject()
+    this.getCategory()
+    this.initData()
+  },
+  methods: {
+    getData () {
+      this.$post(this.api.listOfGoods, {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        ...this.form
+      }).then(({ page }) => {
+        this.list = page.records;
+        this.total = page.total;
+      }).catch(res => {
+      });
     },
-    watch: {
-        'form.productName': function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
-        }
+    initData () {
+      this.page = 1;
+      this.getData();
     },
-    mounted() {
-        this.getSubject()
-        this.getCategory()
-        this.initData()
+
+    // 获取产品分类
+    getCategory () {
+      this.$get(this.api.productCategoryList).then(res => {
+        this.productCategoryList = res.classificationList
+      }).catch(err => { })
     },
-    methods: {
-        getData() {
-            this.$post(this.api.listOfGoods, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              ...this.form
-            }).then(({ page }) => {
-                this.list = page.records;
-                this.total = page.total;
-            }).catch(res => {
-            });
-        },
-        initData() {
-            this.page = 1;
-            this.getData();
-        },
-        
-        // 获取产品分类
-        getCategory() {
-          this.$get(this.api.productCategoryList).then(res => {
-            this.productCategoryList = res.classificationList
-          }).catch(err => {})
-        },
-        // 获取学科类别
-        getSubject() {
-            this.$get(this.api.courseDiscipline).then(res => {
-                this.subjectList = res.list;
-            }).catch(err => {
-            });
-        },
-        // 清除学科类别
-        clearClass() {
-            this.form.professionalCategoryId = "";
-            this.form.professionalId = "";
-        },
-        // 获取专业类
-        getProfessionalClass() {
-            this.clearClass();
-            this.getProfessionalClassData();
-            this.page = 1;
-            this.initData();
-        },
-        getProfessionalClassData() {
-            let data = {
-                disciplineId: this.form.categoryId
-            };
-            this.$get(this.api.courseProfessionalClass, data).then(res => {
-                this.professionalClassList = res.list;
-            }).catch(err => {
-            });
-        },
-        // 清除专业类
-        clearProfess() {
-            this.form.professionalId = "";
-        },
-        // 获取专业
-        getProfessional() {
-            this.clearProfess();
-            this.getProfessionalData();
-            this.page = 1;
+    // 获取学科类别
+    getSubject () {
+      this.$get(this.api.courseDiscipline).then(res => {
+        this.subjectList = res.list;
+      }).catch(err => {
+      });
+    },
+    // 清除学科类别
+    clearClass () {
+      this.form.professionalCategoryId = "";
+      this.form.professionalId = "";
+    },
+    // 获取专业类
+    getProfessionalClass () {
+      this.clearClass();
+      this.getProfessionalClassData();
+      this.page = 1;
+      this.initData();
+    },
+    getProfessionalClassData () {
+      let data = {
+        disciplineId: this.form.categoryId
+      };
+      this.$get(this.api.courseProfessionalClass, data).then(res => {
+        this.professionalClassList = res.list;
+      }).catch(err => {
+      });
+    },
+    // 清除专业类
+    clearProfess () {
+      this.form.professionalId = "";
+    },
+    // 获取专业
+    getProfessional () {
+      this.clearProfess();
+      this.getProfessionalData();
+      this.page = 1;
+      this.initData();
+    },
+    getProfessionalData () {
+      let data = {
+        professionalClassId: this.form.professionalCategoryId
+      };
+      this.$get(this.api.courseProfessional, data).then(res => {
+        this.professionalList = res.list;
+      }).catch(err => {
+      });
+    },
+    addCourse () {
+      this.$router.push("/shop/addProduct");
+    },
+    edit (row, show = 0) {
+      this.$router.push(`/shop/addProduct?id=${row.mallId}&show=${show}`)
+    },
+    handleDelete (row) {
+      this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.$post(this.api.deletionOfGoods, row.mallId).then(res => {
+            Util.successMsg("删除成功");
             this.initData();
-        },
-        getProfessionalData() {
-            let data = {
-                professionalClassId: this.form.professionalCategoryId
-            };
-            this.$get(this.api.courseProfessional, data).then(res => {
-                this.professionalList = res.list;
-            }).catch(err => {
-            });
-        },
-        addCourse() {
-            this.$router.push("/shop/addProduct");
-        },
-        edit(row, show = 0) {
-            this.$router.push(`/shop/addProduct?id=${row.mallId}&show=${show}`)
-        },
-        handleDelete(row) {
-            this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
-                type: "warning"
+          }).catch(res => {
+          });
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+    },
+    delAllData () {
+      const list = this.multipleSelection
+      if (list.length != "") {
+        this.$confirm(`确定要删除吗？`, "提示", {
+          type: "warning"
+        })
+          .then(() => {
+            const data = []
+            list.map(e => {
+              data.push('ids=' + e.id)
             })
-                .then(() => {
-                    this.$post(this.api.deletionOfGoods, row.mallId).then(res => {
-                        Util.successMsg("删除成功");
-                        this.initData();
-                    }).catch(res => {
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        delAllData() {
-          const list = this.multipleSelection
-          if (list.length != "") {
-              this.$confirm(`确定要删除吗？`, "提示", {
-                  type: "warning"
-              })
-                  .then(() => {
-                    const data = []
-                    list.map(e => {
-                      data.push('ids=' + e.id)
-                    })
-                    this.$post(`${this.api.delTheoreticalCourse}?${data.join('&')}`).then(res => {
-                        this.$refs.table.clearSelection();
-                        Util.successMsg("删除成功");
-                        this.initData();
-                    }).catch(res => {
-                    });
-                  }).catch(() => {
-              });
-          } else {
-              Util.errorMsg("请先选择数据 ！");
-          }
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        // 上下架
-        async changeSwitch(value, row) {
-          const res = await this.$get(`${this.api.detailsOfGoods}?mallId=${row.mallId}`)
-          const form = res.orderDetails
-          const { mall } = form
-          let err
-          let disErr
-          // for (const e of form.mallDisciplines) {
-          //   if (!e.categoryId) {
-          //     disErr = '请选择学科类别！'
-          //     break
-          //   }
-          //   if (!e.professionalCategoryId) {
-          //     disErr = '请选择专业类！'
-          //     break
-          //   }
-          //   if (!e.professionalId) {
-          //     disErr = '请选择专业！'
-          //     break
-          //   }
-          // }
+            this.$post(`${this.api.delTheoreticalCourse}?${data.join('&')}`).then(res => {
+              this.$refs.table.clearSelection();
+              Util.successMsg("删除成功");
+              this.initData();
+            }).catch(res => {
+            });
+          }).catch(() => {
+          });
+      } else {
+        Util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getData();
+    },
+    // 上下架
+    async changeSwitch (value, row) {
+      const res = await this.$get(`${this.api.detailsOfGoods}?mallId=${row.mallId}`)
+      const form = res.orderDetails
+      const { mall } = form
+      let err
+      let disErr
+      // for (const e of form.mallDisciplines) {
+      //   if (!e.categoryId) {
+      //     disErr = '请选择学科类别！'
+      //     break
+      //   }
+      //   if (!e.professionalCategoryId) {
+      //     disErr = '请选择专业类！'
+      //     break
+      //   }
+      //   if (!e.professionalId) {
+      //     disErr = '请选择专业！'
+      //     break
+      //   }
+      // }
 
-          let priceErr
-          for (const e of form.mallPrices) {
-            if (e.settlementPrice === '' || e.settlementPrice === undefined || e.area === '') {
-              priceErr = 1
-              break
-            }
-          }
-          if (!mall.isAssociatedProduct && !mall.associatedProduct) {
-            err = 1
-          } else if (!form.classificationIds.length) {
-            err = 1
-          } else if (!form.typeIds.length) {
-            err = 1
-          } else if (!form.supplierIds.length) {
-            err = 1
-          } else if (disErr) {
-            err = disErr
-          } else if (!mall.coverDrawing) {
-            err = 1
-          } else if (!mall.marketUnitPrice) {
-            err = 1
-          } else if (priceErr) {
-            err = 1
-          } else if (!mall.productIntroduction) {
-            err = 1
-          } else if (!mall.detailedIntroduction) {
-            err = 1
-          }
-          if (err) {
-            Util.errorMsg('无法上架！请编辑产品后上架！')
-            row.isShelves = 1
-            return
-          }
-          this.$post(`${this.api.goodsOffTheShelf}?mallId=${row.mallId}&isShelves=${value}`).then((res) => {
-            this.getData()
-          }).catch(({ status }) => {
-            if (status !== 200) row.isShelves = 1
-          })
-        },
-        // 精选
-        selected(row) {
-          this.$post(`${this.api.goodsSelection}?mallId=${row.mallId}&selected=${row.selected ? 0 : 1}`).then((res) => {
-                this.getData();
-            }).catch((res) => {})
-        },
-      // 排序回调
-      sortChange(column) {
-        const { order } = column
-        if (column.prop === 'selected') {
-          this.form.sort = order ? order === 'ascending' ? 4 : 3 : 0
+      let priceErr
+      for (const e of form.mallPrices) {
+        if (e.settlementPrice === '' || e.settlementPrice === undefined || e.area === '') {
+          priceErr = 1
+          break
         }
+      }
+      if (!mall.isAssociatedProduct && !mall.associatedProduct) {
+        err = 1
+      } else if (!form.classificationIds.length) {
+        err = 1
+      } else if (!form.typeIds.length) {
+        err = 1
+      } else if (!form.supplierIds.length) {
+        err = 1
+      } else if (disErr) {
+        err = disErr
+      } else if (!mall.coverDrawing) {
+        err = 1
+      } else if (!mall.marketUnitPrice) {
+        err = 1
+      } else if (priceErr) {
+        err = 1
+      } else if (!mall.productIntroduction) {
+        err = 1
+      } else if (!mall.detailedIntroduction) {
+        err = 1
+      }
+      if (err) {
+        Util.errorMsg('无法上架！请编辑产品后上架！')
+        row.isShelves = 1
+        return
+      }
+      this.$post(`${this.api.goodsOffTheShelf}?mallId=${row.mallId}&isShelves=${value}`).then((res) => {
         this.getData()
-      },
-    }
+      }).catch(({ status }) => {
+        if (status !== 200) row.isShelves = 1
+      })
+    },
+    // 精选
+    selected (row) {
+      this.$post(`${this.api.goodsSelection}?mallId=${row.mallId}&selected=${row.selected ? 0 : 1}`).then((res) => {
+        this.getData();
+      }).catch((res) => { })
+    },
+    // 排序回调
+    sortChange (column) {
+      const { order } = column
+      if (column.prop === 'selected') {
+        this.form.sort = order ? order === 'ascending' ? 4 : 3 : 0
+      }
+      this.getData()
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 /deep/ .tool {
+    margin-bottom: 14px;
     .filter {
+        flex-wrap: wrap;
+        li {
+            margin-bottom: 10px;
+        }
         .el-input {
             min-width: 215px;
         }
     }
 }
 .icon {
-  font-size: 16px;
-  color: #9076FF;
-  cursor: pointer;
+    font-size: 16px;
+    color: #9076ff;
+    cursor: pointer;
 }
 </style>
\ No newline at end of file