提交测试前 即将重新打包

1

src/utils/auth.js

@@ -1,16 +1,12 @@
 import Cookies from 'js-cookie'
-import { validOaUrl } from '@/utils/validate'
 
 const TokenKey = 'dy_admin_token'
 // const CrossTokenKey = 'Admin-Token'
 const CrossTokenKey = 'Admin-Token'
-// const Token = Cookies.get('cross-Token')
-// console.log(Token, validOaUrl().split('//')[1])
-// Cookies.set('Admin-Token', Token, { domain: `.${validOaUrl().split('//')[1]}`, path: '/' })
-const host = location.hostname
-const ip = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+
 function getCookieDomain() {
   let host = location.hostname
+  const ip = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
   if (ip.test(host) === true || host === 'localhost') return host
   const regex = /([^]*).*/
   const match = host.match(regex)

src/views/resetTeaming/components/archicesComponents/trainTimer.vue

@@ -136,7 +136,7 @@ export default {
         year: "",
         term: "",
         classType: "",
-        isIng:''
+        isIng: "",
       },
       dataList: [],
     };
@@ -191,18 +191,18 @@ export default {
       } else {
         arr = this.dataList;
       }
-      if(this.searchForm.isIng){
-        if(this.searchForm.isIng == 1){
+      if (this.searchForm.isIng) {
+        if (this.searchForm.isIng == 1) {
           //不相等
-          arr = arr.filter((item)=>{
-            return item.currentClassTimes !=item.totalClassTimes
-          })
+          arr = arr.filter((item) => {
+            return item.currentClassTimes != item.totalClassTimes;
+          });
         }
-        if(this.searchForm.isIng == 2){
+        if (this.searchForm.isIng == 2) {
           //相等
-               arr = arr.filter((item)=>{
-            return item.currentClassTimes ==item.totalClassTimes
-          })
+          arr = arr.filter((item) => {
+            return item.currentClassTimes == item.totalClassTimes;
+          });
         }
       }
       // 继续接着刚才搜索
@@ -306,3 +306,4 @@ export default {
   }
 }
 </style>
+

src/views/resetTeaming/components/resetPayList.vue

@@ -149,11 +149,7 @@
                   >查看</el-button
                 ></auth
               >
-              <auth auths="musicGroupPaymentCalenderDetail/batchAdd/3890">
-                <el-button
-                  type="text"
-                  @click="openChioseStudent(scope.row)"
-                  v-if="
+              <auth auths="musicGroupPaymentCalenderDetail/batchAdd/3890"        v-if="
                     scope.row.auditStatus != 'REJECT' &&
                     scope.row.auditStatus != 'AUDITING' &&
                     scope.row.auditStatus != 'DRAFT' &&
@@ -161,50 +157,53 @@
                     scope.row.paymentType != 'MUSIC_APPLY' &&
                     scope.row.paymentType != 'ADD_STUDENT' &&
                     scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
-                  "
+                  ">
+                <el-button
+                  type="text"
+                  @click="openChioseStudent(scope.row)"
+
                   >添加学员</el-button
                 >
               </auth>
               <!-- v-permission="'musicGroupPaymentCalenderDetail/batchAdd/3890'"  v-permission="''" -->
 
-              <auth auths="musicGroupPaymentCalender/update/4313">
-                <el-button
-                  type="text"
-                  v-if="
+              <auth auths="musicGroupPaymentCalender/update/4313"  v-if="
                     teamStatus &&
                     (scope.row.auditStatus === 'REJECT' ||
                       scope.row.auditStatus === 'DRAFT')
-                  "
+                  ">
+                <el-button
+                  type="text"
+
                   @click="resetPay(scope.row)"
                   >修改</el-button
                 >
               </auth>
-              <auth auths="musicGroupPaymentCalender/revoke">
-                <el-button
-                  type="text"
-                  v-if="
+              <auth auths="musicGroupPaymentCalender/revoke"     v-if="
                     (team_status == 'FEE_AUDIT' || team_status == 'PROGRESS') &&
                     scope.row.auditStatus === 'AUDITING' &&
                     scope.row.paymentType != 'ADD_STUDENT' &&
                     scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
-                  "
+                  ">
+                <el-button
+                  type="text"
+
                   @click="revoke(scope.row)"
                   >撤回</el-button
                 >
               </auth>
 
-              <auth auths="musicGroupPaymentCalender/delByBatchNo/4305">
-                <el-button
-                  type="text"
-                  v-if="
+              <auth auths="musicGroupPaymentCalender/delByBatchNo/4305"     v-if="
                     teamStatus &&
                     scope.row.paymentType != 'ADD_STUDENT' &&
                     scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
-                  "
+                  ">
+                <el-button
+                  type="text"
+
                   @click="removeBatchNo(scope.row)"
                   >删除</el-button
-                ></auth
-              >
+                ></auth>
 
               <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"

src/views/resetTeaming/modals/member-setting.vue

@@ -145,6 +145,9 @@ export default {
     }
     this.$set(this.form, "memberValidDate", 6);
   },
+  beforeDestroy(){
+    this.$set(this.form, "memberValidDate", null);
+  },
   methods: {
     async memberRankSettingIdChange(val) {
       if (val) {