04/18 17:27

111

dist/static/css/chunk-5b71ee2d.be05e4c0.css → dist/static/css/chunk-6b005022.3f0075d3.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.red[data-v-06773983]{color:red}.visibleForm[data-v-06773983] .el-input__inner,.visibleForm[data-v-06773983] .el-textarea__inner{width:225px!important}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.red[data-v-18c1acc8]{color:red}.visibleForm[data-v-18c1acc8] .el-input__inner,.visibleForm[data-v-18c1acc8] .el-textarea__inner{width:225px!important}

src/views/workBenchManager/classFeesIsOk.vue

@@ -146,14 +146,15 @@
               <p class="red" v-if="!scope.row.signOutStatus&&scope.row.signOutStatus!=0">未签退</p>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="expectSalary" label="应发课酬">
-            <template slot-scope="scope">{{scope.row.expectSalary + '元'}}</template>
+          <!-- expectSalary -->
+          <el-table-column align="center" prop="actualSalary" label="应发课酬">
+            <template slot-scope="scope">{{scope.row.actualSalary + '元'}}</template>
           </el-table-column>
           <el-table-column align="center" prop="reduceSalary" label="课酬扣款">
             <template slot-scope="scope">{{scope.row.reduceSalary + '元'}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="actualSalary" label="结算课酬">
-            <template slot-scope="scope">{{scope.row.actualSalary + '元'}}</template>
+          <el-table-column align="center" prop="finalSalary" label="结算课酬">
+            <template slot-scope="scope">{{scope.row.finalSalary + '元'}}</template>
           </el-table-column>
           <el-table-column align="center" prop label="状态" fixed="right">
             <template slot-scope="scope">{{scope.row.confirmStatus | confirmFilter }}</template>
@@ -183,14 +184,22 @@
           :inline="true"
           label-width="60px"
         >
-          <el-form-item label="应发" :rules="[{ required: true, message: '请填写应发数',trigger: 'blur'}]" prop="expectSalary">
+          <el-form-item
+            label="应发"
+            :rules="[{ required: true, message: '请填写应发数',trigger: 'blur'}]"
+            prop="actualSalary"
+          >
             <el-input
-              v-model.trim="visibleForm.expectSalary"
+              v-model.trim="visibleForm.actualSalary"
               type="number"
               @mousewheel.native.prevent
             ></el-input>
           </el-form-item>
-          <el-form-item label="扣款" :rules="[{ required: true, message: '请填写扣款数',trigger: 'blur'}]" prop="reduceSalary">
+          <el-form-item
+            label="扣款"
+            :rules="[{ required: true, message: '请填写扣款数',trigger: 'blur'}]"
+            prop="reduceSalary"
+          >
             <el-input
               v-model.trim="visibleForm.reduceSalary"
               type="number"
@@ -199,13 +208,17 @@
           </el-form-item>
           <el-form-item label="实发">
             <el-input
-              v-model.trim="visibleForm.actualSalary"
+              v-model.trim="visibleForm.finalSalary"
               disabled
               type="number"
               @mousewheel.native.prevent
             ></el-input>
           </el-form-item>
-          <el-form-item label="说明" :rules="[{ required: true, message: '请填写说明',trigger: 'blur'}]" prop="memo">
+          <el-form-item
+            label="说明"
+            :rules="[{ required: true, message: '请填写说明',trigger: 'blur'}]"
+            prop="memo"
+          >
             <el-input type="textarea" :rows="5" v-model.trim="visibleForm.memo"></el-input>
           </el-form-item>
         </el-form>
@@ -247,12 +260,12 @@ export default {
       },
       dialogVisible: false,
       visibleForm: {
-        expectSalary: null,
+        finalSalary: null,
         reduceSalary: null,
         actualSalary: null,
         courseScheduleId: null,
-        teacherId:null,
-        memo:null
+        teacherId: null,
+        memo: null
       },
       isOpen: null,
       activeRow: null,
@@ -345,13 +358,12 @@ export default {
       return obj;
     },
     openSalary() {
-     
       this.$confirm("您确定开启课酬确认?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        openSalaryConfirm({ month:this.searchForm.month }).then(res => {
+        openSalaryConfirm({ month: this.searchForm.month }).then(res => {
           if (res.code == 200) {
             this.$message.success("开启成功");
             this.getList();
@@ -444,14 +456,16 @@ export default {
         .catch(() => {});
     },
     resetSalary(row) {
-      this.visibleForm = {
-        expectSalary: row.expectSalary,
-        reduceSalary: row.reduceSalary,
-        actualSalary: row.actualSalary,
+      let obj = {
+        finalSalary: row.finalSalary, // 实发
+        reduceSalary: row.reduceSalary, // 扣款
+        actualSalary: row.actualSalary, // 应发
         courseScheduleId: row.courseScheduleId,
-        memo:row.memo,
-        teacherId:row.teacherId
+        memo: row.memo,
+        teacherId: row.teacherId
       };
+      this.$set(this,'visibleForm',obj)
+      console.log(this.visibleForm.finalSalary)
       this.dialogVisible = true;
     },
     subreset() {
@@ -459,10 +473,10 @@ export default {
         if (flag) {
           let obj = {
             courseScheduleId: this.visibleForm.courseScheduleId,
-            currentExpectSalary: this.visibleForm.expectSalary,
+            currentExpectSalary: this.visibleForm.actualSalary,
             currentReduceSalary: this.visibleForm.reduceSalary,
             memo: this.visibleForm.memo,
-            teacherId:this.visibleForm.teacherId,
+            teacherId: this.visibleForm.teacherId
           };
           teacherSalaryModifyLog(obj).then(res => {
             if (res.code == 200) {
@@ -488,25 +502,24 @@ export default {
     }
   },
   computed: {
-    getExpectSalaEry() {
-      return this.visibleForm.expectSalary;
+    getActualsalary() {
+      // 应发
+      return this.visibleForm.actualSalary;
     },
     getReduceSalary() {
+      // 扣款
       return this.visibleForm.reduceSalary;
     },
-    getActualSalary() {
-      return this.visibleForm.actualSalary;
-    }
   },
   watch: {
-    getExpectSalaEry(val) {
-      this.visibleForm.actualSalary = parseFloat(
+    getActualsalary(val) {
+      this.visibleForm.finalSalary = parseFloat(
         val - this.getReduceSalary > 0 ? val - this.getReduceSalary : 0
       );
     },
     getReduceSalary(val) {
-      this.visibleForm.actualSalary = parseFloat(
-        this.getExpectSalaEry - val > 0 ? this.getExpectSalaEry - val : 0
+      this.visibleForm.finalSalary = parseFloat(
+        this.getActualsalary - val > 0 ? this.getActualsalary - val : 0
       );
     },
     dialogVisible(val) {
@@ -516,8 +529,8 @@ export default {
           reduceSalary: null,
           actualSalary: null,
           courseScheduleId: null,
-          teacherId:null,
-          memo:null
+          teacherId: null,
+          memo: null
         };
         this.$refs["visibleForm"].resetFields();
       }