修改

src/views/businessManager/orderManager/incomeOne.vue

@@ -210,5 +210,5 @@
     }
   }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 </style>

src/views/studentManager/studentList.vue

@@ -175,10 +175,6 @@
                        label="男"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="名族"
-                      prop="nation">
-          <el-input v-model="studentForm.nation"></el-input>
-        </el-form-item> -->
         <el-form-item label="家长姓名">
           <el-input v-model="studentForm.parseName"></el-input>
         </el-form-item>

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

@@ -89,7 +89,10 @@
             {{ scope.row.signOutStatus | attendanceOutType }}
           </template>
         </el-table-column>
-        <el-table-column label="老师课酬"
+        <el-table-column label="预计发放"
+                         prop="expectSalary">
+        </el-table-column>
+        <el-table-column label="实际发放"
                          prop="actualSalary">
         </el-table-column>
         <el-table-column label="课时补贴"
@@ -123,6 +126,12 @@
       <el-form :model="form"
                :rules="rules"
                ref="ruleForm">
+        <el-form-item label="预计发放" :label-width="formLabelWidth">
+          <el-input v-model="form.expectSalary" disabled type="number" ></el-input>
+        </el-form-item>
+        <el-form-item label="补贴" :label-width="formLabelWidth">
+          <el-input v-model="form.subsidys" disabled type="number" ></el-input>
+        </el-form-item>
         <el-form-item label="课酬调整为"
                       prop="salary"
                       :label-width="formLabelWidth">
@@ -193,6 +202,8 @@ export default {
         salary: null,
         subsidy: null,
         scope: 'one',
+        expectSalary: null,
+        subsidys: null
       },
       rules: {
         salary: [{ required: true, message: '请输入课酬', trigger: 'blur' }],
@@ -226,7 +237,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
-        this.branchStatus = false
+        this.settlementStatus = false
         this.getList()
       } else {
         this.$message.error(res.msg)
@@ -259,6 +270,8 @@ export default {
     onUpdate (row) {
       this.form.courseScheduleId = row.courseScheduleId
       this.settlementStatus = true
+      this.form.expectSalary = row.expectSalary
+      this.form.subsidys = row.subsidy
     },
     onReSet () {
       this.courseDate = null