瀏覽代碼

Merge branch 'iteration_201218' into online

mo 4 年之前
父節點
當前提交
765720898f

+ 1 - 1
src/views/resetTeaming/components/resetPayList.vue

@@ -41,7 +41,7 @@
         <el-table-column align="center"
                          prop="batchNo"
                          width="200"
-                         label="缴费编号"></el-table-column>
+                         label="缴费批次"></el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">

+ 1 - 1
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -41,7 +41,7 @@
         <el-table-column align="center"
                          prop="batchNo"
                          width="200"
-                         label="缴费编号"></el-table-column>
+                         label="缴费批次"></el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">

+ 1 - 1
src/views/resetTeaming/modals/pay-items.vue

@@ -5,7 +5,7 @@
         align="center"
         prop="batchNo"
         width="200"
-        label="批次"
+        label="缴费批次"
       ></el-table-column>
       <el-table-column
         align="center"

+ 7 - 2
src/views/workBenchManager/classFeesIsOk.vue

@@ -291,10 +291,12 @@
             label="应发"
             :rules="[
               { required: true, message: '请填写应发数', trigger: 'blur' },
+                { pattern: /^[0-9]+?[0-9]*$/, message: '请输入大于0的数字' }
             ]"
             prop="actualSalary"
           >
             <el-input
+            :min='0'
               v-model.trim="visibleForm.actualSalary"
               type="number"
               @mousewheel.native.prevent
@@ -304,11 +306,13 @@
             label="扣款"
             :rules="[
               { required: true, message: '请填写扣款数', trigger: 'blur' },
+               { pattern: /^[0-9]+?[0-9]*$/, message: '请输入大于0的数字' }
             ]"
             prop="reduceSalary"
           >
             <el-input
               v-model.trim="visibleForm.reduceSalary"
+              :min='0'
               type="number"
               @mousewheel.native.prevent
             ></el-input>
@@ -317,6 +321,7 @@
             <el-input
               v-model.trim="visibleForm.finalSalary"
               disabled
+              :min='0'
               type="number"
               @mousewheel.native.prevent
             ></el-input>
@@ -564,9 +569,9 @@ export default {
     },
     resetSalary(row) {
       let obj = {
-        finalSalary: row.finalSalary, // 实发
+        finalSalary: row.actualSalary, // 实发
         reduceSalary: row.reduceSalary, // 扣款
-        actualSalary: row.actualSalary, // 应发
+        actualSalary: row.expectSalary, // 应发
         courseScheduleId: row.courseScheduleId,
         memo: row.memo,
         teacherId: row.teacherId,