wolyshaw 4 سال پیش
والد
کامیت
3adae7974d
2فایلهای تغییر یافته به همراه33 افزوده شده و 2 حذف شده
  1. 2 2
      src/constant/index.js
  2. 31 0
      src/views/workBenchManager/classFeesIsOk.vue

+ 2 - 2
src/constant/index.js

@@ -192,6 +192,6 @@ export const mergeType = {
 }
 
 export const belongDaya = {
-  0: '奖金',
-  1: '工资'
+  0: '其它课酬',
+  1: '基本课酬'
 }

+ 31 - 0
src/views/workBenchManager/classFeesIsOk.vue

@@ -68,6 +68,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="belongDaya">
+          <el-select
+            v-model.trim="searchForm.belongDaya"
+            clearable
+            placeholder="请选择课酬类型"
+          >
+            <el-option
+              v-for="(item, index) in belongDayaOption"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <remoteSearch :commit='"setTeachers"'  v-model='searchForm.teacherId' />
           <!-- <el-select
@@ -235,6 +249,15 @@
             <template slot-scope="scope">{{(scope.row.actualReceipts ? scope.row.actualReceipts : 0) + '元'}}</template>
           </el-table-column> -->
           <!-- expectSalary -->
+          <el-table-column
+            align="center"
+            prop="belongDaya"
+            label="课酬类型"
+          >
+          <template slot-scope="scope">{{
+              belongDaya[scope.row.belongDaya]
+            }}</template>
+          </el-table-column>
           <el-table-column align="center" prop="actualSalary" label="应发课酬">
             <template slot-scope="scope"
               >{{ scope.row.actualSalary | moneyFormat }}元</template
@@ -362,6 +385,8 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
+import { belongDaya } from '@/constant'
+import { objectToOptions } from '@/utils'
 import {
   findIsSettlementCourseSalarys,
   openSalaryConfirm,
@@ -373,6 +398,7 @@ export default {
   components: { pagination, remoteSearch },
   data() {
     return {
+      belongDaya,
       searchForm: {
         search: null,
         organIdList: null,
@@ -382,6 +408,7 @@ export default {
         signOutStatus: null,
         month: null,
         confirmStatus: null,
+        belongDaya: null,
       },
       dialogVisible: false,
       visibleForm: {
@@ -465,6 +492,7 @@ export default {
         signOutStatus: this.searchForm.signOutStatus || null,
         month: this.searchForm.month || null,
         confirmStatus: this.searchForm.confirmStatus || null,
+        belongDaya: this.searchForm.belongDaya || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -617,6 +645,9 @@ export default {
       // 扣款
       return this.visibleForm.reduceSalary;
     },
+    belongDayaOption() {
+      return objectToOptions(belongDaya)
+    }
   },
   watch: {
     getActualsalary(val) {