mo 4 年之前
父节点
当前提交
dfb429bf02

+ 2 - 2
src/views/afterSchoolManager/afterSchoolList.vue

@@ -41,8 +41,8 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="分配开始日期"
+                          end-placeholder="分配结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>

+ 11 - 3
src/views/businessManager/orderManager/backMoney.vue

@@ -27,8 +27,8 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="申请开始日期"
+                          end-placeholder="申请结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }">
@@ -199,13 +199,14 @@ export default {
         this.organList = res.data;
       }
     })
-    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)
+    this.getList()
   },
   methods: {
     search () {
@@ -234,6 +235,13 @@ export default {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
+      if (this.orderDate?.length > 0) {
+        params.startTime = this.orderDate[0]
+        params.endTime = this.orderDate[1]
+      } else {
+        params.startTime = null
+        params.endTime = null
+      }
       studentRefundsQueryPage(params).then(res => {
         let result = res.data
         if (res.code == 200) {

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

@@ -37,7 +37,7 @@
         <el-form-item>
           <el-date-picker v-model="searchForm.month"
                           type="month"
-                          placeholder="选择月份">
+                          placeholder="选择经营月份">
           </el-date-picker>
         </el-form-item>
         <!-- <el-form-item>

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

@@ -84,8 +84,8 @@
         firstDayOfWeek: 1
     }"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          start-placeholder="订单开始日期"
+                          end-placeholder="订单结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-select v-model.trim="searchForm.paymentType"

+ 2 - 2
src/views/businessManager/orderManager/income.vue

@@ -78,8 +78,8 @@
                           :picker-options="{
         firstDayOfWeek: 1
     }"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          start-placeholder="订单开始日期"
+                          end-placeholder="订单结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-select v-model.trim="searchForm.paymentType"

+ 2 - 2
src/views/businessManager/orderManager/incomeOut.vue

@@ -54,11 +54,11 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
-                          start-placeholder="开始日期"
+                          start-placeholder="订单开始日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"
-                          end-placeholder="结束日期"></el-date-picker>
+                          end-placeholder="订单结束日期"></el-date-picker>
         </el-form-item>
         <!-- <el-form-item>
           <el-select

+ 2 - 2
src/views/businessManager/orderManager/payRecord.vue

@@ -71,8 +71,8 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="付款开始日期"
+                          end-placeholder="付款结束日期"
                           :picker-options="{ firstDayOfWeek: 1 }">
           </el-date-picker>
         </el-form-item>

+ 24 - 32
src/views/businessManager/orderManager/salesList.vue

@@ -54,8 +54,8 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="销售开始日期"
+                          end-placeholder="销售结束日期"
                           :picker-options="{ firstDayOfWeek: 1 }">
           </el-date-picker>
         </el-form-item>
@@ -182,27 +182,19 @@
                     :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
-      <el-dialog
-        title="退费"
-        width="400px"
-        :visible.sync="refundVisible"
-        @close="refundVisible = false"
-      >
-        <el-form
-          :model="refundForm"
-          :rules="refundRules"
-          ref="refundform"
-        >
-          <el-form-item
-            label="退费金额"
-            prop="money"
-            label-width="100px"
-          >
-            <el-input
-              v-model="refundForm.money"
-              type="number"
-              placeholder="请输入退费金额"
-            />
+      <el-dialog title="退费"
+                 width="400px"
+                 :visible.sync="refundVisible"
+                 @close="refundVisible = false">
+        <el-form :model="refundForm"
+                 :rules="refundRules"
+                 ref="refundform">
+          <el-form-item label="退费金额"
+                        prop="money"
+                        label-width="100px">
+            <el-input v-model="refundForm.money"
+                      type="number"
+                      placeholder="请输入退费金额" />
           </el-form-item>
         </el-form>
         <span slot="footer"
@@ -437,7 +429,7 @@ export default {
     onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].clearValidate()
     },
-    refund(data) {
+    refund (data) {
       refundSellOrder(data)
         .then(res => {
           this.getList()
@@ -450,21 +442,21 @@ export default {
               cancelButtonText: '取消',
               type: 'warning'
             })
-            .then(() => {
-              this.refund({
-                ...data,
-                reTry: true
+              .then(() => {
+                this.refund({
+                  ...data,
+                  reTry: true
+                })
               })
-            })
           }
         })
     },
-    openRefund(row) {
+    openRefund (row) {
       this.refundVisible = true
       this.detail = row
     },
-    submitRefund() {
-      console.log({...this.refundForm})
+    submitRefund () {
+      console.log({ ...this.refundForm })
     },
     onBackMoney (row) { // 退费
       this.backStatus = true

+ 2 - 2
src/views/businessManager/resetList/index.vue

@@ -53,8 +53,8 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="销售开始日期"
+                          end-placeholder="销售结束日期"
                           :picker-options="{ firstDayOfWeek: 1 }">
           </el-date-picker>
         </el-form-item>

+ 2 - 2
src/views/levelManager/levelManager.vue

@@ -56,8 +56,8 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="报名开始日期"
+                          end-placeholder="报名结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>

+ 4 - 4
src/views/operateManager/serverIndexList.vue

@@ -111,8 +111,8 @@
     }"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="周次开始日期"
+                          end-placeholder="周次结束日期"
                           @change="getWeekTime"></el-date-picker>
         </el-form-item>
         <el-form-item label="作业提交时间">
@@ -124,8 +124,8 @@
     }"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          start-placeholder="提交开始日期"
+                          end-placeholder="提交结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="danger"

+ 2 - 2
src/views/recodeManager/recodeList.vue

@@ -66,11 +66,11 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
+                          start-placeholder="考勤开始日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"
-                          end-placeholder="结束日期">
+                          end-placeholder="考勤结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item>

+ 2 - 2
src/views/returnVisitManager/returnVisitList.vue

@@ -49,8 +49,8 @@
                           value-format="yyyy-MM-dd"
                           @change="changeTimer"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="回访开始日期"
+                          end-placeholder="回访结束日期"
                           :picker-options="{
                             firstDayOfWeek: 1
                           }">

+ 2 - 2
src/views/settlementManager/settlementList.vue

@@ -52,8 +52,8 @@
         firstDayOfWeek: 1
     }"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          start-placeholder="结转开始日期"
+                          end-placeholder="结转结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="danger"

+ 2 - 2
src/views/teamDetail/components/courseList.vue

@@ -71,8 +71,8 @@
                         type="daterange"
                         value-format="yyyy-MM-dd"
                         range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
+                        start-placeholder="课程开始日期"
+                        end-placeholder="课程结束日期"
                         :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>

+ 2 - 2
src/views/workBenchManager/payAppeal.vue

@@ -44,8 +44,8 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="课程开始日期"
+                          end-placeholder="课程结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>