lex-xin 4 سال پیش
والد
کامیت
eefea8fa3c

+ 1 - 1
src/views/businessManager/orderManager/businessStatement.vue

@@ -374,7 +374,7 @@ export default {
       this.searchForm = {
         startTime: null,
         endTime: null,
-        month: "",
+        month: dayjs().format("YYYY-MM"),
         cooperationOrganId: "",
         organIdList: [],
       };

+ 1 - 1
src/views/businessManager/orderManager/financeManager.vue

@@ -44,7 +44,7 @@
       </div>
       <el-upload
         v-permission="'import/routeOrder'"
-        style="display: inline-block; margin: 0 10px"
+        style="display: inline-block;"
         action="/api-web/import/routeOrder"
         :show-file-list="false"
         :before-upload="beforeUpload"

+ 15 - 11
src/views/businessManager/orderManager/income.vue

@@ -373,6 +373,18 @@ export default {
   },
   created(){
     if (this.searchForm.orderDate?.length < 1) {
+      this.getNow()
+    }
+  },
+  mounted() {
+
+
+
+    this.$store.dispatch("setBranchs");
+    this.getList();
+  },
+  methods: {
+    getNow() {
       var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -388,16 +400,7 @@ export default {
       this.searchForm.orderDate = [];
       this.searchForm.orderDate.push(startDate);
       this.searchForm.orderDate.push(endDate);
-    }
-  },
-  mounted() {
-
-
-
-    this.$store.dispatch("setBranchs");
-    this.getList();
-  },
-  methods: {
+    },
     onClear(type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
@@ -561,7 +564,7 @@ export default {
         search: null,
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: null,
+        paymentStatus: 'SUCCESS',
         paymentType: null,
         organId: null,
         actualAmount: null,
@@ -573,6 +576,7 @@ export default {
         lessActualAmount: null,
         orderDate:[]
       };
+      this.getNow()
       this.getList();
     },
   },

+ 9 - 5
src/views/businessManager/orderManager/incomeOut.vue

@@ -231,6 +231,13 @@ export default {
     //   }
     // });
     if (this.searchForm.orderDate?.length < 1) {
+      this.getNow()
+    }
+
+    this.getList();
+  },
+  methods: {
+    getNow() {
       var now = new Date();
 
       var startDate = new Date(
@@ -247,11 +254,7 @@ export default {
       this.searchForm.orderDate = [];
       this.searchForm.orderDate.push(startDate);
       this.searchForm.orderDate.push(endDate);
-    }
-
-    this.getList();
-  },
-  methods: {
+    },
     onClear(type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
@@ -378,6 +381,7 @@ export default {
         status: "SUCCESS",
         orderDate: [],
       };
+      this.getNow()
       this.getList();
     },
   },

+ 1 - 1
src/views/businessManager/orderManager/salesList.vue

@@ -516,7 +516,7 @@ export default {
         search: "",
         goodsName: [],
         cooperationOrganId: "",
-        orderDate:[]
+        orderDate:[dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")]
       };
       this.getList();
     },

+ 3 - 3
src/views/vipClass/vipList.vue

@@ -5,14 +5,14 @@
       VIP/乐理课列表
     </h2>
     <div class="newBand" v-permission="'/buildVip'" @click="gotoBuildVip">
-      新建VIP/乐理课
+      新建
     </div>
     <div
       class="newBand"
       v-permission="'export/vipGroupList'"
       @click="onVIPCourseExport"
     >
-      导出VIP/乐理课
+      导出列表
     </div>
     <div
       class="newBand"
@@ -20,7 +20,7 @@
       @click="onStudentExport"
       style="max-width: inherit"
     >
-      VIP/乐理课课程续费提醒导出
+      课程续费提醒导出
     </div>
     <div class="m-core">
       <!-- 搜索类型 -->

+ 1 - 1
src/views/vipClass/vipReset.vue

@@ -115,7 +115,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="rules.total"
+      <pagination sync :total.sync="rules.total"
                   :page.sync="rules.page"
                   :limit.sync="rules.limit"
                   :page-sizes="rules.page_size"