页面修改

src/components/sale/orderlist.vue

@@ -103,7 +103,7 @@
                 </div>
               </div>
               <div class="order_OferTitle" v-if="item.TargetJoinType == 1">
-                <template v-if="item.JoinType == 3">
+                <template v-if="item.JoinType == 3 &&item.SourceOrderId>0">
                   原订单:{{ item.SourceOrderId }}
                 </template>
                 <template v-if="item.JoinType == 4">

src/pages/sale/orderStatistics.vue

 <template>
   <div class="page-body myOrder">
-    <div
-      style="width: 100%;display: flex;justify-content: space-between"
-      v-if="source != 1"
-    >
+    <div style="width: 100%;display: flex;justify-content: space-between" v-if="source != 1">
       <span style="font-size: 20px;font-weight: 400; ">报名统计</span>
       <div style="display: flex;align-items: center;">
         <span>
-          <q-toggle
-            v-model="msg.Q_NotCollect"
-            label="只看款未收齐订单"
-            class="q-mb-md"
-            false-value="0"
-            true-value="1"
-            @input="resetSearch"
-          />
+          <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
+            @input="resetSearch" />
         </span>
         <div class="page-option" style="margin-left: 10px;">
-          <q-btn
-            color="accent"
-            size="sm"
-            class="q-mr-md"
-            label="导出"
-            @click="goexport()"
-          />
+          <q-btn color="accent" size="sm" class="q-mr-md" label="导出" @click="goexport()" />
         </div>
       </div>
     </div>
@@ -33,128 +18,50 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input
-            @change="resetSearch"
-            clearable
-            dense
-            standout="bg-primary text-white"
-            v-model="msg.OrderId"
-            label="订单号"
-            @clear="resetSearch"
-            maxlength="10"
-          />
+          <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId"
+            label="订单号" @clear="resetSearch" maxlength="10" />
         </div>
         <div class="col-3">
-          <q-select
-            @input="resetSearch"
-            dense
-            standout="bg-primary text-white"
-            v-model="msg.CourseSubject"
-            :options="CourseSubjectList"
-            option-label="SubjectName"
-            option-value="Id"
-            emit-value
-            map-options
-            label="所属科目"
-            clearable
-          />
+          <q-select @input="resetSearch" dense standout="bg-primary text-white" v-model="msg.CourseSubject"
+            :options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
+            label="所属科目" clearable />
         </div>
         <div class="col-3">
-          <q-input
-            @change="resetSearch"
-            dense
-            clearable
-            standout="bg-primary text-white"
-            v-model="msg.GuestName"
-            label="学生名称"
-            @clear="resetSearch"
-            maxlength="20"
-          />
+          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.GuestName"
+            label="学生名称" @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input
-            @change="resetSearch"
-            dense
-            clearable
-            standout="bg-primary text-white"
-            v-model="msg.ClassName"
-            label="班级名称"
-            @clear="resetSearch"
-            maxlength="20"
-          />
+          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassName"
+            label="班级名称" @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input
-            @change="resetSearch"
-            dense
-            clearable
-            standout="bg-primary text-white"
-            v-model="msg.ClassNo"
-            label="班号"
-            @clear="resetSearch"
-            maxlength="20"
-          />
+          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassNo"
+            label="班号" @clear="resetSearch" maxlength="20" />
         </div>
         <template v-if="source != 1">
           <div class="col-3">
-            <q-select
-              @input="resetSearch"
-              dense
-              standout="bg-primary text-white"
-              option-value="CourseId"
-              option-label="CourseName"
-              v-model="msg.CouseId"
-              :options="CourseList"
-              emit-value
-              map-options
-              label="学习课程"
-            />
+            <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="CourseId"
+              option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程"
+              @filter="filterCourse" use-input />
           </div>
 
           <div class="col-3">
-            <q-select
-              dense
-              @input="
+            <q-select dense @input="
                 msg.OrderState == 0
                   ? (msg.Q_OrderState = 1)
                   : (msg.Q_OrderState = 0),
                   resetSearch()
-              "
-              standout="bg-primary text-white"
-              option-value="Id"
-              option-label="Name"
-              v-model="msg.OrderState"
-              :options="OrderStateList"
-              emit-value
-              map-options
-              label="订单状态"
-            />
+              " standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.OrderState"
+              :options="OrderStateList" emit-value map-options label="订单状态" />
           </div>
           <div class="col-3">
             <q-field filled dense>
               <template v-slot:control>
-                <el-date-picker
-                  v-model="msg.StartTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="报名开始时间"
-                  size="small"
-                  style="width:47%;"
-                  @change="resetSearch"
-                  clear-icon="iconfont icon-guanbi"
-                >
-                </el-date-picker
-                >至
-                <el-date-picker
-                  v-model="msg.EndTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="报名结束时间"
-                  size="small"
-                  style="width:47%;"
-                  @change="resetSearch"
-                  clear-icon="iconfont icon-guanbi"
-                >
+                <el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名开始时间"
+                  size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
+                </el-date-picker>至
+                <el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名结束时间"
+                  size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
                 </el-date-picker>
               </template>
             </q-field>
@@ -162,52 +69,22 @@
           <div class="col-3">
             <q-field filled dense>
               <template v-slot:control>
-                <el-date-picker
-                  v-model="dateList2"
-                  @change="resetSearch()"
-                  size="mini"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  style="border:none;"
-                  range-separator="至"
-                  start-placeholder="开班开始时间"
-                  end-placeholder="开班结束时间"
-                >
+                <el-date-picker v-model="dateList2" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd"
+                  type="daterange" style="border:none;" range-separator="至" start-placeholder="开班开始时间"
+                  end-placeholder="开班结束时间">
                 </el-date-picker>
               </template>
             </q-field>
           </div>
           <div class="col-3">
-            <q-select
-              @input="resetSearch"
-              dense
-              standout="bg-primary text-white"
-              option-value="Id"
-              option-label="EmployeeName"
-              v-model="msg.EnterID"
-              :options="EmployeeList"
-              emit-value
-              map-options
-              label="业务员"
-              use-input
-              @filter="filterFn2"
-            />
+            <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id"
+              option-label="EmployeeName" v-model="msg.EnterID" :options="EmployeeList" emit-value map-options
+              label="业务员" use-input @filter="filterFn2" />
           </div>
           <div class="col-3">
-            <q-select
-              @input="resetSearch"
-              dense
-              standout="bg-primary text-white"
-              option-value="Id"
-              option-label="EmployeeName"
-              v-model="msg.HelpEnterId"
-              :options="TeacherList"
-              emit-value
-              map-options
-              label="关联教师"
-              use-input
-              @filter="filterFn3"
-            />
+            <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="Id"
+              option-label="EmployeeName" v-model="msg.HelpEnterId" :options="TeacherList" emit-value map-options
+              label="关联教师" use-input @filter="filterFn3" />
           </div>
         </template>
       </div>
@@ -263,50 +140,39 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist
-        :dataList="data.List"
-        :authObj="authObj"
-        @success="refreshClassOrder"
-        :modityOrderType="3"
-        ref="orderL"
-      >
+      <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3"
+        ref="orderL">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
-        <q-pagination
-          v-model="msg.pageIndex"
-          :max="pageCount"
-          @input="changePage"
-          class="full-width justify-end"
-          color="primary"
-          :input="true"
-        >
+        <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
+          color="primary" :input="true">
         </q-pagination>
       </div>
     </div>
-    <classinfo-form
-      v-if="isShowClassInfo"
-      :seting-obj="classObjOption"
-      @close="closeClass"
-      @success="refreshClassOrder"
-    >
+    <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass"
+      @success="refreshClassOrder">
     </classinfo-form>
   </div>
 </template>
 <script>
-import {
+  import {
     getMyOrderStatisticsPageList, //获取订单列表
     getOrderStateEnumList //订单状态
-} from "../../api/sale/sale";
-import {
+  } from "../../api/sale/sale";
+  import {
     queryCourseDropdownList,
     getCourseSubject
-} from "../../api/course/index";
-import myOrderForm from "../../components/sale/myOrder-form";
-import classinfoForm from "../../components/course/classinfo-form";
-import orderlist from "../../components/sale/orderlist";
-import { queryEmployee } from "../../api/users/user";
-import { EduDownLoad } from "../../api/common/common";
-export default {
+  } from "../../api/course/index";
+  import myOrderForm from "../../components/sale/myOrder-form";
+  import classinfoForm from "../../components/course/classinfo-form";
+  import orderlist from "../../components/sale/orderlist";
+  import {
+    queryEmployee
+  } from "../../api/users/user";
+  import {
+    EduDownLoad
+  } from "../../api/common/common";
+  export default {
     meta: {
       title: "报名统计"
     },
@@ -328,7 +194,7 @@ export default {
           OrderId: "", //订单号
           GuestName: "", //客人名称
           ClassName: "", //班级名称
-        CouseId: "0", //课程id
+          CouseId: "", //课程id
           StartTime: "", //报名开始时间
           EndTime: "", //报名结束时间
           OPStartTime: "", //开班开始时间
@@ -596,68 +462,68 @@ export default {
         );
       }
     }
-};
+  };
 </script>
 <style>
-li {
+  li {
     list-style-type: none;
-}
+  }
 
-.myOrder ul {
+  .myOrder ul {
     padding: 0px;
-}
+  }
 
-.myOrder .price-popup {
+  .myOrder .price-popup {
     border-radius: 4px;
-}
+  }
 
-.myOrder .el-range-editor .el-range-input {
+  .myOrder .el-range-editor .el-range-input {
     background: transparent;
-}
+  }
 
-.myOrder .el-range-editor.el-input__inner {
+  .myOrder .el-range-editor.el-input__inner {
     background-color: transparent;
-}
+  }
 
-.myOrder .q-mb-md {
+  .myOrder .q-mb-md {
     margin-bottom: 0;
-}
+  }
 
-.myOrder .stics {
+  .myOrder .stics {
     padding: 10px 20px;
     background: #dddee0;
     border-radius: 4px;
     font-size: 14px;
     color: #000000;
     font-weight: bold;
-}
+  }
 
-.myOrder .stics .stics-name {
+  .myOrder .stics .stics-name {
     color: #2d2d2d;
     font-weight: 600;
     margin-right: 10px;
-}
+  }
 
-.myOrder .tis {
+  .myOrder .tis {
     margin: 10px 0;
     align-items: center;
-}
+  }
 
-.myOrder .tis .tis-k {
+  .myOrder .tis .tis-k {
     width: 10px;
     height: 10px;
     margin-right: 8px;
-}
+  }
 
-.myOrder .tis span {
+  .myOrder .tis span {
     font-size: 14px;
     color: #2d2d2d;
     font-weight: 600;
     margin-right: 20px;
-}
+  }
 
-.myOrder .el-input__inner {
+  .myOrder .el-input__inner {
     border: none !important;
     background: transparent !important;
-}
+  }
 </style>
\ No newline at end of file