提交

1

src/views/branchPayManager/modals/addPayCode.vue

@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item label="上传凭证"  prop="credentials" :rules="[{ required: true, message: '请上传凭证' }]">
         <div style="width: 80% !important">
-          <uploadImageList :uploaded="form.credentials" bucket_name="i-m"/>
+          <uploadImageList :uploaded="form.credentials" bucket_name="contracts"/>
           <!-- bucket_name="cooperation" -->
         </div>
       </el-form-item>

src/views/branchPayManager/payList.vue

@@ -4,6 +4,9 @@
     <h2>
       <div class="squrt"></div>
       合作单位缴费
+      <auth auths="musicGroupCalenderRefundPeriod/queryCoopCalender">
+        <filter-search :keys="['searchType']" @reload="onReSet" />
+      </auth>
     </h2>
     <div class="m-core">
       <save-form
@@ -54,7 +57,6 @@
         </el-form-item>
       </save-form>
       <div style="font-size: 14px; color: #f85043; padding-bottom: 10px">
-
         欠费总额：{{ amount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
@@ -125,7 +127,6 @@
         />
       </div>
     </div>
-
   </div>
 </template>
 
@@ -137,7 +138,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 {
@@ -150,7 +151,7 @@ export default {
         organId: null,
         backTime: [],
         payTime: [],
-        returnFeeFlag:null
+        returnFeeFlag: null,
       },
       backTypeList,
       tableList: [],
@@ -167,7 +168,7 @@ export default {
         id: null,
       },
       resetVisible: false,
-      amount:0
+      amount: 0,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -188,12 +189,13 @@ export default {
         ...this.searchForm,
         page: this.rules.page,
         rows: this.rules.limit,
+        errorType: this.$route.query.filter_type,
       };
       try {
         const res = await getCoopRefundList(params);
         this.tableList = res.data.pageInfo.rows;
         this.rules.total = res.data.pageInfo.total;
-        this.amount = res.data.amount
+        this.amount = res.data.amount;
       } catch (e) {
         console.log(e);
       }
@@ -207,7 +209,10 @@ export default {
       this.search();
     },
     gotoDetail(row) {
-      this.$router.push({path:'/financialManager/payschoolList',query:{id:row.cooperationOrganId,name:row.cooperationOrganName}})
+      this.$router.push({
+        path: "/financialManager/payschoolList",
+        query: { id: row.cooperationOrganId, name: row.cooperationOrganName },
+      });
       // /financialManager/payschoolList
     },
 

src/views/main/abnormal/index.vue

@@ -215,6 +215,7 @@ export default {
   methods: {
     permission,
     handle(item) {
+      console.log(item,'handleItem')
       // 添加判断权限
       if (
         errorType[item[0].errorType] &&

src/views/main/constant.js

@@ -193,6 +193,26 @@ export const errorType = {
       visitFlag: '0',
     },
   },
+  COOPERATION_PAYMENT_ERROR: {
+    name: '合作单位回款异常',
+    isError: true,
+    url: '/branchPayManager',
+    permission: '/WithdrawalApplication',
+    always: true,
+    query: {
+      searchType: 'COOPERATION_PAYMENT_ERROR',
+    },
+  },
+  COOPERATION_PAYMENT_ALERT: {
+    name: '合作单位回款提醒',
+    isError: true,
+    url: '/branchPayManager',
+    permission: '/WithdrawalApplication',
+    always: true,
+    query: {
+      searchType: 'COOPERATION_PAYMENT_ALERT',
+    },
+  },
   // WAIT_CREATE_PAYMENT_CALENDER: {
   //   name: '待创建缴费项目',
   //   isError: true,

src/views/resetTeaming/components/payInfoDetail.vue

@@ -937,7 +937,6 @@ export default {
               .catch(() => {});
           } else {
             const preViewData = this.formatPreviewData();
-            console.log(preViewData);
             this.preViewData = preViewData;
             await this.onPreview();
           }
@@ -952,7 +951,7 @@ export default {
       this.$refs.form.validate(async isok => {
         if (isok) {
           let obj = this.fommatDate();
-          if (this.form.payUserType == "SCHOOL") {
+          if (obj.payUserType == "SCHOOL") {
             let total = 0;
             this.form.musicGroupCalenderRefundPeriods.forEach(item => {
               total += item.refundAmount * 1;

src/views/resetTeaming/modals/paySchoolInfo.vue

@@ -286,7 +286,7 @@
             buttonText="上传合同"
             accept=".pdf"
             v-model="form.contractUrl"
-            bucket_name="i-m"
+            bucket_name="contracts"
           />
           <!-- bucket_name="cooperation" -->
         </el-form-item>