04/25 11:02

111

dist/static/css/chunk-6b005022.3f0075d3.css → dist/static/css/chunk-05bea0d3.d51f0071.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-18c1acc8]{color:red}.visibleForm[data-v-18c1acc8] .el-input__inner,.visibleForm[data-v-18c1acc8] .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-648e7b5c]{color:red}.visibleForm[data-v-648e7b5c] .el-input__inner,.visibleForm[data-v-648e7b5c] .el-textarea__inner{width:225px!important}

src/views/settlementManager/settlementList.vue

@@ -7,29 +7,39 @@
     <div class="m-core">
       <el-form :inline="true" :model="searchForm">
         <el-form-item>
-          <el-input v-model.trim="searchForm.search" @keyup.enter.native="search" placeholder='课程组编号&名字'></el-input>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="课程组编号&名字"
+          ></el-input>
         </el-form-item>
-         <el-form-item>
-        <el-select placeholder="请选择分部" v-model="searchForm.organId" clearable>
-          <el-option
-            v-for="(item,index) in organList"
-            :label="item.name"
-            :value="item.id"
-            :key="index"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
-          <el-option
-            v-for="(item,index) in teacherList"
-            :label="item.realName"
-            :value="item.id"
-            :key="index"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-       <el-form-item>
+        <el-form-item>
+          <el-select placeholder="请选择分部" v-model="searchForm.organId" clearable>
+            <el-option
+              v-for="(item,index) in organList"
+              :label="item.name"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="是否转接" v-model="searchForm.settlementStatus" clearable>
+            <el-option label="结算" value="1"></el-option>
+            <el-option label="未结算" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-button type="danger" @click="search">搜索</el-button>
           <el-button @click="onReSet" type="primary">重置</el-button>
           <!-- <el-button
@@ -37,7 +47,7 @@
             type="primary"
             v-permission="'export/exercisesSituations'"
             style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button> -->
+          >导出</el-button>-->
         </el-form-item>
       </el-form>
       <div class="tableWrap">
@@ -46,23 +56,24 @@
           :header-cell-style="{background:'#EDEEF0',color:'#444'}"
           :data="tableList"
         >
-        <el-table-column align="center" prop="musicGroupId" label="课程组编号"></el-table-column>
-        <el-table-column align="center" prop="courseGroupName" label="课程组名称"></el-table-column>
+          <el-table-column align="center" prop="musicGroupId" label="课程组编号"></el-table-column>
+          <el-table-column align="center" prop="courseGroupName" label="课程组名称"></el-table-column>
           <el-table-column align="center" prop="organName" label="分部"></el-table-column>
           <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
+          <el-table-column align="center" label="结转状态">
+            <template slot-scope="scope">
+              <div>{{ scope.row.settlementStatus?'结算':'未结算'}}</div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="结转金额">
-              <template slot-scope="scope">
-                  <div>
-                      {{ scope.row.expectRewardAmount + '元'}}
-                  </div>
-              </template>
+            <template slot-scope="scope">
+              <div>{{ scope.row.expectRewardAmount + '元'}}</div>
+            </template>
           </el-table-column>
-            <el-table-column align="center" label="结转日期">
-              <template slot-scope="scope">
-                  <div>
-                      {{ scope.row.createTime | formatTimer}}
-                  </div>
-              </template>
+          <el-table-column align="center" label="结转日期">
+            <template slot-scope="scope">
+              <div>{{ scope.row.settlementDate | formatTimer}}</div>
+            </template>
           </el-table-column>
           <el-table-column align="center" prop="memo" width="500" label="备注"></el-table-column>
         </el-table>
@@ -84,15 +95,16 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
-import { teacherCourseReward } from "@/api/operateManager"
+import { teacherCourseReward } from "@/api/operateManager";
 export default {
   components: { pagination },
   data() {
     return {
       searchForm: {
         search: null,
-        organId:null,
-        teacherId:null
+        organId: null,
+        teacherId: null,
+        settlementStatus:null
       },
       teacherList: [],
       tableList: [],
@@ -110,12 +122,12 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-       getTeacher().then(res => {
+    getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }
     });
-      getEmployeeOrgan().then(res => {
+    getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
       }
@@ -123,35 +135,36 @@ export default {
     // 获取分部
     this.init();
   },
-  activated(){
-        this.init();
+  activated() {
+    this.init();
   },
   methods: {
     init() {
-        this.getList()
+      this.getList();
     },
     getList() {
-        this.searchForm.page = this.rules.page;
-        this.searchForm.rows = this.rules.limit;
-        teacherCourseReward(this.searchForm).then(res=>{
-            if(res.code == 200){
-                this.tableList = res.data.rows;
-                this.rules.total = res.data.total;
-            }
-        })
+      this.searchForm.page = this.rules.page;
+      this.searchForm.rows = this.rules.limit;
+      teacherCourseReward(this.searchForm).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+        }
+      });
     },
-    onExport(){},
-    search(){
-        this.rules.page = 1;
-        this.getList()
+    onExport() {},
+    search() {
+      this.rules.page = 1;
+      this.getList();
     },
-    onReSet(){
-        this.searchForm= {
+    onReSet() {
+      this.searchForm = {
         search: null,
-        organId:null,
-        teacherId:null
-      }
-      this.search()
+        organId: null,
+        teacherId: null,
+        settlementStatus:null
+      };
+      this.search();
     }
   }
 };

src/views/workBenchManager/classFeesIsOk.vue

@@ -371,19 +371,13 @@ export default {
         });
       });
     },
-    closeSalary() {
-      let now = new Date();
-      let month = new Date(
-        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-      )
-        .toISOString()
-        .slice(0, 7);
+    closeSalary() {    
       this.$confirm("您确定关闭课酬确认?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        closeSalaryConfirm({ month }).then(res => {
+        closeSalaryConfirm({ month: this.searchForm.month }).then(res => {
           if (res.code == 200) {
             this.$message.success("关闭成功");
             this.getList();