11

11

.gitignore

@@ -16,13 +16,6 @@ tests/**/coverage/
 *.njsproj
 *.sln
 debug.log
+*.log
 
 
-
-*.log
-debug.log
-<<<<<<< HEAD
-debug.log
-=======
-*.log
->>>>>>> 01/21VipReset

dist/static/css/chunk-1edf95a6.cb9b5349.css

@@ -0,0 +1 @@
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-007f8ff6]{font-size:14px}.btnList[data-v-007f8ff6]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-007f8ff6]{margin-right:15px}

dist/static/css/chunk-27c54533.4717632c.css

@@ -0,0 +1 @@
+.newBand[data-v-4f1441a8]{display:inline-block;margin-right:10px}.right-code .title[data-v-4f1441a8]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-4f1441a8] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-4f1441a8] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-45c832ba.66148cbf.css

@@ -0,0 +1 @@
+.visitBtnWrap[data-v-bba67e46]{position:absolute;right:90px;top:82px;z-index:20}

dist/static/css/chunk-4e093476.47b8cfd8.css

@@ -1 +1,5 @@
-.el-button+.el-button[data-v-00faacfa]{margin-left:0}.hanlderWrap[data-v-00faacfa]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+<<<<<<< HEAD:dist/static/css/chunk-4e093476.47b8cfd8.css
+.el-button+.el-button[data-v-00faacfa]{margin-left:0}.hanlderWrap[data-v-00faacfa]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+=======
+.el-button+.el-button[data-v-5f32c709]{margin-left:0}.hanlderWrap[data-v-5f32c709]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+>>>>>>> 02_07search:dist/static/css/chunk-6c30fd65.f3a226d4.css

dist/static/css/chunk-4f6f8fa2.db6dd3b9.css

@@ -0,0 +1 @@
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-59f51623] .el-dialog__body{padding:10px 20px}[data-v-59f51623] .description-title{margin:0!important}

dist/static/css/chunk-5c71a5ed.3d4ff244.css

@@ -0,0 +1 @@
+.alert[data-v-6ad5e62e]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}

dist/static/css/chunk-663b1c07.0657df50.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-cfa198ce],.el-button--primary[data-v-cfa198ce]:active,.el-button--primary[data-v-cfa198ce]:focus,.el-button--primary[data-v-cfa198ce]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-select[data-v-cfa198ce],[data-v-cfa198ce] .el-date-editor.el-input{width:100%!important}

dist/static/css/chunk-69a2a9da.924372aa.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-411c7eea],.el-button--primary[data-v-411c7eea]:active,.el-button--primary[data-v-411c7eea]:focus,.el-button--primary[data-v-411c7eea]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-411c7eea] .el-date-editor.el-input,[data-v-411c7eea] .el-select{width:100%!important}[data-v-411c7eea] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-411c7eea] .el-dialog__body{padding:10px 20px}.newBand[data-v-411c7eea]{display:inline-block}

dist/static/css/chunk-6a97b9c3.c9ab11db.css

@@ -0,0 +1 @@
+.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner,.number-input[data-v-57cd9361] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-6c30fd65.f3a226d4.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-4e093476.47b8cfd8.css
+.el-button+.el-button[data-v-00faacfa]{margin-left:0}.hanlderWrap[data-v-00faacfa]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+=======
+.el-button+.el-button[data-v-5f32c709]{margin-left:0}.hanlderWrap[data-v-5f32c709]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+>>>>>>> 02_07search:dist/static/css/chunk-6c30fd65.f3a226d4.css

dist/static/css/chunk-7d488ad3.753ee7da.css

@@ -0,0 +1 @@
+.v-charts-component-loading{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9)}.v-charts-mask-status{-webkit-filter:blur(1px);filter:blur(1px)}.v-charts-component-loading .circular{width:42px;height:42px;-webkit-animation:loading-rotate 2s linear infinite;animation:loading-rotate 2s linear infinite}.v-charts-component-loading .path{-webkit-animation:loading-dash 1.5s ease-in-out infinite;animation:loading-dash 1.5s ease-in-out infinite;stroke-dasharray:90,150;stroke-dashoffset:0;stroke-width:2;stroke:#20a0ff;stroke-linecap:round}@-webkit-keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}@keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}.v-charts-data-empty{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9);color:#888;font-size:14px}

dist/static/css/chunk-bc7df84a.18f4036d.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-fc6e70ac]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-fc6e70ac],[data-v-fc6e70ac] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-fc6e70ac] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-fc6e70ac] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-fc6e70ac] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-fc6e70ac] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-fc6e70ac] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

src/views/afterSchoolManager/afterSchoolList.vue

@@ -203,16 +203,8 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
-  //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    this.$store.dispatch("setBranchs");
-    // 获取分部
-    this.init();
-  },
-  methods: {
-    init() {
-      if (this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
+  created() {
+     if (this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
         let now = new Date();
         let startDate = new Date(
           Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -228,6 +220,16 @@ export default {
         this.searchForm.listTimer.push(startDate);
         this.searchForm.listTimer.push(endDate);
       }
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    this.$store.dispatch("setBranchs");
+    // 获取分部
+    this.init();
+  },
+  methods: {
+    init() {
+     
       this.getList();
     },
     getList() {

src/views/businessManager/orderManager/backMoney.vue

@@ -238,7 +238,7 @@ export default {
     //   }
     // })
     this.$store.dispatch("setBranchs");
-    if (this.searchForm.orderDate.length < 1) {
+    if (this.searchForm?.orderDate?.length < 1) {
       var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())

src/views/businessManager/orderManager/financeManager.vue

@@ -748,21 +748,7 @@ export default {
   },
   created() {
     that = this;
-  },
-  mounted() {
-    // getEmployeeOrgan().then((res) => {
-    //   if (res.code == 200) {
-    //     this.organList = res.data;
-    //   }
-    // });
-    this.$store.dispatch("setBranchs");
-    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
-      if (res.code === 200) {
-        this.shopList = res.data.rows;
-      }
-    });
-
-    if (!(this.searchForm.orderDate?.length > 0)) {
+        if (!(this.searchForm.orderDate?.length > 0)) {
       var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -778,6 +764,21 @@ export default {
       this.searchForm.orderDate.push(startDate);
       this.searchForm.orderDate.push(endDate);
     }
+  },
+  mounted() {
+    // getEmployeeOrgan().then((res) => {
+    //   if (res.code == 200) {
+    //     this.organList = res.data;
+    //   }
+    // });
+    this.$store.dispatch("setBranchs");
+    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
+      if (res.code === 200) {
+        this.shopList = res.data.rows;
+      }
+    });
+
+
 
     this.getList();
   },

src/views/main/baseinfo/index.vue

@@ -131,8 +131,11 @@ export default {
       return !Object.keys(this.dataInfo).length
     }
   },
+  created(){
+     this.reset()
+  },
   mounted () {
-    this.reset()
+   
     this.$store.dispatch('setBranchs')
   },
   methods: {

src/views/recodeManager/recodeList.vue

@@ -352,7 +352,10 @@ export default {
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created() {
+    if(this.courseTime.length >0)
+     this.courseTime = [nowTime, nowTime]
+  },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     // getTeacher().then(res => {
@@ -374,13 +377,10 @@ export default {
     if (query.start || query.end) {
       this.courseTime = [query.start, query.end]
     } else {
-      this.courseTime = [nowTime, nowTime]
+     
     }
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       this.getList();

src/views/stuRecodeManager/index.vue

@@ -377,15 +377,18 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
-  //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    const { query } = this.$route
-    if (this.searchForm.dates?.length < 1) {
+  created() {
+     const { query } = this.$route
+      if (this.searchForm.dates?.length < 1) {
         const start = query.start || new Date()
         const end = query.end || new Date()
         this.searchForm.dates = [start, end]
     }
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    const { query } = this.$route
+  
     if (query.visitFlag == 1 || query.visitFlag == 0) {
       this.searchForm.visitFlag = String(query.visitFlag)
     }

src/views/teamDetail/teamCourseList.vue

@@ -686,8 +686,8 @@ export default {
     infoMsg,
     SchoolLocation,
   },
-  activated() {
-    this.init();
+  created(){
+      this.searchForm.timer = [nowTime, nowTime]
   },
   computed: {
     workTypeOptions() {
@@ -701,28 +701,7 @@ export default {
     const { query } = this.$route
     if (query.start || query.end) {
       this.searchForm.timer = [query.start, query.end]
-    } else {
-      let flag = false
-      for(let item in this.searchForm){
-        if(typeof this.searchForm[item] == 'object'){
-          // 对象或者数组
-          if(this.searchForm[item]?.length >0){
-            
-            flag = true
-          }
-        }else{
-          if (this.searchForm[item]){
-            flag = true
-          }
-        }
-      }
-     
-      if(!flag){
-        this.searchForm.timer = [nowTime, nowTime]
-      }
-      
-    }
-
+    } 
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId)
     }

src/views/workBenchManager/classFeesIsOk.vue

@@ -434,7 +434,16 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created() {
+        if (!this.searchForm.month) {
+        var now = new Date();
+        this.searchForm.month = new Date(
+          Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+        )
+          .toISOString()
+          .slice(0, 7);
+      }
+  },
   //生命周期 - 挂载完成（可以访问DOM元素）
   async mounted() {
     await this.$store.dispatch('setBranchs')
@@ -445,15 +454,6 @@ export default {
   },
   methods: {
     init() {
-      if (!this.searchForm.month) {
-        var now = new Date();
-        this.searchForm.month = new Date(
-          Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-        )
-          .toISOString()
-          .slice(0, 7);
-      }
-
       this.getList();
     },
     getList() {