Merge branch '05/07navColor' into test

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -81,12 +81,14 @@
           <template slot-scope="scope">
             <div>
               <el-button
+               size="small"
                 type="text"
                 @click="addVisit(scope.row)"
                 v-if="!scope.row.visitFlag&&permission('visit/add?page=teamCourseList')"
                 >新增回访</el-button
               >
                 <el-button
+                 size="small"
                 type="text"
                 @click="lookVisit(scope.row)"
                 v-if="(scope.row.visitFlag)&&permission('visit/queryPage?page=teamCourseList')"

src/views/teamDetail/componentCourse/teacherList.vue

@@ -82,7 +82,11 @@
         <template slot-scope="scope">
           <div>
             <p>
-              <span :class="complaintscolor(scope.row.teacherAttendance.complaintsStatus)">
+              <span
+                :class="
+                  complaintscolor(scope.row.teacherAttendance.complaintsStatus)
+                "
+              >
                 {{
                   scope.row.teacherAttendance.complaintsStatus
                     | complaintsStatusEnum
@@ -155,7 +159,9 @@
             style="width: 60px; height: 60px"
             fit="cover"
             :src="scope.row.teacherAttendance.signOutAttachments.split(',')[0]"
-            :previewSrcList="scope.row.teacherAttendance.signOutAttachments.split(',')"
+            :previewSrcList="
+              scope.row.teacherAttendance.signOutAttachments.split(',')
+            "
           >
           </el-image>
         </template>
@@ -163,7 +169,10 @@
       <el-table-column align="center" width="200px" fixed="right" label="操作">
         <template slot-scope="scope">
           <div>
-            <auth auths="teacherAttendance/updateTeacherAttendance">
+            <auth
+              auths="teacherAttendance/updateTeacherAttendance"
+              v-if="courseStatus != 'NOT_START'"
+            >
               <el-button
                 type="text"
                 size="small"
@@ -174,7 +183,7 @@
 
             <el-button
               type="text"
-              v-if="teachMode == 'OFFLINE'"
+              v-if="teachMode == 'OFFLINE'&&courseStatus != 'NOT_START'"
               size="small"
               @click="lookGPS(scope.row)"
               >GPS定位</el-button
@@ -187,7 +196,10 @@
                 >课酬调整</el-button
               >
             </auth>
-            <auth auths="teacherAttendance/update?page=teamCourseList">
+            <auth
+              auths="teacherAttendance/update?page=teamCourseList"
+              v-if="courseStatus != 'NOT_START'"
+            >
               <el-button
                 size="small"
                 type="text"
@@ -200,29 +212,31 @@
                 >处理意见</el-button
               >
             </auth>
-                       <auth auths="teacherAttendance/repealComplaints/4300">
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.jobNature != 'FULL_TIME' &&
-                    scope.row.teacherAttendance.complaintsStatus == 2
-                  "
-                  @click="unappeal(scope.row)"
-                  >撤销申诉</el-button
-                >
-              </auth>
-              <auth auths="teacherAttendance/addComplaints/4299">
-                <el-button
-                  v-if="
-                    scope.row.jobNature != 'FULL_TIME' &&
-                    (scope.row.teacherAttendance.complaintsStatus == null ||
-                      scope.row.teacherAttendance.complaintsStatus == 3)
-                  "
-                  type="text"
-                  @click="appeal(scope.row)"
-                  >考勤申诉</el-button
-                >
-              </auth>
+            <auth auths="teacherAttendance/repealComplaints/4300" v-if="courseStatus !='NOT_START'">
+              <el-button
+                type="text"
+                size="small"
+                v-if="
+                  scope.row.jobNature != 'FULL_TIME' &&
+                  scope.row.teacherAttendance.complaintsStatus == 2
+                "
+                @click="unappeal(scope.row)"
+                >撤销申诉</el-button
+              >
+            </auth>
+            <auth auths="teacherAttendance/addComplaints/4299" v-if="courseStatus !='NOT_START'">
+              <el-button
+                size="small"
+                v-if="
+                  scope.row.jobNature != 'FULL_TIME' &&
+                  (scope.row.teacherAttendance.complaintsStatus == null ||
+                    scope.row.teacherAttendance.complaintsStatus == 3)
+                "
+                type="text"
+                @click="appeal(scope.row)"
+                >考勤申诉</el-button
+              >
+            </auth>
           </div>
         </template>
       </el-table-column>
@@ -313,14 +327,19 @@
         <el-button type="primary" @click="resetSalary">确 定</el-button>
       </div>
     </el-dialog>
-         <el-dialog title="申诉" width="400px" :visible.sync="appealVisible" append-to-body>
-          <appeal
-            v-if="appealVisible && detail"
-            :detail="detail"
-            @close="appealVisible = false"
-            @submited="getList"
-          />
-        </el-dialog>
+    <el-dialog
+      title="申诉"
+      width="400px"
+      :visible.sync="appealVisible"
+      append-to-body
+    >
+      <appeal
+        v-if="appealVisible && detail"
+        :detail="detail"
+        @close="appealVisible = false"
+        @submited="getList"
+      />
+    </el-dialog>
     <!-- </el-dialog> -->
   </div>
 </template>
@@ -333,11 +352,11 @@ import appeal from "@/views/recodeManager/modals/appeal";
 import { repealComplaints } from "@/views/recodeManager/api";
 import hand from "@/views/recodeManager/modals/hand";
 export default {
-  components: { gpsLoction, hand,appeal },
+  components: { gpsLoction, hand, appeal },
   props: ["courseScheduleId", "teachMode", "courseStatus"],
   data() {
     return {
-      appealVisible:false,
+      appealVisible: false,
       tableList: [],
       gpsVisible: false,
       activeRow: null,
@@ -406,7 +425,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("补卡成功");
               this.getList();
-              this.$emit('syncTeacherAttend')
+              this.$emit("syncTeacherAttend");
             } else {
               this.$message.error(res.msg);
             }
@@ -437,19 +456,19 @@ export default {
       this.innerVisible = true;
       this.activeTeacher = row;
     },
-    complaintscolor(status){
+    complaintscolor(status) {
       /**
        *    0: "已拒绝",
     1: "已通过",
     2: "待处理",
     3: "已撤销",
        */
-      if(status==0 || status==2 ){
-        return 'red'
-      }else if(status==1){
-         return 'green'
-      } else{
-        return ''
+      if (status == 0 || status == 2) {
+        return "red";
+      } else if (status == 1) {
+        return "green";
+      } else {
+        return "";
       }
     },
     resetSalary() {
@@ -479,7 +498,7 @@ export default {
         }
       });
     },
-     appeal(row) {
+    appeal(row) {
       this.appealVisible = true;
       this.detail = row;
       this.detail.courseScheduleId = row.teacherAttendance?.courseScheduleId;
@@ -508,6 +527,6 @@ export default {
   color: #14928a;
 }
 .orgin {
-  color: #E6A23C;
+  color: #e6a23c;
 }
 </style>

src/views/workBenchManager/requestComponent/progressRequest.vue

@@ -183,7 +183,7 @@
           <el-form-item label="签退时间">
             {{ visibleForm.signOutTime }}
           </el-form-item>
-          <el-form-item label="申诉图片">
+          <el-form-item label="申诉图片" >
             <el-row>
               <el-col
                 v-for="(item, index) in visibleForm.srcList"
@@ -327,6 +327,7 @@ export default {
         reSignOutStatus: null,
         complaintsType: null,
         url: null,
+        srcList:[]
       },
     };
   },
@@ -465,7 +466,7 @@ export default {
         reSignInStatus: null,
         reSignOutStatus: null,
         complaintsType: row.complaintsType,
-        srcList: row.url.split(","),
+        srcList:row.url?row.url.split(","):[],
       };
       this.dialogVisible = true;
     },