1

1

dist/static/js/chunk-588eee5a.36ce9178.js

@@ -1,4 +1,12 @@
+<<<<<<< HEAD:dist/static/js/chunk-588eee5a.36ce9178.js
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-588eee5a","chunk-e1e767e6","chunk-4e56be9c","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-081a8b8e","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+=======
+<<<<<<< HEAD:dist/static/js/chunk-14f81e1c.22071e5e.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-14f81e1c","chunk-e1e767e6","chunk-4e56be9c","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-081a8b8e","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+=======
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-588eee5a","chunk-e1e767e6","chunk-bd334e84","chunk-584f76a2","chunk-4c5113fa","chunk-59c1227c","chunk-4a5f46a6","chunk-081a8b8e","chunk-171bdaae","chunk-6e855f0c","chunk-c8c7f280"],{"010e":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
+>>>>>>> master:dist/static/js/chunk-588eee5a.7100a727.js
+>>>>>>> 03/03GRADE:dist/static/js/chunk-14f81e1c.22071e5e.js
 //! moment.js locale configuration
 var t=e.defineLocale("uz-latn",{months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[Bugun soat] LT [da]",nextDay:"[Ertaga] LT [da]",nextWeek:"dddd [kuni soat] LT [da]",lastDay:"[Kecha soat] LT [da]",lastWeek:"[O'tgan] dddd [kuni soat] LT [da]",sameElse:"L"},relativeTime:{future:"Yaqin %s ichida",past:"Bir necha %s oldin",s:"soniya",ss:"%d soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"},week:{dow:1,doy:7}});return t}))},"027d":function(e,t,a){},"02fb":function(e,t,a){(function(e,t){t(a("c1df"))})(0,(function(e){"use strict";
 //! moment.js locale configuration

src/views/buildVip/index.vue

@@ -895,23 +895,6 @@ export default {
     //   this.$refs["leftForm"].resetFields();
     // }, 100);
     // 判断一下有没有缓存
-    this.$router.beforeEach(async (to, from, next) => {
-      if (this.leftForm?.classOrganId && from.path == "/business/buildVip") {
-        console.log(this.leftForm?.classOrganId);
-        this.$confirm("检测到您有未提交的数据, 离开将丢失该数据!", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          closeOnClickModal: false,
-          type: "warning",
-        })
-          .then(async () => {
-            next();
-          })
-          .catch((err) => {});
-      } else {
-        next();
-      }
-    });
     this.courseType = this.$route.query.courseType;
     if (this.courseType == "PRACTICE") {
       this.title = "网管课申请";
@@ -1016,7 +999,24 @@ export default {
     // }, 100);
     // this.init();
   },
-  async beforeDestroy() {},
+  beforeDestroy() {},
+  beforeRouteLeave(to, from, next) {
+    if (this.leftForm?.classOrganId && from.path == "/business/buildVip") {
+      console.log(this.leftForm?.classOrganId);
+      this.$confirm("检测到您有未提交的数据, 离开将丢失该数据!", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        type: "warning",
+      })
+        .then(() => {
+          next();
+        })
+        .catch((err) => {});
+    } else {
+      next();
+    }
+  },
   methods: {
     resetFrom() {
       this.leftForm = {
@@ -1126,13 +1126,18 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate: (time) => {
-          if (self.leftForm.courseStart&&self.leftForm.courseEnd) {
+          if (self.leftForm.courseStart && self.leftForm.courseEnd) {
             let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
             let endDate = new Date(self.leftForm.courseEnd.replace(/-/, "/"));
             let nowDate = new Date();
-            let changeDate =date.getTime() - nowDate.getTime() > 0 ? date : nowDate;
-            let endChangeDate =  endDate.getTime() - nowDate.getTime() > 0 ? endDate : nowDate;
-            return time.getTime() < changeDate.getTime() || time.getTime() > endChangeDate.getTime();
+            let changeDate =
+              date.getTime() - nowDate.getTime() > 0 ? date : nowDate;
+            let endChangeDate =
+              endDate.getTime() - nowDate.getTime() > 0 ? endDate : nowDate;
+            return (
+              time.getTime() < changeDate.getTime() ||
+              time.getTime() > endChangeDate.getTime()
+            );
           }
           return;
         },

src/views/categroyManager/modals/payInfo.vue

@@ -494,6 +494,7 @@ export default {
       this.$emit("changeCourseType", val);
     },
     changeGiveCourseType(val) {
+       this.$emit('chageSalary')
       this.$emit("changeGiveCourseType", val);
     },
     chageSalary(val){

src/views/categroyManager/vipNewActive.vue

@@ -189,7 +189,7 @@ export default {
       this.formatDetail(rusult.data);
     } else {
       this.payInfo = { ...payBaseForm };
-      this.salaryForm = { ...baseSalaryForm };
+      this.salaryForm = JSON.parse(JSON.stringify({ ...baseSalaryForm }));;
     }
   },
   methods: {
@@ -271,7 +271,9 @@ export default {
       this.$set(this.payForm, "giveTeachMode", "");
     },
     chageSalary() {
-      this.salaryForm = { ...baseSalaryForm };
+      this.salaryForm = null
+      this.salaryForm = JSON.parse(JSON.stringify({ ...baseSalaryForm }));
+
       this.$forceUpdate();
     },
     async submit() {
@@ -446,15 +448,16 @@ export default {
         giveMemberTime: data.giveMemberTime ? data.giveMemberTime : null,
       };
       // 格式化缴费金额
+        console.log(data.salarySettlementJson)
       if (data.salarySettlementJson && data.salarySettlementJson != "null") {
-        this.salaryForm = { ...baseSalaryForm };
+        this.salaryForm = JSON.parse(JSON.stringify({ ...baseSalaryForm }));;
         let result = JSON.parse(data.salarySettlementJson);
 
         for (let key in result) {
           this.salaryForm[key] = result[key];
         }
       } else {
-        this.salaryForm = { ...baseSalaryForm };
+        this.salaryForm = JSON.parse(JSON.stringify({ ...baseSalaryForm }));;
       }
       this.$forceUpdate();
     },