页面修改

src/components/sale/orderlist.vue

@@ -63,7 +63,8 @@
               <div>
                 <span @click="goOrderdetails(item,1)" class="order_OfferId">{{item.OrderId}}</span>
                 <q-badge v-if="item.JoinType==3" color="red" label="续费订单" style="margin-left:5px;" class="q-mr-xs" />
-                <q-badge v-if="item.OrderType==2 && item.LXConfirmState==1" color="primary" label="已确认" style="margin-left:5px;" class="q-mr-xs" />
+                <q-badge v-if="item.OrderType==2 && item.LXConfirmState==1" color="primary" label="已确认"
+                  style="margin-left:5px;" class="q-mr-xs" />
 
                 <q-badge v-if="item.TargetJoinType==3" color="green" label="已续费" style="margin-left:5px;"
                   class="q-mr-xs" />
@@ -132,6 +133,7 @@
               </template>
               <template v-if="item.OrderType==1">
                 <div v-if="item.CourseName">课程名称:{{item.CourseName}}</div>
+                <div v-if="item.CourseSubjectName">所属科目:{{item.CourseSubjectName}}</div>
                 <div v-if="item.JoinType==2" style="color:red;cursor:pointer">
                   插班报入
                     <q-tooltip :offset="[10, 10]">
@@ -335,8 +337,7 @@
                     </q-item>
                   </div>
                   <div v-if="item.OrderType==2 && item.LXConfirmState!=1 && AuthorityObj.isshoworderconfirm == true">
-                    <q-item clickable v-close-popup disabled
-                      v-if="(item.DueInMoney&&item.DueInMoney!=0 ) ">
+                    <q-item clickable v-close-popup disabled v-if="(item.DueInMoney&&item.DueInMoney!=0 ) ">
                       <q-item-section>
                         <q-item-label>
                           订单确认
@@ -961,14 +962,8 @@
             <img :src="item" style="" />
           </el-carousel-item>
         </el-carousel> -->
-        <el-image
-          style="width: 100%; height: 100%"
-          fit="cover"
-          v-for="(item, index) in imgViewList"
-          :key="index"
-          :src="item"
-          :preview-src-list="imgViewList"
-        >
+        <el-image style="width: 100%; height: 100%" fit="cover" v-for="(item, index) in imgViewList" :key="index"
+          :src="item" :preview-src-list="imgViewList">
         </el-image>
       </div>
     </div>
@@ -994,7 +989,7 @@
     setOrderHelpEnterId, //老师关联
     cancelClassOrder, //取消订单
     regressSourceClass, //拆分订单回到原班
-    setStudyAboradOrderConfirm,//留学订单确认
+    setStudyAboradOrderConfirm, //留学订单确认
   } from '../../api/sale/sale'
 
   import {
@@ -1096,7 +1091,7 @@
           isShowEdit: true, //是否显示修改订单按钮
           isShowTransClassOrder: false, //是否显示转班按钮
           isShowSeparater: false, //是否显示分拆
-          isshoworderconfirm:false,//留学的订单确认按钮
+          isshoworderconfirm: false, //留学的订单确认按钮
         },
 
         isShowEduForm: false, //是否显示新增修改合同弹窗
@@ -1165,7 +1160,7 @@
     methods: {
       //点击合同编号预览
       getShowContract(item) {
-        this.isShowPop=false;
+        this.isShowPop = false;
         if (item.ContractUrlList.length > 0) {
           //预览图片
           if (item.ContractType == 2) {
@@ -1173,7 +1168,7 @@
             this.imgViewUrl = item.ContractUrlList[0];
             this.imgViewList = item.ContractUrlList;
           }
-          if(item.ContractType==1){
+          if (item.ContractType == 1) {
             this.previewPDF(item.ContractUrlList[0]);
           }
         }
@@ -1557,7 +1552,7 @@
           }
         });
       },
-      chanceType_lx(obj){//留学的时 成本制单
+      chanceType_lx(obj) { //留学的时 成本制单
         let TCIDARR = []
         if (obj && obj.OrderType == 2) {
           //留学就业订单
@@ -1572,8 +1567,8 @@
           SourceID: 0,
           TCIDList: TCIDARR
         }
-        orderObj.OtherType = 45;//成本单据
-        if(obj.OfferId>0){
+        orderObj.OtherType = 45; //成本单据
+        if (obj.OfferId > 0) {
           orderObj.ReFinanceId = obj.OfferId;
 
         }
@@ -1669,11 +1664,11 @@
         });
       },
       gourltx(obj) {
-        if(obj.OrderType == 1){
+        if (obj.OrderType == 1) {
           this.OpenNewUrl("/financial/cycleOrderList", {
             OrderId: obj.OrderId
           });
-        }else{
+        } else {
           this.OpenNewUrl("/financial/studyabroad/ordercommission", {
             OrderId: obj.OrderId
           });
@@ -1741,7 +1736,7 @@
           }
         })
       },
-      studyabroadorderconfirmation(item){//留学订单确认
+      studyabroadorderconfirmation(item) { //留学订单确认
         console.log(item)
         let that = this
         this.$q.dialog({

src/pages/sale/japaneseTrain.vue

@@ -6,13 +6,18 @@
           <q-select @input="resetSearch" standout="bg-primary text-white" option-value="SId" option-label="SName"
             v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" clearable />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
+            :options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
+            clearable />
+        </div>
         <div class="col-3">
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号"
-            @clear="resetSearch" maxlength="20" clearable />
+            @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ClassName" label="班级名称"
-            @clear="resetSearch" maxlength="20" clearable />
+            @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" standout="bg-primary text-white" option-value="TId" option-label="TeacherName"
@@ -112,6 +117,7 @@
                 </div>
               </div>
               <div class="d2">
+                <div><span class="d2-n">所属科目</span>{{item.CourseSubjectName}}</div>
                 <div class="row" style="align-items: center ;margin:0;padding:0;">
                   <span class="d2-n">带课老师</span>
                   <template v-if="item.Teacher_Id==0">
@@ -317,6 +323,7 @@
   } from '../../api/school/index';
   import {
     queryCourseDropdownList,
+    getCourseSubject
   } from '../../api/course/index'
   import editorderForm from '../../components/sale/editorder-form' //修改订单
 
@@ -346,6 +353,7 @@
           JoinStartTime: '', //报名截止日期开始
           JoinEndTime: "", //报名截止日期结束
           ClassNo: '', //班号
+          CourseSubject: "", //所属科目
         },
         //关联校区列表
         schoolList: [],
@@ -361,10 +369,12 @@
           CourseId: 0,
         },
         isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
+        CourseSubjectList: [], //科目列表
       }
     },
     created() {
       this.getSchool();
+      this.queryCourseSubject();
       this.CourseList();
       this.GetTeacherList();
       if (this.$route.query && this.$route.query.ClassName) {
@@ -384,6 +394,13 @@
       this.getList();
     },
     methods: {
+      queryCourseSubject() {
+        getCourseSubject({}).then(res => {
+          if (res.Code == 1) {
+            this.CourseSubjectList = res.Data;
+          }
+        })
+      },
       //关闭订单修改
       closeOrderSaveForm() {
         this.isShowEditOrderForm = false;

src/pages/sale/myOrder.vue

@@ -12,6 +12,11 @@
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.OrderId" label="订单号"
             @clear="resetSearch" maxlength="10" />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
+            :options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
+            clearable />
+        </div>
         <div class="col-3">
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.GuestName" label="客户名称"
             @clear="resetSearch" maxlength="20" />
@@ -25,8 +30,9 @@
             option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
         </div>
         <div class="col-3">
-          <q-select @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="订单状态" />
+          <q-select @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="订单状态" />
         </div>
         <div class="col-3">
           <q-field filled>
@@ -97,7 +103,8 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List"  :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1" ref="orderL">
+      <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
+        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"
@@ -117,6 +124,7 @@
   } 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';
@@ -153,6 +161,7 @@
           Q_OrderState: 1, //查询 1正常订单 2取消订单 (默认传1 如果 选择了订单状态 则传 0)
           Q_OrderBy: 2, //写死 =2
           PlatformTax: 0, //平台税金
+          CourseSubject: "", //所属科目
         },
         //订单状态
         OrderStateList: [],
@@ -169,15 +178,17 @@
           isShowSaleRemark: true, //显示修改销售备注
           isShowBackClass: true, //显示退课按钮
           isShowRenewClass: true, //显示续课按钮
-          isShowTransClassOrder:true,//现在转班按钮
+          isShowTransClassOrder: true, //现在转班按钮
           isShowSeparater: true //显示分拆按钮
-        }
+        },
+        CourseSubjectList: [], //科目列表
       }
     },
     created() {
       if (this.$route.query.OrderId) {
         this.msg.OrderId = this.$route.query.OrderId;
       }
+      this.queryCourseSubject();
       this.getOrderState();
       this.getCourseList();
     },
@@ -185,6 +196,13 @@
       this.getList();
     },
     methods: {
+      queryCourseSubject() {
+        getCourseSubject({}).then(res => {
+          if (res.Code == 1) {
+            this.CourseSubjectList = res.Data;
+          }
+        })
+      },
       //订单状态
       getOrderState() {
         getOrderStateEnumList({}).then(res => {

src/pages/sale/orderStatistics.vue

@@ -2,7 +2,6 @@
   <div class="page-body myOrder">
     <div style="width: 100%;display: flex;justify-content: space-between">
       <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"
@@ -12,7 +11,6 @@
           <q-btn color="accent" size="sm" class="q-mr-md" label="导出" @click="goexport()" />
         </div>
       </div>
-        
     </div>
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
@@ -20,6 +18,11 @@
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.OrderId" label="订单号"
             @clear="resetSearch" maxlength="10" />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
+            :options="CourseSubjectList" option-label="Name" option-value="Id" emit-value map-options label="所属科目"
+            clearable />
+        </div>
         <div class="col-3">
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.GuestName" label="学生名称"
             @clear="resetSearch" maxlength="20" />
@@ -37,8 +40,9 @@
             option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
         </div>
         <div class="col-3">
-          <q-select @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="订单状态" />
+          <q-select @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="订单状态" />
         </div>
         <div class="col-3">
           <q-field filled>
@@ -65,12 +69,14 @@
           </q-field>
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" 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" 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" 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" 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>
       </div>
     </div>
@@ -123,7 +129,8 @@
       </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"
@@ -143,11 +150,14 @@
   } 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 {
+    queryEmployee
+  } from '../../api/users/user';
   import {
     EduDownLoad,
   } from '../../api/common/common';
@@ -183,10 +193,10 @@
           Q_OrderState: 1, //查询 1正常订单 2取消订单 (默认传1 如果 选择了订单状态 则传 0)
           Q_OrderBy: 2, //写死 =2
           PlatformTax: 0, //平台税金
-          EnterID:'',//业务员id
-          ClassNo:'',//班号
-          HelpEnterId:'',//关联教师
-
+          EnterID: '', //业务员id
+          ClassNo: '', //班号
+          HelpEnterId: '', //关联教师
+          CourseSubject: "", //所属科目
         },
         //订单状态
         OrderStateList: [],
@@ -203,14 +213,15 @@
           isShowSaleRemark: false, //显示修改销售备注
           isShowBackClass: false, //显示退课按钮
           isShowRenewClass: false, //显示续课按钮
-          isShowEdit:false,//不显示修改按钮
-          isShowBackClass:false,//不显示退课
-          isShowRenewClass:false,//不显示续课
+          isShowEdit: false, //不显示修改按钮
+          isShowBackClass: false, //不显示退课
+          isShowRenewClass: false, //不显示续课
         },
-        EmployeeList:[],//业务员
-        AllemployeeList:[],
-        TeacherList:[],//关联教师
-        AllTeacherList:[],
+        EmployeeList: [], //业务员
+        AllemployeeList: [],
+        TeacherList: [], //关联教师
+        AllTeacherList: [],
+        CourseSubjectList: [], //科目列表
       }
     },
     created() {
@@ -225,17 +236,18 @@
       var currentDay = year + '-' + month + '-' + day;
       this.msg.StartTime = currentDay
       if (this.$route.query.StartTime) {
-        this.msg.StartTime = this.$route.query.StartTime+'-01';
+        this.msg.StartTime = this.$route.query.StartTime + '-01';
       }
       if (this.$route.query.EndTime) {
-        this.msg.EndTime = this.$route.query.EndTime+'-01';
+        this.msg.EndTime = this.$route.query.EndTime + '-01';
       }
       if (this.$route.query.EnterID) {
-        this.msg.EnterID = Number(this.$route.query.EnterID) ;
+        this.msg.EnterID = Number(this.$route.query.EnterID);
       }
       if (this.$route.query.ClassName) {
-        this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
+        this.msg.ClassName = decodeURI(this.$route.query.ClassName);
       }
+      this.queryCourseSubject();
       this.getOrderState();
       this.getCourseList();
     },
@@ -243,9 +255,15 @@
       this.getList();
       this.getEmployee(0);
       this.getglteacher()
-
     },
     methods: {
+      queryCourseSubject() {
+        getCourseSubject({}).then(res => {
+          if (res.Code == 1) {
+            this.CourseSubjectList = res.Data;
+          }
+        })
+      },
       //订单状态
       getOrderState() {
         getOrderStateEnumList({}).then(res => {
@@ -340,16 +358,16 @@
       closeClass() {
         this.isShowClassInfo = false;
       },
-      getglteacher(){
+      getglteacher() {
         var qMsg = {
-            AccountTypeStr:2
+          AccountTypeStr: 2
         }
         queryEmployee(qMsg).then(res => {
           if (res.Code == 1) {
             this.TeacherList = res.Data;
-                    let obj={
-                        Id:"",
-                        EmployeeName:"不限"
+            let obj = {
+              Id: "",
+              EmployeeName: "不限"
             }
             this.TeacherList.unshift(obj)
             this.AllTeacherList = JSON.parse(JSON.stringify(this.TeacherList));
@@ -372,13 +390,13 @@
         var qMsg = {
           Dept_Id: 0
         }
-        qMsg.Dept_Id=id;
+        qMsg.Dept_Id = id;
         queryEmployee(qMsg).then(res => {
-          if(res.Code==1){
+          if (res.Code == 1) {
             this.EmployeeList = res.Data;
-            let obj={
-                Id:"",
-                EmployeeName:"不限"
+            let obj = {
+              Id: "",
+              EmployeeName: "不限"
             }
             this.EmployeeList.unshift(obj)
             this.AllemployeeList = JSON.parse(JSON.stringify(this.EmployeeList));
@@ -398,7 +416,7 @@
           }
         })
       },
-        goexport(){//导出
+      goexport() { //导出
         var msg = JSON.parse(JSON.stringify(this.msg));
         EduDownLoad("/order/GetOrderPageListStatisticsToExcel", msg, "订单列表.xls")
       }
@@ -463,6 +481,7 @@
     font-weight: 600;
     margin-right: 20px
   }
+
   .myOrder .el-input__inner {
     border: none !important;
     background: transparent !important;