课程详情

src/pages/system/courseManager/courseList/index.vue

@@ -173,7 +173,7 @@
                 :action='$api.file.image.url'
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                <img v-if="editCourseDetail.newImg" :src="editCourseDetail.newImg" class="avatar">
+                <img v-if="newImg" :src="newImg" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -181,19 +181,19 @@
           <el-button
             size="mini"
             type="success"
-            v-if="editCourseDetail.newImg"
+            v-if="newImg"
             @click="addThisImg">确定添加图片</el-button>
         </li>
       </ul>
       <el-table
-        :data="currentCourseDetail"
+        :data="courseImgs"
         stripe
         style="width: 100%">
         <el-table-column
           prop="img"
           label="图片">
           <template slot-scope="scope">
-            <img :src="scope.row.img" alt="">
+            <img :src="scope.row.ImgUrl" style="width:100%" alt="">
           </template>
         </el-table-column>
         <el-table-column
@@ -202,8 +202,7 @@
           <template slot-scope="scope">
             <el-input
               placeholder="请输入内容"
-              v-model="scope.row.sort"
-              :disabled="scope.row.edit ? false : true">
+              v-model="scope.row.Sort">
             </el-input>
           </template>
         </el-table-column>
@@ -213,12 +212,6 @@
             <el-button
               size="mini"
               type="success"
-              v-if="!scope.row.edit"
-              @click="editItem(scope.$index, scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="success"
-              v-if="scope.row.edit"
               @click="sureSort(scope.$index, scope.row)">确认</el-button>
             <el-button
               size="mini"
@@ -241,15 +234,13 @@ export default {
   name: '',
   data () {
     return {
+      selCourseId: '',
       currentCourseDetail: [{
         img: '',
         sort: 1,
         edit: false,
       }],
-      editCourseDetail: {
-        newImg: '',
-        list: [],
-      },
+      newImg: '',
       centerDialogVisible: false, // 课程详情弹窗显隐
       total: 0,
       postData: { // 表格搜索条件
@@ -275,6 +266,7 @@ export default {
     }),
     ...mapCourseState({
       courses: x => x.courseList,
+      courseImgs: x => x.courseImgs
     }),
     ...mapLocationState({
       location: x => x.location
@@ -290,21 +282,46 @@ export default {
   },
   methods: {
     deleteItem (index, item) { // 删除图片
-
+      this.$confirm('确认删除此课程?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.DelCourseImg({id: item.ImgId, callback: this.afterImgAction})
+        })
     },
     sureSort (index, item) { // 确认图片排序
-      this.currentCourseDetail[index].edit = false
+      this.UpdateCourseImg({...item, callback: this.afterImgAction})
     },
     editItem (index, item) { // 编辑图片排序
-      this.currentCourseDetail[index].edit = true
+      let imglist = {...this.courseImgs}
+      imglist[index].edit = true
+      this.UpdateImgList(imglist)
     },
     addThisImg () { // 添加图片到课程详情
-
+      const data = {
+        CourseId: this.selCourseId,
+        ImgUrl: this.newImg,
+        Sort: 0,
+        callback: this.afterImgAction
+      }
+      this.newImg = ''
+      this.AddCourseImg(data)
+    },
+    afterImgAction () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.GetCourseImgs({id: this.selCourseId})
     },
     handleAvatarSuccess (res, file) {
-      this.editCourseDetail.newImg = res.result.url
+      this.newImg = res.result.url
     },
-    addDetail (val) { // 添加课程详情
+    addDetail (row) { // 添加课程详情
+      this.selCourseId = row.CourseId
+      this.GetCourseImgs({id: this.selCourseId})
       this.centerDialogVisible = true
     },
     ...mapCourseActions([
@@ -313,7 +330,12 @@ export default {
       'UnPublic',
       'DelCourse',
       'SetNull',
-      'GetCourseByID'
+      'GetCourseByID',
+      'GetCourseImgs',
+      'AddCourseImg',
+      'UpdateCourseImg',
+      'DelCourseImg',
+      'UpdateImgList'
     ]),
     ...mapLocationActions([
       'updateLocationInfo',

src/pages/system/courseManager/scheduleManager/index.vue

@@ -79,7 +79,7 @@
                 </el-date-picker>
               </div>
             </div>
-            <span v-else>{{currentCourseItem.BeginDate}}</span>
+            <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
           <li class="flex-h">
             <span>结束时间：</span>
@@ -92,7 +92,7 @@
                 </el-date-picker>
               </div>
             </div>
-            <span v-else>{{currentCourseItem.EndDate}}</span>
+            <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
         </ul>
       </div>

src/pages/system/systemSet/roleManager/add.vue

@@ -75,10 +75,12 @@ export default {
       if ((this.detail.RoleId || '') === '') {
         this.detail.CaseId = this.caseid
         this.detail.OrgId = this.orgid
-        this.AddRole(this.detail)
+        this.AddRole({...this.detail, callback: this.afterSave})
       } else {
-        this.UpdateRole(this.detail)
+        this.UpdateRole({...this.detail, callback: this.afterSave})
       }
+    },
+    afterSave () {
       this.$message({
         type: 'success',
         message: '操作成功'

src/store/course/course.js

@@ -6,6 +6,7 @@ export default {
   state: {
     courseList: [],
     courseInfo: {},
+    courseImgs: [],
   },
   mutations: {
     updateList (state, payload) {
@@ -14,6 +15,9 @@ export default {
     updateInfo (state, payload) {
       state.courseInfo = payload || {}
     },
+    updateImgList (state, payload) {
+      state.courseImgs = payload
+    }
   },
   actions: {
     GetCourseList ({ commit }, payload) {
@@ -44,6 +48,9 @@ export default {
         }
       }).then(res => {
         commit('updateInfo', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     UpdateCourse ({ commit }, payload) {
@@ -56,6 +63,9 @@ export default {
           id: payload.GoodsId,
         }
       }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     DelCourse ({ commit }, { id, callback }) {
@@ -99,6 +109,61 @@ export default {
     },
     UpdateInfo ({ commit }, payload) {
       commit('updateInfo', payload)
-    }
+    },
+    UpdateImgList ({ commit }, payload) {
+      commit('updateImgList', payload)
+    },
+    GetCourseImgs ({ commit }, {id, callback}) {
+      ajax(api.course.getimgs.url, {
+        method: api.course.getimgs.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        commit('updateImgList', res)
+        if (callback) {
+          callback()
+        }
+      })
+    },
+    AddCourseImg ({ commit }, payload) {
+      ajax(api.course.addimgs.url, {
+        method: api.course.addimgs.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    UpdateCourseImg ({ commit }, payload) {
+      ajax(api.course.updateimgs.url, {
+        method: api.course.updateimgs.method,
+        data: {
+          ...payload
+        },
+        urlData: {
+          id: payload.id
+        }
+      }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+    DelCourseImg ({ commit }, { id, callback }) {
+      ajax(api.course.deleteimgs.url, {
+        method: api.course.deleteimgs.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        if (callback) {
+          callback()
+        }
+      })
+    },
   }
 }

src/store/system/role.js

@@ -48,6 +48,9 @@ export default {
         }
       }).then(res => {
         commit('updateInfo', res)
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     UpdateRole ({ commit }, payload) {
@@ -57,6 +60,9 @@ export default {
           ...payload
         }
       }).then(res => {
+        if (payload.callback) {
+          payload.callback()
+        }
       })
     },
     DelRole ({ commit }, { id, callback }) {