Explorar o código

08/19 11:20

11
mo %!s(int64=4) %!d(string=hai) anos
pai
achega
bbba0b97c9

+ 1 - 1
src/views/accompanyManager/accompanys.vue

@@ -845,7 +845,7 @@ export default {
        */
 
       this.maskForm.date = row.classDate;
-      this.startTime = row.startClassTimeStr;
+      this.startTime = row.startClassTimeStr.substring(0, 5);
       // this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
       this.coursesExpireDate = row.coursesExpireDate;

+ 24 - 21
src/views/levelManager/levelManager.vue

@@ -17,11 +17,11 @@
           <el-input v-model.trim="searchForm.transNo"
                     placeholder="请输入交易流水号"></el-input>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model.trim="searchForm.city"
                     @keyup.enter.native="city"
                     placeholder="请输入城市名"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-select v-model.trim="searchForm.organId"
                      filterable
@@ -170,6 +170,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import axios from "axios";
+import cleandeep from 'clean-deep'
 // import store from '@/store'
 import { degreeQueryPage } from "./levelManageApi";
 import { getToken } from "@/utils/auth";
@@ -247,17 +248,18 @@ export default {
     },
     getList () {
       let searchForm = this.searchForm;
-      let params = {
-        orderNo: searchForm.orderNo ? searchForm.orderNo : null,
-        transNo: searchForm.transNo ? searchForm.transNo : null,
-        city: searchForm.city ? searchForm.city : null,
-        status: searchForm.status ? searchForm.status : null,
-        startTime: searchForm.startTime ? searchForm.startTime : null,
-        endTime: searchForm.endTime ? searchForm.endTime : null,
-        organId: searchForm.organId ? searchForm.organId : null,
-        page: this.pageInfo.page,
-        rows: this.pageInfo.limit,
-      };
+      let params = cleandeep(searchForm)
+      // {
+      //   orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+      //   transNo: searchForm.transNo ? searchForm.transNo : null,
+      //   city: searchForm.city ? searchForm.city : null,
+      //   status: searchForm.status ? searchForm.status : null,
+      //   startTime: searchForm.startTime ? searchForm.startTime : null,
+      //   endTime: searchForm.endTime ? searchForm.endTime : null,
+      //   organId: searchForm.organId ? searchForm.organId : null,
+      //   page: this.pageInfo.page,
+      //   rows: this.pageInfo.limit,
+      // };
       degreeQueryPage(params).then((res) => {
         let result = res.data;
         if (res.code == 200) {
@@ -281,14 +283,15 @@ export default {
     onExport () {
       let url = "/api-web/export/degreeRegistration";
       let searchForm = this.searchForm;
-      let params = {
-        orderNo: searchForm.orderNo ? searchForm.orderNo : null,
-        transNo: searchForm.transNo ? searchForm.transNo : null,
-        city: searchForm.city ? searchForm.city : null,
-        status: searchForm.status ? searchForm.status : null,
-        startTime: searchForm.startTime ? searchForm.startTime : null,
-        endTime: searchForm.endTime ? searchForm.endTime : null,
-      };
+      let params = cleandeep(searchForm)
+      // {
+      //   orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+      //   transNo: searchForm.transNo ? searchForm.transNo : null,
+      //   city: searchForm.city ? searchForm.city : null,
+      //   status: searchForm.status ? searchForm.status : null,
+      //   startTime: searchForm.startTime ? searchForm.startTime : null,
+      //   endTime: searchForm.endTime ? searchForm.endTime : null,
+      // };
       const options = {
         method: "get",
         headers: {