Bläddra i källkod

Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

# Conflicts:
#	src/views/course/userCoursePeriod/index.vue
caoliqin 1 vecka sedan
förälder
incheckning
6f3ce360dd

+ 1 - 1
src/views/course/courseQuestionBank/index.vue

@@ -300,7 +300,7 @@
         <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button type="primary" :loading="upload.isUploading" :disabled="upload.isUploading" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>

+ 238 - 216
src/views/course/userCoursePeriod/index.vue

@@ -22,10 +22,10 @@
           <div class="sort-wrapper">
             <span class="sort-label">排序方式</span>
             <el-select v-model="leftQueryParams.scs"
-            placeholder="按序号倒序"
-            size="small"
-            class="sort-select"
-            @change="handleSortChange"
+                       placeholder="按序号倒序"
+                       size="small"
+                       class="sort-select"
+                       @change="handleSortChange"
             >
               <el-option label="按序号倒序" value="order_number(desc),training_camp_id(desc)" />
               <el-option label="按序号顺序" value="order_number(asc),training_camp_id(desc)" />
@@ -64,7 +64,7 @@
             </div>
             <div class="camp-actions">
               <el-button type="text" class="action-btn delete-btn" @click.stop="handleDeleteCamp(item)" v-hasPermi="['course:trainingCamp:remove']">删除</el-button>
-<!--              <el-button type="text" class="action-btn copy-btn" @click.stop="handleCopyCamp(item)" v-hasPermi="['course:trainingCamp:copy']">复制</el-button>-->
+              <!--              <el-button type="text" class="action-btn copy-btn" @click.stop="handleCopyCamp(item)" v-hasPermi="['course:trainingCamp:copy']">复制</el-button>-->
               <el-button type="text" class="action-btn copy-btn" @click.stop="handleEditCamp(item)" v-hasPermi="['course:trainingCamp:edit']">编辑</el-button>
             </div>
           </div>
@@ -105,18 +105,18 @@
           </el-form-item>
           <el-form-item label="开营日期开始" prop="periodStartingTime" label-width="120px">
             <el-date-picker clearable size="small" style="width: 200px"
-              v-model="queryParams.periodStartingTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择开营日期开始时间">
+                            v-model="queryParams.periodStartingTime"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择开营日期开始时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="开营日期结束" prop="periodEndTime" label-width="120px">
             <el-date-picker clearable size="small" style="width: 300px"
-              v-model="queryParams.periodEndTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择开营日期结束时间">
+                            v-model="queryParams.periodEndTime"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择开营日期结束时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -177,19 +177,19 @@
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['course:period:query']"
               >修改</el-button>
-    <!--              <el-button-->
-    <!--                size="mini"-->
-    <!--                type="text"-->
-    <!--                icon="el-icon-edit"-->
-    <!--                @click="handleCourse(scope.row)"-->
-    <!--                v-hasPermi="['course:period:edit']"-->
-    <!--              >课程管理</el-button>-->
-    <!--              <el-button-->
-    <!--                size="mini"-->
-    <!--                type="text"-->
-    <!--                icon="el-icon-money"-->
-    <!--                @click="setRedPacket(scope.row)"-->
-    <!--              >设置红包</el-button>-->
+              <!--              <el-button-->
+              <!--                size="mini"-->
+              <!--                type="text"-->
+              <!--                icon="el-icon-edit"-->
+              <!--                @click="handleCourse(scope.row)"-->
+              <!--                v-hasPermi="['course:period:edit']"-->
+              <!--              >课程管理</el-button>-->
+              <!--              <el-button-->
+              <!--                size="mini"-->
+              <!--                type="text"-->
+              <!--                icon="el-icon-money"-->
+              <!--                @click="setRedPacket(scope.row)"-->
+              <!--              >设置红包</el-button>-->
               <el-button
                 size="mini"
                 type="text"
@@ -212,15 +212,15 @@
               >删除</el-button>
             </template>
           </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-main>
     </el-container>
 
@@ -230,7 +230,7 @@
         <el-form-item label="营期名称" prop="periodName">
           <el-input v-model="form.periodName" placeholder="请输入营期名称" />
         </el-form-item>
-         <el-form-item label="公司" prop="companyId">
+        <el-form-item label="公司" prop="companyId">
           <el-select v-model="form.companyId" placeholder="请选择公司" multiple>
             <el-option
               v-for="item in companyOptions"
@@ -339,31 +339,31 @@
       </div>
     </el-dialog>
 
-<!--    &lt;!&ndash; 添加或修改会员营期对话框&ndash;&gt;-->
-<!--    <el-dialog title="课程管理" :visible.sync="course.open" width="75%" top="10px" append-to-body style="padding-bottom: 10px">-->
-<!--      <el-row :gutter="10" class="mb8">-->
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            v-if="(getDiff(course.row.periodStartingTime, course.row.periodEndTime) - course.total) > 0"-->
-<!--            type="primary"-->
-<!--            icon="el-icon-plus"-->
-<!--            size="mini"-->
-<!--            @click="handleAddCourse"-->
-<!--            v-hasPermi="['course:period:add']"-->
-<!--          >添加课程</el-button>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-table v-loading="course.loading" :data="course.list">-->
-<!--        <el-table-column label="课程" align="center" prop="courseName" width="180" />-->
-<!--        <el-table-column label="小节" align="center" prop="videoName" />-->
-<!--        <el-table-column label="营期时间" align="center" prop="dayDate" width="150"  />-->
-<!--        <el-table-column label="创建时间" align="center" prop="createTime" width="150" />-->
-<!--      </el-table>-->
-
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--&lt;!&ndash;        <el-button type="primary" @click="saveCourseData">保存</el-button>&ndash;&gt;-->
-<!--      </div>-->
-<!--    </el-dialog>-->
+    <!--    &lt;!&ndash; 添加或修改会员营期对话框&ndash;&gt;-->
+    <!--    <el-dialog title="课程管理" :visible.sync="course.open" width="75%" top="10px" append-to-body style="padding-bottom: 10px">-->
+    <!--      <el-row :gutter="10" class="mb8">-->
+    <!--        <el-col :span="1.5">-->
+    <!--          <el-button-->
+    <!--            v-if="(getDiff(course.row.periodStartingTime, course.row.periodEndTime) - course.total) > 0"-->
+    <!--            type="primary"-->
+    <!--            icon="el-icon-plus"-->
+    <!--            size="mini"-->
+    <!--            @click="handleAddCourse"-->
+    <!--            v-hasPermi="['course:period:add']"-->
+    <!--          >添加课程</el-button>-->
+    <!--        </el-col>-->
+    <!--      </el-row>-->
+    <!--      <el-table v-loading="course.loading" :data="course.list">-->
+    <!--        <el-table-column label="课程" align="center" prop="courseName" width="180" />-->
+    <!--        <el-table-column label="小节" align="center" prop="videoName" />-->
+    <!--        <el-table-column label="营期时间" align="center" prop="dayDate" width="150"  />-->
+    <!--        <el-table-column label="创建时间" align="center" prop="createTime" width="150" />-->
+    <!--      </el-table>-->
+
+    <!--      <div slot="footer" class="dialog-footer">-->
+    <!--&lt;!&ndash;        <el-button type="primary" @click="saveCourseData">保存</el-button>&ndash;&gt;-->
+    <!--      </div>-->
+    <!--    </el-dialog>-->
 
     <!-- 添加课程对话框-->
     <el-dialog title="添加课程" :visible.sync="course.addOpen" width="500px" append-to-body>
@@ -388,6 +388,29 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="看课时间" prop="timeRange">
+          <el-time-picker
+            is-range
+            v-model="course.form.timeRange"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59'
+            }"
+            range-separator="至"
+            start-placeholder="开始时间"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            end-placeholder="结束时间">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="领取红包时间" prop="lastJoinTime">
+          <el-time-picker
+            v-model="course.form.joinTime"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            placeholder="选择时间范围">
+          </el-time-picker>
+          <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间,只允许看课,不允许领取红包</p>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitCourseForm">确 定</el-button>
@@ -410,12 +433,8 @@
         <el-form-item label="领取红包时间" prop="lastJoinTime">
           <el-time-picker
             v-model="updateCourse.form.joinTime"
-            :selectableRange="updateCourse.form.timeRange"
             value-format="HH:mm:ss"
             format="HH:mm:ss"
-            :picker-options="{
-              selectableRange: updateCourse.form.timeRange || '00:00:00 - 23:59:59'
-            }"
             placeholder="选择时间范围">
           </el-time-picker>
           <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间,只允许看课,不允许领取红包</p>
@@ -426,135 +445,135 @@
         <el-button @click="closeUpdateCourse">取 消</el-button>
       </div>
     </el-dialog>
-<!--    <el-dialog title="修改营期时间" :visible.sync="updateDateOpen" width="500px" append-to-body>-->
-<!--      <el-form ref="courseUpdateForm" :model="form" label-width="100px">-->
-<!--        <el-form-item label="营期时间" prop="dayDate">-->
-<!--          <el-date-picker-->
-<!--            v-model="form.dayDate"-->
-<!--            :selectableRange="form.dayDate"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            type="date"-->
-<!--            placeholder="选择时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button type="primary" @click="updateDate">确 定</el-button>-->
-<!--        <el-button @click="updateDateOpen = false">取 消</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
-
-<!--    <red-packet-->
-<!--      :visible.sync="redPacketVisible"-->
-<!--      :periodId="currentRedPacketData.periodId"-->
-<!--      :videoId="currentRedPacketData.videoId"-->
-<!--      @success="handleRedPacketSuccess"-->
-<!--    />-->
+    <!--    <el-dialog title="修改营期时间" :visible.sync="updateDateOpen" width="500px" append-to-body>-->
+    <!--      <el-form ref="courseUpdateForm" :model="form" label-width="100px">-->
+    <!--        <el-form-item label="营期时间" prop="dayDate">-->
+    <!--          <el-date-picker-->
+    <!--            v-model="form.dayDate"-->
+    <!--            :selectableRange="form.dayDate"-->
+    <!--            value-format="yyyy-MM-dd"-->
+    <!--            type="date"-->
+    <!--            placeholder="选择时间">-->
+    <!--          </el-date-picker>-->
+    <!--        </el-form-item>-->
+    <!--      </el-form>-->
+    <!--      <div slot="footer" class="dialog-footer">-->
+    <!--        <el-button type="primary" @click="updateDate">确 定</el-button>-->
+    <!--        <el-button @click="updateDateOpen = false">取 消</el-button>-->
+    <!--      </div>-->
+    <!--    </el-dialog>-->
+
+    <!--    <red-packet-->
+    <!--      :visible.sync="redPacketVisible"-->
+    <!--      :periodId="currentRedPacketData.periodId"-->
+    <!--      :videoId="currentRedPacketData.videoId"-->
+    <!--      @success="handleRedPacketSuccess"-->
+    <!--    />-->
 
     <!-- 营期相关设置抽屉 -->
-  <el-drawer
-    title="营期相关设置"
-    :visible.sync="periodSettingsVisible"
-    direction="rtl"
-    size="74%"
-    :destroy-on-close="true"
-    append-to-body
-    custom-class="period-settings-drawer"
-  >
-    <div class="drawer-content" style="margin-left: 25px">
-      <el-tabs v-model="activeTab" @tab-click="handleTabClick">
-        <el-tab-pane label="课程管理" name="course">
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                v-if="(getDiff(periodSettingsData.periodStartingTime, periodSettingsData.periodEndTime) - course.total) > 0"
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAddCourse"
-                v-hasPermi="['course:period:addCourse']"
-              >添加课程</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                size="mini"
-                :disabled="updateCourse.ids.length <= 0"
-                @click="handleUpdateCourse"
-                v-hasPermi="['course:period:updateCourseTime']"
-              >修改看课时间</el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="course.loading" :data="course.list" @selection-change="handleSelectionCourseChange" border>
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="课程" align="center" prop="courseName" width="180" />
-            <el-table-column label="小节" align="center" prop="videoName" />
-            <el-table-column label="开课状态" align="center" prop="status" width="100" :formatter="courseStatusFormatter" />
-            <el-table-column label="营期时间" align="center" prop="dayDate" />
-            <el-table-column label="开始时间" align="center" prop="startDateTime" width="100">
-              <template slot-scope="scope">
-                <el-tag>{{parseTime(scope.row.startDateTime, '{h}:{i}:{s}')}}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="结束时间" align="center" prop="endDateTime" width="100">
-              <template slot-scope="scope">
-                <el-tag type="success">{{parseTime(scope.row.endDateTime, '{h}:{i}:{s}')}}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="领取红包时间" align="center" prop="lastJoinTime" width="100">
-              <template slot-scope="scope">
-                <el-tag type="danger">{{parseTime(scope.row.lastJoinTime, '{h}:{i}:{s}')}}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
+    <el-drawer
+      title="营期相关设置"
+      :visible.sync="periodSettingsVisible"
+      direction="rtl"
+      size="74%"
+      :destroy-on-close="true"
+      append-to-body
+      custom-class="period-settings-drawer"
+    >
+      <div class="drawer-content" style="margin-left: 25px">
+        <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+          <el-tab-pane label="课程管理" name="course">
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
                 <el-button
+                  v-if="(getDiff(periodSettingsData.periodStartingTime, periodSettingsData.periodEndTime) - course.total) > 0"
+                  type="primary"
+                  icon="el-icon-plus"
                   size="mini"
-                  type="text"
-                  icon="el-icon-top"
-                  @click="handleTop(scope.row)"
-                  v-hasPermi="['course:period:courseMove']"
-                >上移</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-bottom"
-                @click="handleBottom(scope.row)"
-                v-hasPermi="['course:period:courseMove']"
-              >下移</el-button>
-<!--              <el-button-->
-<!--                size="mini"-->
-<!--                type="text"-->
-<!--                icon="el-icon-edit"-->
-<!--                @click="handleUpdateDate(scope.row)"-->
-<!--              >修改营期时间</el-button>-->
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="公司列表" name="company">
-          <red-packet
-            :visible.sync="redPacketVisible"
-            :activeTab="activeTab"
-            :periodId="periodSettingsData.periodId"
-            @success="handleRedPacketSuccess"
-          />
-        </el-tab-pane>
-        <el-tab-pane label="课程统计" name="statistics">
-          <course-statistics
-            :periodId="periodSettingsData.periodId"
-            :active="activeTab === 'statistics'"
-          />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-drawer>
-
-  <batch-red-packet
-    :visible.sync="batchRedPacketVisible"
-    :selected-data="selectedPeriods"
-    @success="handleBatchRedPacketSuccess"
-  />
+                  @click="handleAddCourse"
+                  v-hasPermi="['course:period:addCourse']"
+                >添加课程</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  :disabled="updateCourse.ids.length <= 0"
+                  @click="handleUpdateCourse"
+                  v-hasPermi="['course:period:updateCourseTime']"
+                >修改看课时间</el-button>
+              </el-col>
+            </el-row>
+            <el-table v-loading="course.loading" :data="course.list" @selection-change="handleSelectionCourseChange" border>
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="课程" align="center" prop="courseName" width="180" />
+              <el-table-column label="小节" align="center" prop="videoName" />
+              <el-table-column label="开课状态" align="center" prop="status" width="100" :formatter="courseStatusFormatter" />
+              <el-table-column label="营期时间" align="center" prop="dayDate" />
+              <el-table-column label="开始时间" align="center" prop="startDateTime" width="100">
+                <template slot-scope="scope">
+                  <el-tag>{{parseTime(scope.row.startDateTime, '{h}:{i}:{s}')}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="结束时间" align="center" prop="endDateTime" width="100">
+                <template slot-scope="scope">
+                  <el-tag type="success">{{parseTime(scope.row.endDateTime, '{h}:{i}:{s}')}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="领取红包时间" align="center" prop="lastJoinTime" width="100">
+                <template slot-scope="scope">
+                  <el-tag type="danger">{{parseTime(scope.row.lastJoinTime, '{h}:{i}:{s}')}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-top"
+                    @click="handleTop(scope.row)"
+                    v-hasPermi="['course:period:courseMove']"
+                  >上移</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-bottom"
+                    @click="handleBottom(scope.row)"
+                    v-hasPermi="['course:period:courseMove']"
+                  >下移</el-button>
+                  <!--              <el-button-->
+                  <!--                size="mini"-->
+                  <!--                type="text"-->
+                  <!--                icon="el-icon-edit"-->
+                  <!--                @click="handleUpdateDate(scope.row)"-->
+                  <!--              >修改营期时间</el-button>-->
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="公司列表" name="company">
+            <red-packet
+              :visible.sync="redPacketVisible"
+              :activeTab="activeTab"
+              :periodId="periodSettingsData.periodId"
+              @success="handleRedPacketSuccess"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="课程统计" name="statistics">
+            <course-statistics
+              :periodId="periodSettingsData.periodId"
+              :active="activeTab === 'statistics'"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-drawer>
+
+    <batch-red-packet
+      :visible.sync="batchRedPacketVisible"
+      :selected-data="selectedPeriods"
+      @success="handleBatchRedPacketSuccess"
+    />
 
   </div>
 </template>
@@ -567,6 +586,7 @@ import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import RedPacket from './redPacket.vue'
 import BatchRedPacket from './batchRedPacket.vue'
 import CourseStatistics from './statistics.vue'
+import Da from "element-ui/src/locale/lang/da";
 
 export default {
   name: "Period",
@@ -874,28 +894,28 @@ export default {
       }
       const periodIds = row.periodId || this.ids;
       this.$confirm('是否确认删除该营期?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delPeriod(periodIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delPeriod(periodIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(function() {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有会员营期数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportPeriod(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportPeriod(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(function() {});
     },
 
     /** 批量设置红包 */
@@ -1204,9 +1224,7 @@ export default {
       if(type == 1){
         this.form.periodStartingTime = this.form.dateRange[0];
         this.form.periodEndTime = this.form.dateRange[1];
-
-
-         // 转换为天数
+        // 转换为天数
         let days = this.getDiff(this.form.periodStartingTime, this.form.periodEndTime);
         for (let i = 0; i < days; i++) {
           this.form.days.push({lesson: i + 1});
@@ -1263,6 +1281,8 @@ export default {
       this.course.form = {
         periodId: this.course.queryParams.periodId,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单
@@ -1276,7 +1296,7 @@ export default {
       this.updateCourse.open = true;
       this.updateCourse.form = {
         ids: this.updateCourse.ids,
-        timeRange: [], // 初始化timeRange
+        timeRange: null, // 初始化timeRange
         joinTime: null // 初始化joinTime
       };
     },
@@ -1285,6 +1305,8 @@ export default {
       this.course.form = {
         periodId: null,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单
@@ -1337,11 +1359,11 @@ export default {
     },
     updateDate(){
       updateCourseDate(this.form).then(response => {
-          this.$message.success('修改成功');
-          this.updateDateOpen = false;
-          // 重新加载训练营列表
-          this.getCourseList();
-        });
+        this.$message.success('修改成功');
+        this.updateDateOpen = false;
+        // 重新加载训练营列表
+        this.getCourseList();
+      });
     },
     saveCourseData(){
       updateListCourseData(this.course.list).then(response => {

+ 1 - 1
src/views/his/chineseMedicine/index.vue

@@ -95,7 +95,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table height="660" v-loading="loading" :data="chineseMedicineList" @selection-change="handleSelectionChange">
+    <el-table height="600" v-loading="loading" :data="chineseMedicineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="图片" align="center" prop="imgUrl" >
         <template slot-scope="scope">

+ 2 - 2
src/views/his/famousPrescribe/index.vue

@@ -140,7 +140,7 @@
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -195,7 +195,7 @@
         <el-form-item label="拼音" prop="pinyin">
           <el-input v-model="form.pinyin" placeholder="请输入拼音" />
         </el-form-item>
-        
+
         <el-form-item label="功效概述" prop="pinyin">
           <el-input v-model="form.actionTitle" placeholder="请输入功效概述" />
         </el-form-item>

+ 5 - 5
src/views/his/medicatedFood/index.vue

@@ -118,7 +118,7 @@
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -181,7 +181,7 @@
           <el-input-number v-model="form.sort"  :min="0" label="请输入排序"></el-input-number>
         </el-form-item>
         <el-form-item label="功效" prop="action">
-          
+
           <el-select v-model="form.action" placeholder="请选择功效">
                 <el-option
                     v-for="dict in actionOptions"
@@ -190,7 +190,7 @@
                     :value="dict.dictValue"
                   />
                 </el-select>
-        
+
         </el-form-item>
         <el-form-item label="食材" prop="food">
           <el-select v-model="form.food" placeholder="请选择食材">
@@ -201,10 +201,10 @@
                     :value="dict.dictValue"
                   />
                 </el-select>
-    
+
         </el-form-item>
         <el-form-item label="疾病" prop="indications">
-   
+
             <el-select v-model="form.indications" placeholder="请选择疾病">
                   <el-option
                       v-for="dict in foodOptions"

+ 2 - 2
src/views/his/vessel/index.vue

@@ -103,7 +103,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table height="650" v-loading="loading" :data="vesselList" @selection-change="handleSelectionChange">
+    <el-table height="660" v-loading="loading" :data="vesselList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="图片" align="center" prop="imgUrl" >
           <template slot-scope="scope">
@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
        <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"