Merge branch '02_07search' into online

src/layout/components/TagsView.vue

@@ -175,10 +175,12 @@ export default {
       this.top = e.clientY + 15;
     },
     closeMenu() {
+
       this.visible = false;
     },
     changeTag(tag) {
       activeKey = this.getSearchsByRealPath(tag)
+      console.log(activeKey)
     },
     getSearchsByRealPath(tag) {
       const searchs = new Searchs()

src/views/afterSchoolManager/afterSchoolList.vue

@@ -205,7 +205,18 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
      if (this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
-        let now = new Date();
+       this.getNow()
+      }
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    this.$store.dispatch("setBranchs");
+    // 获取分部
+    this.init();
+  },
+  methods: {
+    getNow(){
+       let now = new Date();
         let startDate = new Date(
           Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
         )
@@ -219,17 +230,9 @@ export default {
         this.searchForm.listTimer = [];
         this.searchForm.listTimer.push(startDate);
         this.searchForm.listTimer.push(endDate);
-      }
-  },
-  //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    this.$store.dispatch("setBranchs");
-    // 获取分部
-    this.init();
-  },
-  methods: {
+    },
     init() {
-     
+
       this.getList();
     },
     getList() {
@@ -268,6 +271,7 @@ export default {
         teacherId: null,
         organIdList: null,
       };
+      this.getNow()
       this.search();
     },
     lookDetail(row) {

src/views/businessManager/orderManager/businessStatement.vue

@@ -271,6 +271,11 @@ export default {
       },
     };
   },
+  created(){
+     const form = { ...this.searchForm };
+    form.month = dayjs().format("YYYY-MM");
+    this.searchForm = form;
+  },
   mounted() {
     this.$store.dispatch("setBranchs");
     // getEmployeeOrgan().then(res => {
@@ -283,24 +288,23 @@ export default {
         this.cooperations = res.data.rows;
       }
     });
-    const form = { ...this.searchForm };
-    form.month = dayjs().format("YYYY-MM");
-    this.searchForm = form;
+
     this.getList();
-    var now = new Date();
-    var startDate = new Date(
-      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-    )
-      .toISOString()
-      .slice(0, 10);
-    var endDate = new Date(
-      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-    )
-      .toISOString()
-      .slice(0, 10);
-    this.orderDate = [];
-    this.orderDate.push(startDate);
-    this.orderDate.push(endDate);
+
+    // var now = new Date();
+    // var startDate = new Date(
+    //   Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    // )
+    //   .toISOString()
+    //   .slice(0, 10);
+    // var endDate = new Date(
+    //   Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    // )
+    //   .toISOString()
+    //   .slice(0, 10);
+    // this.orderDate = [];
+    // this.orderDate.push(startDate);
+    // this.orderDate.push(endDate);
   },
   methods: {
     search() {

src/views/businessManager/orderManager/businessStatementDetail.vue

@@ -345,8 +345,8 @@ export default {
     goBack () {
       // searchForm: this.searchForm,
       // pageInfo: this.pageInfo
-       this.$store.dispatch('delVisitedViews', this.$route) 
-      this.$router.push({ path: '/orderList/businessStatement', query: { ...this.$route.query } })
+       this.$store.dispatch('delVisitedViews', this.$route)
+      this.$router.push({ path: '/orderList/businessStatement' })
     }
   }
 }

src/views/businessManager/orderManager/financeManager.vue

@@ -749,20 +749,7 @@ export default {
   created() {
     that = this;
         if (!(this.searchForm.orderDate?.length > 0)) {
-      var now = new Date();
-      var startDate = new Date(
-        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-      )
-        .toISOString()
-        .slice(0, 10);
-      var endDate = new Date(
-        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-      )
-        .toISOString()
-        .slice(0, 10);
-      this.searchForm.orderDate = [];
-      this.searchForm.orderDate.push(startDate);
-      this.searchForm.orderDate.push(endDate);
+          this.getNow()
     }
   },
   mounted() {
@@ -777,12 +764,25 @@ export default {
         this.shopList = res.data.rows;
       }
     });
-
-
-
     this.getList();
   },
   methods: {
+    getNow(){
+       var now = new Date();
+      var startDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      var endDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      this.searchForm.orderDate = [];
+      this.searchForm.orderDate.push(startDate);
+      this.searchForm.orderDate.push(endDate);
+    },
     onClear(type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
@@ -1029,7 +1029,7 @@ export default {
         search: null,
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: null,
+        paymentStatus: "SUCCESS",
         paymentType: null,
         routingOrganId: null,
         actualAmount: null,
@@ -1041,6 +1041,7 @@ export default {
         lessActualAmount: null,
         orderDate: [],
       };
+      this.getNow()
       this.getList();
     },
     removeGoodsList(item) {

src/views/evaluateManager/evaluateList.vue

@@ -262,6 +262,7 @@ export default {
       )
         .toISOString()
         .slice(0, 7);
+        this.search()
     },
     gotoEvakuateDetail(row) {
       let id = row.id;

src/views/musicInspection/index.vue

@@ -2,7 +2,7 @@
 <template>
     <div class="m-container">
         <h2>
-            <div class="squrt"></div>乐团巡查 <filter-search :keys="['searchType']" :moreKeys="['organId', 'start', 'end']" @reload="reloadItem"/>
+            <div class="squrt"></div>乐团巡查 <filter-search :keys="['searchType']" :moreKeys="['organId', 'start', 'end']" @reload="getList"/>
         </h2>
         <div class="m-core">
             <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">

src/views/teamDetail/componentCourse/teacherList.vue

@@ -126,6 +126,7 @@
                        v-permission="'courseSchedule/queryTeacherSalary'"
                        @click="setCourseInfo(scope.row)">课酬调整</el-button>
               <el-button
+              size="small"
                 type="text"
                 v-permission="'teacherAttendance/update?page=teamCourseList'"
                 @click="hand(scope.row)"

src/views/teamDetail/teamCourseList.vue

@@ -820,7 +820,7 @@ export default {
     },
     onCourseExport() {
       // 课表导出
-           if(this.getSearchForm()){
+        if(!this.getSearchForm()){
         return
       }
       let url = "/api-web/export/superFindCourseSchedules";
@@ -874,7 +874,7 @@ export default {
         .catch(() => {});
     },
     getList() {
-      if(this.getSearchForm()){
+      if(!this.getSearchForm()){
         return
       }
       superFindCourseSchedules(this.getSearchForm()).then((res) => {