lex-xin 4 éve
szülő
commit
2f97a5ad4c

+ 4 - 0
src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -51,6 +51,10 @@
     <div class="tableWrap">
       <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data="tableList">
+        <el-table-column label="课程编号"
+                         align="center"
+                         prop="courseScheduleId">
+        </el-table-column>
         <el-table-column label="上课时间"
                          align="center"
                          prop="classDate">

+ 27 - 24
src/views/workBenchManager/payAppeal.vue

@@ -171,7 +171,7 @@
     </div>
     <el-dialog title="考勤申诉" :visible.sync="dialogVisible" width="500px">
       <div>
-        <el-form ref="visibleForm" :model="visibleForm" class="visibleForm">
+        <el-form ref="visibleForm" :model="visibleForm" label-width="100px" class="visibleForm">
           <el-form-item label="签到时间">
             {{ visibleForm.signInTime }}
           </el-form-item>
@@ -191,6 +191,10 @@
               </el-col>
             </el-row>
           </el-form-item>
+          <el-form-item label="申诉考勤状态">
+            <el-checkbox v-if="visibleForm.complaintsType == 'SIGN_IN' || visibleForm.complaintsType == 'ALL'" disabled :value="true">签到状态</el-checkbox>
+            <el-checkbox v-if="visibleForm.complaintsType == 'SIGN_OUT' || visibleForm.complaintsType == 'ALL'" disabled :value="true">签退状态</el-checkbox>
+          </el-form-item>
           <el-form-item
             label="申诉内容"
             :rules="[
@@ -200,7 +204,7 @@
           >
             <el-input
               type="textarea"
-              :rows="5"
+              :rows="4"
               :disabled="visibleForm.complaintsStatusEnum != '2'"
               v-model.trim="visibleForm.complaintsContent"
             ></el-input>
@@ -214,13 +218,13 @@
           >
             <el-input
               type="textarea"
-              :rows="5"
+              :rows="4"
               :disabled="visibleForm.complaintsStatusEnum != '2'"
               v-model.trim="visibleForm.disposeContent"
             ></el-input>
           </el-form-item>
           <!--  -->
-          <el-form-item
+          <!-- <el-form-item
             label="请选择需要补正的状态"
             v-if="visibleForm.complaintsStatusEnum == '2'"
           >
@@ -235,7 +239,7 @@
               :disabled="visibleForm.complaintsStatusEnum != '2'"
               >签退状态</el-checkbox
             >
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </div>
       <div slot="footer" v-if="visibleForm.complaintsStatusEnum == '2'">
@@ -295,6 +299,7 @@ export default {
         teacherAttendanceId: null,
         reSignInStatus: null,
         reSignOutStatus: null,
+        complaintsType: null,
         url: null,
       },
     };
@@ -352,28 +357,25 @@ export default {
         this.$refs["visibleForm"].validate((flag) => {
           if (flag) {
             let obj = {};
-            if (
-              !this.visibleForm.reSignInStatus &&
-              !this.visibleForm.reSignOutStatus
-            ) {
-              this.$message.error("请修正签到状态或签退状态");
-              return;
-            }
-            let str = "是否将此课程的";
-            //visibleForm.reSignInStatus
-            if (this.visibleForm.reSignInStatus) {
-              obj.signInStatus = 1;
-              str += "【签到状态】";
-            }
-            if (this.visibleForm.reSignOutStatus) {
-              obj.signOutStatus = 1;
-              str += "【签退状态】";
-            }
-            str += "修正为正常";
+            // if (
+            //   !this.visibleForm.reSignInStatus &&
+            //   !this.visibleForm.reSignOutStatus
+            // ) {
+            //   this.$message.error("请修正签到状态或签退状态");
+            //   return;
+            // }
+            // let str = "是否将此课程的";
+            // if (this.visibleForm.complaintsType == 'SIGN_IN' || this.visibleForm.complaintsType == 'ALL') {
+            //   str += "【签到状态】";
+            // }
+            // if (this.visibleForm.complaintsType == 'SIGN_OUT' || this.visibleForm.complaintsType == 'ALL') {
+            //   str += "【签退状态】";
+            // }
+            // str += "修正为正常";
             obj.content = this.visibleForm.disposeContent;
             obj.teacherAttendanceId = this.visibleForm.teacherAttendanceId;
 
-            this.$confirm(str, "是否", {
+            this.$confirm('您是否同意该申诉?', "是否", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
@@ -430,6 +432,7 @@ export default {
         // reSignOutStatus: row.signOutStatus == 1 ? true : false,
         reSignInStatus: null,
         reSignOutStatus: null,
+        complaintsType: row.complaintsType,
         srcList: row.url.split(","),
       };
       this.dialogVisible = true;