浏览代码

修复Bug

1
mo 2 年之前
父节点
当前提交
35739060ec

+ 2 - 2
src/views/categroyManager/insideSetting/branchManager.vue

@@ -130,12 +130,12 @@
                   type="text"
                   >修改</el-button
                 >
-                <el-button
+                <!-- <el-button
                   @click="onDelete(scope.row)"
                   v-permission="'cooperationOrgan/del'"
                   type="text"
                   >删除</el-button
-                >
+                > -->
                 <el-button @click="rejuest(scope.row)" type="text">领队注册</el-button>
               </template>
             </el-table-column>

+ 2 - 2
src/views/schoolManager/accountManager.vue

@@ -129,14 +129,14 @@
                 <auth auths="schoolStaff/updateAccount">
                   <el-button type="text" @click="resetCount(scope.row)">修改</el-button>
                 </auth>
-                <!-- <auth auths="schoolStaff/remove">
+                <auth auths="schoolStaff/remove">
                   <el-button
                     type="text"
                     v-if="scope.row.status == 9"
                     @click="removeTeacherCount(scope.row)"
                     >删除</el-button
                   ></auth
-                > -->
+                >
                 <auth auths="schoolStaff/resetPassword">
                   <el-button type="text" @click="resetPwd(scope.row)"
                     >重置密码</el-button

+ 8 - 2
src/views/schoolManager/modals/patrolModels.vue

@@ -60,7 +60,12 @@
           prop="opinions"
           :rules="[{ required: true, message: '请输入处理意见' }]"
         >
-          <el-input v-model="form.opinions" type="textarea" :rows="3"></el-input>
+          <el-input
+            :disabled="isLook"
+            v-model="form.opinions"
+            type="textarea"
+            :rows="3"
+          ></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -92,7 +97,7 @@ import avatar from "@/assets/images/base/woman.png";
 import { getCoursePatrolDetail, submitCoursePatrolEvaluation } from "../api";
 import { problemType } from "@/constant/index";
 export default {
-  props: ["id"],
+  props: ["id", "isLook"],
   data() {
     return {
       avatar,
@@ -139,6 +144,7 @@ export default {
     };
   },
   mounted() {
+    console.log(this.isLook, "isLook");
     this.getDetail();
   },
   methods: {

+ 43 - 11
src/views/schoolManager/patrol.vue

@@ -158,11 +158,17 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="courseScheduleId"
-            label="课程编号"
-          ></el-table-column>
+          <el-table-column align="center" prop="courseScheduleId" label="课程编号">
+            <template slot-scope="scope">
+              <div>
+                <el-button
+                  type="text"
+                  @click="gotoCourseList(scope.row.courseScheduleId)"
+                  >{{ scope.row.courseScheduleId }}</el-button
+                >
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="evaluateStatus" label="综合评价">
             <template slot-scope="scope">
               <div>{{ scope.row.evaluateStatus | evaluateStatus }}</div>
@@ -197,8 +203,19 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <!-- <el-button type="text">详情</el-button> -->
-                <el-button type="text" @click="lookDetail(scope.row)">处理意见</el-button>
+                <auth auths="coursePatrolEvaluation/detail">
+                  <el-button type="text" @click="lookDetail(scope.row)"
+                    >详情</el-button
+                  ></auth
+                >
+                <auth
+                  auths='["coursePatrolEvaluation/update","coursePatrolEvaluation/detail"]'
+                  mulit
+                >
+                  <el-button type="text" @click="handleOpinion(scope.row)"
+                    >处理意见</el-button
+                  ></auth
+                >
               </div>
             </template>
           </el-table-column>
@@ -214,13 +231,14 @@
       </div>
     </div>
     <el-dialog
-      :title="activeRow.handleStatus ? '详情' : '处理意见'"
+      :title="activeRow.islook ? '详情' : '处理意见'"
       width="450px"
       :visible.sync="dialogFormVisible"
+      v-if="dialogFormVisible"
     >
       <patrolModels
         :id="activeRow.id"
-        v-if="dialogFormVisible"
+        :isLook="activeRow.islook"
         ref="patrolModelsRef"
         @close="
           () => {
@@ -340,7 +358,11 @@ export default {
       this.getList();
     },
     submitMessage() {
-      this.$refs.patrolModelsRef.submit();
+      if (this.activeRow.islook) {
+        this.dialogFormVisible = false;
+      } else {
+        this.$refs.patrolModelsRef.submit();
+      }
     },
     onReSet() {
       this.$nextTick(() => {
@@ -349,11 +371,15 @@ export default {
     },
     lookDetail(row) {
       this.activeRow = row;
+      this.activeRow.islook = true;
       this.dialogFormVisible = true;
+
       console.log("查看详情");
     },
     handleOpinion(row) {
-      console.log("处理意见");
+      this.activeRow = row;
+      this.activeRow.islook = false;
+      this.dialogFormVisible = true;
     },
     getProblemType(type) {
       if (type) {
@@ -365,6 +391,12 @@ export default {
         return "--";
       }
     },
+    gotoCourseList(id) {
+      this.$router.push({
+        name: "teamCourseList",
+        params: { courseIdSearch: id },
+      });
+    },
   },
   watch: {
     "searchForm.organId"(val) {