判断条件有误

1

src/views/branchPayManager/modals/addPayCode.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <el-dialog
+      title="添加付款记录"
+      width="760px"
+      :visible.sync="visitVisible"
+      append-to-body
+    >
+      <visit
+        v-if="visitVisible && activeRow"
+        :detail="activeRow"
+        :username="activeRow.username"
+        @close="visitVisible = false"
+        @submited="getList"
+        :isMainGo="false"
+        :useVisitType="false"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>

src/views/branchPayManager/payShareList.vue

@@ -78,21 +78,53 @@
             prop="cooperationOrganName"
             label="合作单位"
           ></el-table-column>
-          <el-table-column align="center" prop="studentId" label="应收总额">
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="乐团"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="乐器数量"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="分润金额(每件/元)"
+          >
             <template slot-scope="scope">
               <div>
                 {{ scope.row.receivable | moneyFormat }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="实收总额">
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="分润总金额"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.receivable | moneyFormat }}
+              </div>
+            </template></el-table-column
+          >
+          <el-table-column align="center" prop="studentId" label="乐团主管">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.receivable | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="studentId" label="付款状态">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.income | moneyFormat }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="待收金额">
+          <el-table-column align="center" prop="studentId" label="付款流水号">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.prepaidFee | moneyFormat }}
@@ -101,17 +133,24 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="educationUserName"
+            prop="备注"
             label="乐团主管"
             width="100px"
           >
           </el-table-column>
+          <el-table-column align="center" prop="studentId" label="凭证">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.prepaidFee | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
                 <auth auths="musicGroupCalenderRefundPeriod/queryCoopCalender">
-                  <el-button type="text" @click="gotoDetail(scope.row)"
-                    >详情</el-button
+                  <el-button type="text" @click="addPayCode(scope.row)"
+                    >添加付款记录</el-button
                   >
                 </auth>
               </div>
@@ -128,7 +167,6 @@
         />
       </div>
     </div>
-
   </div>
 </template>
 
@@ -140,7 +178,7 @@ import { getTimes } from "@/utils";
 import load from "@/utils/loading";
 import { backTypeList } from "@/utils/searchArray";
 import { Export } from "@/utils/downLoadFile";
-import { getCoopRefundList } from './api'
+import { getCoopRefundList } from "./api";
 import { queryByOrganId } from "@/api/systemManage";
 import qs from "qs";
 export default {
@@ -153,7 +191,7 @@ export default {
         organId: null,
         backTime: [],
         payTime: [],
-        returnFeeFlag:null
+        returnFeeFlag: null,
       },
       backTypeList,
       tableList: [],
@@ -207,8 +245,8 @@ export default {
       this.$refs["searchForm"].resetFields();
       this.search();
     },
-    gotoDetail(row) {
-      this.$router.push({path:'/financialManager/payschoolList',query:{id:row.cooperationOrganId,name:row.cooperationOrganName}})
+    addPayCode(row) {
+
       // /financialManager/payschoolList
     },
 

src/views/branchPayManager/payschoolList.vue

@@ -258,7 +258,10 @@ export default {
       this.searchForm.cooperationId = this.$route.query.id;
       this.search();
     },
-    goBack() {},
+    goBack() {
+      this.$store.dispatch('delVisitedViews', this.$route)
+      this.$router.push('/branchPayManager')
+    },
     lookList(row) {
       this.viewDetail = row;
       this.viewDetail.id = row.calenderId;

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -762,7 +762,7 @@ export default {
           path: "/business/resetTeaming",
           query: { ...this.$route.query },
         });
-      } else if (query.type == "teamDraft" || query.type == "teamAudit") {
+      } else if (query.type == "teamDraft" || query.type == "teamAudit" || query.type=='FEE_AUDIT_FAILED') {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",

src/views/resetTeaming/modals/payMember.vue

@@ -181,7 +181,7 @@
         prop="actualAmount"
         key="actualAmount"
         width="170px"
-        v-if="form.calenderFeeType =='STUDENT'"
+        v-if="form.calenderFeeType !='TEACHER'"
       >
         <template slot="header">
           <p style="position: relative">

src/views/resetTeaming/modals/payTeamActive.vue

@@ -112,7 +112,7 @@
         </template>
       </el-table-column>
       <el-table-column
-      v-if="form.calenderFeeType =='STUDENT'"
+      v-if="form.calenderFeeType !='TEACHER'"
         label="售价(元)"
         prop="actualAmount"
         key="actualAmount"