Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/cardAndCouponManager/couponManager/edit.vue

@@ -287,6 +287,9 @@
             <el-table-column
               prop="TypeId"
               label="类别">
+              <template slot-scope="scope">
+                <span>{{returnGoodsType(scope.row.TypeId)}}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="Price"
@@ -453,7 +456,7 @@ export default {
       set (val) {
         this.couponInfo.caseid = val
       }
-    }
+    },
   },
   methods: {
     ...mapGoodsActions([

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -287,11 +287,11 @@ export default {
       const courseids = (this.detail.Courses || []).map(x => x.CourseId).join(',')
       if (this.id === '') {
         this.detail.OrgId = this.OrgId
-        this.AddCaseInfo({ ...this.detail, OrgId: this.OrgId, imgs: this.img, detailimgs: this.detailimg, courseids }).then(res => {
+        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs: this.imgShow, detailimgs: this.detailImgShow, courseids}).then(res => {
           this.afterSave()
         })
       } else {
-        this.AddCaseInfo({ ...this.detail, imgs: this.img, detailimgs: this.detailimg, courseids }).then(res => {
+        this.AddCaseInfo({...this.detail, imgs: this.imgShow, detailimgs: this.detailImgShow, courseids}).then(res => {
           this.afterSave()
         })
       }
@@ -313,7 +313,7 @@ export default {
       this.GetCaseInfo({ id: this.id })
     },
     getCourse () {
-      this.GetCourseList({ caseid: this.CaseId, page: 1, pagesize: 100 })
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, status: 1})
     },
     toggleSelection (rows) {
       if (rows) {

src/pages/system/cmsManager/newsManager/add.vue

@@ -214,7 +214,7 @@ export default {
           this.$router.push({ name: 'newsManager' })
         }, 1000)
       }).catch(msg => {
-
+        console.log(msg)
       })
     },
     cancel () {

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

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h">
           <el-button
           size="mini"
-          type="primary" @click="goLast">继续排课</el-button>
+          type="primary" @click="goLast">排课月表</el-button>
         </div>
         <ul>
           <li>
@@ -223,8 +223,8 @@ export default {
       this.currentCourseItem.CourseId = row.CourseId
       this.currentCourseItem.BeginDate = null
       this.currentCourseItem.EndDate = null
-      this.currentCourseItem.DetailName = null
-      this.currentCourseItem.DetailDesc = null
+      this.currentCourseItem.DetailName = ''
+      this.currentCourseItem.DetailDesc = ''
       this.centerDialogVisible = true
     },
     search () { // 搜索
@@ -238,6 +238,22 @@ export default {
       this.getList()
     },
     handleDetailSave () {
+      if (this.currentCourseItem.DetailName === '') {
+        this.$message({
+          type: 'error',
+          message: '课程名称必填！'
+        })
+        return false
+      }
+
+      if (this.currentCourseItem.BeginDate === '' || this.currentCourseItem.EndDate === '' || this.currentCourseItem.BeginDate === null || this.currentCourseItem.EndDate === null) {
+        this.$message({
+          type: 'error',
+          message: '课程时间必填！'
+        })
+        return false
+      }
+
       const item = {...this.currentCourseItem,
         OrgId: this.orgid,
         CaseId: this.postData.caseid,
@@ -254,6 +270,7 @@ export default {
       })
       this.search()
       this.centerDialogVisible = false
+      this.goLast()
     },
     goLast () {
       const { courseid } = this.$route.query

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

@@ -71,7 +71,7 @@
           </li>
           <li class="flex-h">
             <span>开始时间：</span>
-            <div class="flex-item">
+            <!-- <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-date-picker
                   v-if="currentCourseItem.CourseStatus===0"
@@ -82,11 +82,12 @@
                 </el-date-picker>
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
-            </div>
+            </div> -->
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
           <li class="flex-h">
             <span>结束时间：</span>
-            <div class="flex-item">
+            <!-- <div class="flex-item" v-if="currentCourseItem.CourseStatus===0">
               <div>
                 <el-date-picker
                   v-if="currentCourseItem.CourseStatus===0"
@@ -96,7 +97,8 @@
                 </el-date-picker>
                 <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
-            </div>
+            </div> -->
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
         </ul>
       </div>
@@ -200,8 +202,8 @@ export default {
     },
     handlUpdateDetail () {
       this.UpdateDetail({...this.currentCourseItem,
-        BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm:ss'),
-        EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm:ss'),
+        // BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm:ss'),
+        // EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm:ss'),
         callback: this.AfterAction})
     },
     AfterAction () {

src/pages/system/marketingActivities/activitiesList/index.vue

@@ -66,7 +66,7 @@
             prop="Status"
             label="状态">
             <template slot-scope="scope">
-              <span>{{scope.row.Status === 0 ? '启用' : '停用'}}</span>
+              <span>{{scope.row.Status === 1 ? '启用' : '停用'}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -80,7 +80,7 @@
                 type="danger"
                 @click="delet(scope.row.ActivityId)">删除</el-button>
               <el-button
-                v-if="scope.row.Status === 0"
+                v-if="scope.row.Status === 1"
                 size="mini"
                 type="warning"
                 @click="disable(scope.row.ActivityId)">停用</el-button>

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

@@ -137,9 +137,11 @@ export default {
     handlePermission (index, row) {
       this.selid = row.RoleId
       this.GetRoleMenu({id: this.selid})
+      console.log(this.roleMenus)
       this.dialogTableVisible = true
     },
     handleNodeClick (node) {
+      console.log(node)
     },
     searchList (key) {
       this.key = key

src/pages/system/systemSet/userManager/index.vue

@@ -344,7 +344,11 @@ export default {
         method: this.$api.systemSet.getUserRoles.method,
         queryData: { userid: row.UserId }
       }).then(res => {
-        if (res !== null) this.tags = res
+        if (res !== null) {
+          this.tags = res
+        } else {
+          this.tags = []
+        }
         this.currentEditItem = row
         this.getRole()
         this.dialogTableVisible = true