提交测试

1

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -168,23 +168,21 @@
       @close="onFormClose('ruleForm')"
       width="500px"
     >
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="原预计课酬" :label-width="formLabelWidth">
-          <!-- <el-input
-            v-model.trim="form.expectSalary"
-            disabled
-            @mousewheel.native.prevent
-            type="number"
-          ></el-input> -->
-          <div>{{ form.expectSalary }}</div>
+      <el-form :model="form" :rules="rules" ref="ruleForm" :inline="true">
+        <el-form-item label="课程课酬" :label-width="formLabelWidth">
+          <div>{{ form.expectSalary  | moneyFormat}}</div>
         </el-form-item>
-        <!-- <el-form-item label="补贴"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="form.subsidys"
-                    disabled
-                    @mousewheel.native.prevent
-                    type="number"></el-input>
-        </el-form-item> -->
+        <el-form-item label="课程补贴">
+          <span>{{
+           activeRow.subsidy | moneyFormat
+          }}</span>
+        </el-form-item>
+        <el-form-item label="总课酬" >
+          <span>{{
+            (form.expectSalary + activeRow.subsidy) | moneyFormat
+          }}</span>
+        </el-form-item>
+        <br/>
         <el-form-item
           label="调整范围"
           prop="scope"
@@ -195,6 +193,7 @@
             <el-radio label="one">仅限本次</el-radio>
           </el-radio-group>
         </el-form-item>
+        <br/>
         <el-form-item
           label="课酬补贴"
           prop="subsidy"
@@ -272,6 +271,7 @@ export default {
         expectSalary: null,
         subsidys: null,
       },
+      activeRow:null,
       rules: {
         salary: [{ required: true, message: "请输入课酬", trigger: "blur" }],
         subsidy: [
@@ -366,11 +366,14 @@ export default {
       this.$refs[formName].resetFields();
     },
     onUpdate(row) {
-      console.log(row)
+
+      // this.activeRow = JSON.parse(JSON.stringify(row))
+      this.activeRow = {...row}
       this.form.courseScheduleId = row.courseScheduleId;
       this.settlementStatus = true;
       this.form.expectSalary = row.expectSalary;
       this.form.subsidy = row.subsidy;
+
     },
     onReSet() {
       this.courseDate = null;

src/views/teamDetail/componentCourse/teacherList.vue

@@ -37,7 +37,7 @@
         label="签到签退"
         width="200px"
       >
-        <template slot-scope="scope"  v-if="courseStatus != 'NOT_START'">
+        <template slot-scope="scope" v-if="courseStatus != 'NOT_START'">
           <div>
             {{ scope.row.signInTime | dayjsFormatMinute }}
             (<span :class="scope.row.signInStatus == 1 ? 'green' : 'red'">{{
@@ -183,7 +183,7 @@
 
             <el-button
               type="text"
-              v-if="teachMode == 'OFFLINE'&&courseStatus != 'NOT_START'"
+              v-if="teachMode == 'OFFLINE' && courseStatus != 'NOT_START'"
               size="small"
               @click="lookGPS(scope.row)"
               >GPS定位</el-button
@@ -212,7 +212,10 @@
                 >处理意见</el-button
               >
             </auth>
-            <auth auths="teacherAttendance/repealComplaints/4300" v-if="courseStatus !='NOT_START'">
+            <auth
+              auths="teacherAttendance/repealComplaints/4300"
+              v-if="courseStatus != 'NOT_START'"
+            >
               <el-button
                 type="text"
                 size="small"
@@ -224,7 +227,10 @@
                 >撤销申诉</el-button
               >
             </auth>
-            <auth auths="teacherAttendance/addComplaints/4299" v-if="courseStatus !='NOT_START'">
+            <auth
+              auths="teacherAttendance/addComplaints/4299"
+              v-if="courseStatus != 'NOT_START'"
+            >
               <el-button
                 size="small"
                 v-if="
@@ -301,12 +307,28 @@
       append-to-body
     >
       <!-- 修改代码 -->
-      <el-form :model="teacherMask" :rules="teacherRules" ref="teacherMask">
-        <el-form-item label="原预计课酬" prop="expectSalary">
+      <el-form
+        :model="teacherMask"
+        :inline="true"
+        :rules="teacherRules"
+        ref="teacherMask"
+      >
+        <el-form-item label="课程课酬" prop="expectSalary">
           <span>{{
             activeTeacher && activeTeacher.expectSalary | moneyFormat
           }}</span>
         </el-form-item>
+        <el-form-item label="课程补贴" prop="expectSalary">
+          <span>{{
+            activeTeacher && activeTeacher.subsidy | moneyFormat
+          }}</span>
+        </el-form-item>
+        <el-form-item label="总课酬" prop="expectSalary">
+          <span>{{
+           (activeTeacher.expectSalary+activeTeacher.subsidy)  | moneyFormat
+          }}</span>
+        </el-form-item>
+        <br />
         <el-form-item label="调整范围" prop="radio">
           <el-radio v-model.trim="teacherMask.radio" label="all"
             >之后剩余课次</el-radio
@@ -315,6 +337,7 @@
             >仅限本次</el-radio
           >
         </el-form-item>
+        <br />
         <el-form-item label="课程补贴" prop="subsidy">
           <el-input
             style="width: 180px"
@@ -442,7 +465,7 @@ export default {
             for (const item of res.data) {
               if (row.teacherId == item.teacherId) {
                 this.activeTeacher = item;
-                this.teacherMask.subsidy = item.subsidy
+                this.teacherMask.subsidy = item.subsidy;
                 break;
               }
             }