1

src/pages/course/prepareclassDetails.vue

@@ -351,16 +351,17 @@
               <div class="beike-jan">
                 <div class="jan-l"></div>
               </div>
-              <div class="row" style="font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont">
-                课后总结
+              <div class="row flex" style="font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont;justify-content:space-between;flex-grow:2">
+                <div>课后总结</div>
+                <q-btn color="accent" size="sm" v-if="data.FanKuiStatus===1&&data.TotalScore===0&&isShowBtn" @click="modify">修改</q-btn>
               </div>
             </div>
-            <template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0">
+            <!-- <template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0"> -->
+            <template v-if="(data.BeiKeStatus>0&&data.FanKuiStatus===0)||isModify">
               <q-input type="textarea" filled label="课后总结" v-model="conclusion" :rows="3" style="flex:1;margin-top:20px;" />
               <div style="display:flex;flex-wrap: wrap;margin-top:20px;">
                 <div v-if="ImgList.length>0" v-for="(item,index) in ImgList">
                   <div class="pre-ImgDiv">
-                    
                     <el-image 
                       style="height: 100%;height:100%"
                       :src="item" 
@@ -391,9 +392,8 @@
               </div>
             </template>
           </div>
-          <q-btn color="accent" size="sm" v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0&&isShowBtn" class="margint-15" @click="saveOrderInfo()"
+          <q-btn color="accent" size="sm" v-if="(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify" class="margint-15" @click="saveOrderInfo()"
             style="margin:20px 0 0 15px;width:97%;height:40px;" label="提交" />
-
           <!-- <q-btn color="accent" size="sm" class="q-mr-md marginl-15 margint-15" label="提交" @click="saveOrderInfo()"
             :loading="Dloading" v-if="(AccountType==false&&data.IsEditSummary<=0)&&isUpData" /> -->
         </div>
@@ -519,7 +519,8 @@
         LessonPlanNum:0,
         LessonPlanSummaryNum:0,
         TeacherId:0,
-        isShowBtn:false
+        isShowBtn:false,
+        isModify:false,
       }
     },
     created() {
@@ -536,8 +537,8 @@
       this.scoreMsg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId : 0;
       this.scoreMsg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId : 0;
 
-      this.LessonPlanNum = this.$route.query.LessonPlanNum ? this.$route.query.LessonPlanNum : 0;
-      this.LessonPlanSummaryNum = this.$route.query.LessonPlanSummaryNum ? this.$route.query.LessonPlanSummaryNum : 0;
+      // this.LessonPlanNum = this.$route.query.LessonPlanNum ? this.$route.query.LessonPlanNum : 0;
+      // this.LessonPlanSummaryNum = this.$route.query.LessonPlanSummaryNum ? this.$route.query.LessonPlanSummaryNum : 0;
       this.TeacherId = this.$route.query.TeacherId ? this.$route.query.TeacherId : 0;
 
 
@@ -563,6 +564,11 @@
       this.nowDate = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
     },
     methods: {
+      //是否能修改总结
+      modify(){
+        // this.isModify=true
+        this.isModify=!this.isModify
+      },
       //获取评论显示分数
       getUserComment() {
         GetNowUserLessonComment(this.scoreMsg).then(res => {
@@ -578,13 +584,14 @@
             let data=res.Data;
             if (data.Chapter && data.Chapter.length>0) {
                 if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){
-                    console.log(data.Chapter[0].ChildList.length)
+                    // console.log(data.Chapter[0].ChildList.length)
                     data.Chapter[0].ChildList=[]
                     data.Chapter[0].ChildList.push(data.Chapter[0])
                 }
                 this.chapters = data.Chapter
             }
             this.data = data;
+             console.log(595,this.data)
             this.plmsg.TeacherId = res.Data.UpdateBy;
             var beginTimes = this.nowDate.replace(/-/g, "/"); //当前
             var endTimes = this.data.ClassEndTime.replace(/-/g, "/"); //结束

src/pages/sale/reserveStudentList.vue

@@ -33,7 +33,7 @@
         </template>
         <template v-slot:body-cell-Remark="props">
           <q-td :props="props">
-                 <el-tooltip class="item" effect="dark" :content="props.row.Remark" placement="top">
+                 <el-tooltip effect="dark" :content="props.row.Remark" placement="top">
                     {{getRemarks(props.row.Remark)}}
                 </el-tooltip>
            

src/pages/system/noticeSysSet.vue

+<template>
+  <div class="page-body document">
+    <div class="page-search row items-center">
+     
+        <div class="col-4">
+          <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name"
+            label="公告审批人" @clear="resetSearch" maxlength="20" />
+        </div>
+      
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    meta: {
+      title: "公告系统设置"
+    },
+    data(){
+        return{
+            msg:{
+                Name:""
+            }
+        }
+    },
+    methods:{
+        resetSearch(){
+
+        }
+    }
+  }
+
+</script>

src/router/routes.js

@@ -58,6 +58,11 @@ const routes = [{
     component: () =>
       import("pages/system/menu.vue")
   },
+  {
+    path: "/system/noticeSysSet", //公告系统设置
+    component: () =>
+      import("pages/system/noticeSysSet.vue")
+  },
   {
     path: "/system/menufunction", //菜单功能权限管理
     component: () =>
@@ -547,6 +552,11 @@ const routes = [{
     component: () =>
       import("pages/administration/document.vue")
   },
+  {
+    path: "/administration/documentApproval", //行政公告审批
+    component: () =>
+      import("pages/administration/documentApproval.vue")
+  },
   {
     path: "/administration/Approval", //行政审批
     component: () =>