吴树波 1 hónapja
szülő
commit
10fd84172d

+ 8 - 0
src/api/course/userCourseVideo.js

@@ -49,6 +49,14 @@ export function batchSaveVideo(data) {
     data: data
   })
 }
+// 新增课堂视频
+export function batchUpdateRed(data) {
+  return request({
+    url: '/course/userCourseVideo/batchUpdateRed',
+    method: 'post',
+    data: data
+  })
+}
 
 // 修改课堂视频
 export function updateUserCourseVideo(data) {

+ 5 - 2
src/views/components/course/userCourseCatalogDetails.vue

@@ -295,7 +295,7 @@
         <el-button type="primary" @click="batchVideoSave">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="视频库选择" :visible.sync="redData.open" width="900px" append-to-body>
+    <el-dialog title="章节红包" :visible.sync="redData.open" width="900px" append-to-body>
       <el-table border v-loading="redData.loading" :data="redData.list" height="600px">
         <el-table-column label="小节名称" align="center" show-overflow-tooltip prop="title" />
         <el-table-column label="视频文件名称" align="center" show-overflow-tooltip  prop="fileName" >
@@ -330,6 +330,7 @@ import {
   getVideoListByCourseId,
   updates,
   batchSaveVideo,
+  batchUpdateRed,
   updateUserCourseVideo
 } from "@/api/course/userCourseVideo";
 import QuestionBank from "@/views/course/courseQuestionBank/QuestionBank.vue";
@@ -800,7 +801,9 @@ export default {
         });
       },
       batchRedSave(){
-
+        batchUpdateRed(this.redData.list).then(response => {
+          this.redData.open = false;
+        })
       },
     }
   }

+ 2 - 2
src/views/course/courseFinishTemp/index.vue

@@ -767,13 +767,13 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getCourseFinishTemp(id).then(response => {
-        this.form = response.data;
+        this.form = JSON.parse(JSON.stringify(response.data));
         this.initCompanyUserList();
 
         this.setting = JSON.parse(this.form.setting)
         this.chatSetting = JSON.parse(this.form.chatSetting)
         if (response.data.companyUserIds != null) {
-          this.companyUserIds = this.form.companyUserIds.split(",");
+          this.companyUserIds = response.data.companyUserIds.split(",");
         }
 
         videoList(this.form.courseId).then(response => {

+ 1 - 1
src/views/store/adv/index.vue

@@ -391,7 +391,7 @@ export default {
         this.form = response.data;
         this.form.status = response.data.status.toString();
         this.form.advType = response.data.advType.toString();
-        this.form.showType = response.data.showType.toString();
+        this.form.showType = response.data.showType ? response.data.showType.toString() : "";
         this.open = true;
         this.title = "修改广告";
         setTimeout(() => {

+ 12 - 10
src/views/store/components/testReportDetails.vue

@@ -68,16 +68,18 @@ import { listTestReport, getTestReport, delTestReport, addTestReport, updateTest
         this.patientJson=null;
         getTestReport(orderId).then(response => {
             this.item = response.data;
-            if(response.data.formJson!=null){
-              this.formJson=JSON.parse(response.data.formJson);
-              console.log(this.formJson)
-            };
-            if(response.data.conditioningPlanJson!=null){
-              this.conditioningPlanJson=JSON.parse(response.data.conditioningPlanJson)
-            };
-            if(response.data.patientJson!=null){
-              this.patientJson=JSON.parse(response.data.patientJson)
-            };
+            if(response.data){
+              if(response.data.formJson!=null){
+                this.formJson=JSON.parse(response.data.formJson);
+                console.log(this.formJson)
+              }
+              if(response.data.conditioningPlanJson!=null){
+                this.conditioningPlanJson=JSON.parse(response.data.conditioningPlanJson)
+              }
+              if(response.data.patientJson!=null){
+                this.patientJson=JSON.parse(response.data.patientJson)
+              }
+            }
         });
       },
     }

+ 1 - 1
src/views/store/storeOrder/healthStoreList.vue

@@ -257,7 +257,7 @@
           </template>
       </el-table-column>
 
-      <el-table-column label="操作" fixed="right" width="80px" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" fixed="right" width="80px" align="center">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 5 - 4
src/views/store/storeProduct/index.vue

@@ -735,8 +735,9 @@ export default {
         prescribeName: [
           { required: true, message: "处方药不能为空", trigger: "blur" }
         ],
-
-
+        companyIds: [
+          { required: true, message: "销售公司不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -1096,7 +1097,7 @@ export default {
           });
         }
         // 组装companyIds
-        if (response.data.companyIds != null) {
+        if (response.data.companyIds != null && response.data.companyIds != undefined && response.data.companyIds.length > 0) {
           this.form.companyIds = response.data.companyIds.split(',').map(Number);
         }
         setTimeout(() => {
@@ -1157,7 +1158,7 @@ export default {
             return this.$message.warning('请点击生成规格!');
           }
           // 组装companyIds
-          if (this.form.companyIds.length != 0) {
+          if (this.form.companyIds != null && this.form.companyIds != undefined) {
             this.form.companyIds = this.form.companyIds.join(',');
           }
           addOrEdit(this.form).then(response => {