页面修改

src/components/sale/activeOrder-form.vue

@@ -8,7 +8,8 @@
     padding: 5px 10px;
     align-items: center;
   }
-  .disableStatus{
+
+  .disableStatus {
     opacity: 0.3 !important;
     cursor: auto;
   }
@@ -33,9 +34,10 @@
           v-model="OrderMsg.LinkTel" class="col-12" ref="LinkTel" label="联系电话" :rules="[val => !!val || '请填写联系电话']" />
         <q-select standout="bg-primary text-white" v-model="OrderMsg.Sex" class="col-12  q-mb-lg" :options="sexList"
           :disable="isdisable" emit-value map-options label="性别" option-value="Id" option-label="name" />
-        <!-- <q-input filled stack-label maxlength="30" :dense="false"  type="number"
-          v-model="OrderMsg.PeopleNum"  class="col-12" :min="1" label="人数"
-          :rules="[val => !!val || '请填写人数']"  /> -->
+
+        <q-select standout="bg-primary text-white" v-model="OrderMsg.TeacherId" class="col-12  q-mb-lg"
+          :options="TeacherList" clearable emit-value map-options label="教师" option-value="TId"
+          option-label="TeacherName" />
 
         <q-input filled stack-label :dense="false" v-model="OrderMsg.Remark" style="margin-top: 20px" type="textarea"
           class="col-12 q-mb-lg" ref="Remark" label="备注" />
@@ -47,8 +49,9 @@
         </div>
         <div style="margin:30px 10px 70px 0;">
           <q-btn class="q-mr-md" label="取消" @click="closeEditOrder" />
-          <q-btn color="accent" class="q-mr-md" label="保存" v-if="saveObj.PaymentWay!==1&&saveObj.Status!==1"  @click="saveOrderInfo()" />
-          <q-btn color="accent disableStatus" class="q-mr-md"v-else label="保存"  />
+          <q-btn color="accent" class="q-mr-md" label="保存" v-if="saveObj.PaymentWay!==1&&saveObj.Status!==1"
+            @click="saveOrderInfo()" />
+          <q-btn color="accent disableStatus" class="q-mr-md" v-else label="保存" />
         </div>
       </div>
     </q-card>
@@ -59,6 +62,9 @@
   </q-dialog>
 </template>
 <script>
+  import {
+    getTeacherDropDownList
+  } from '../../api/school/index'
   export default {
     props: {
       saveObj: {
@@ -88,6 +94,7 @@
           PayWay: 0, //付款方式
           TenantId: 0, //商户id
           MallBaseId: 0, //小程序id
+          TeacherId: "", //教师编号
         },
         stuList: [], //学员列表
         loginId: -1, //登录人id
@@ -100,9 +107,13 @@
             name: "女"
           }
         ],
+        TeacherList: [], //教师列表
         isdisable: false,
       }
     },
+    created() {
+      this.getTeacherList();
+    },
     mounted() {
       let data = JSON.parse(localStorage.getItem("loginUserInfo")).data
       this.loginId = data.Id
@@ -123,13 +134,20 @@
         this.OrderMsg.LinkTel = this.saveObj.LinkTel
         this.OrderMsg.Remark = this.saveObj.Remark
       }
-
       this.getStu();
     },
     watch: {
 
     },
     methods: {
+      //获取教师列表
+      getTeacherList() {
+        getTeacherDropDownList({}).then(res => {
+          if (res.Code == 1) {
+            this.TeacherList = res.Data;
+          }
+        })
+      },
       //关闭弹窗
       closeEditOrder() {
         this.IsShowEditOrder = false;
@@ -167,11 +185,11 @@
         }, (res) => {
           if (res.data.resultCode === 1) {
             let data = res.data.data
-            this.stuList=data.map(item=>{
-              if(item.StuSex===0){
-                item.StuSex=1
-              }else if(item.StuSex===1){
-                item.StuSex=2
+            this.stuList = data.map(item => {
+              if (item.StuSex === 0) {
+                item.StuSex = 1
+              } else if (item.StuSex === 1) {
+                item.StuSex = 2
               }
               return item
             })
@@ -197,5 +215,4 @@
       }
     }
   }
-
-</script>
+</script>
\ No newline at end of file

src/components/sale/activeOrder-item.vue

@@ -67,6 +67,9 @@
               <div>{{ item.StartTime }}</div>
               <div>活动结束时间：</div>
               <div>{{ item.EndTime }}</div>
+              <div v-if="item.TeacherName" style="font-weight: bold; color: #2961fe;">
+                协助老师：{{ item.TeacherName }}
+              </div>
               <div v-if="item.IsCommission == 2" style="color: #f00; cursor: pointer; text-decoration: underline"
                 @click="gourlactive(item)">
                 提成金额:{{ item.CommissionPrice }}

src/pages/financial/market/empBonusDetail.vue

@@ -15,7 +15,13 @@
         <el-table-column prop="MonthNum" label="月份"> </el-table-column>
         <el-table-column prop="OpenBonus" label="开单奖金"> </el-table-column>
         <el-table-column prop="ClueNumSalary" label="线索奖励"> </el-table-column>
-        <el-table-column prop="CurGuestNum" width="110" label="当月订单人数"> </el-table-column>
+        <el-table-column width="110" label="当月订单人数">
+          <template slot-scope="scope">
+            <a title="点击跳转" style="cursor:pointer;color:blue;text-decoration:underline;"
+              @click="GoToOrderList(scope.row)">
+              {{scope.row.CurGuestNum}}</a>
+          </template>
+        </el-table-column>
         <el-table-column label="当月奖励金额" width="110">
           <template slot-scope="scope">
             <el-popover placement="left" width="420" trigger="click">
@@ -119,13 +125,23 @@
         this.msg.PeriodId = this.$route.query.Id;
         this.getList();
       }
-      if(this.$route.query.UserId){
+      if (this.$route.query.UserId) {
         this.msg.EmployeeId = this.$route.query.UserId
-        this.msg.YearNum = this.$route.query.Periods.slice(0,4)
-        this.msg.MonthNum = this.$route.query.Periods.slice(5,7)
+        this.msg.YearNum = this.$route.query.Periods.slice(0, 4)
+        this.msg.MonthNum = this.$route.query.Periods.slice(5, 7)
       }
     },
     methods: {
+      GoToOrderList(item) {
+        var lastDay = new Date(item.YearNum, item.MonthNum, 0).getDate()
+        var qObj = {
+          QStartTime: item.YearNum + "-" + item.MonthNum + "-01",
+          QEndTime: item.YearNum + "-" + item.MonthNum + "-" + lastDay,
+          EnterID: item.EmployeeId,
+        };
+    
+        this.OpenNewUrl('/sale/orderStatistics', qObj);
+      },
       //获取分页列表
       getList() {
         GetPersonnelPeriodDetails(this.msg).then(res => {

src/pages/sale/orderStatistics.vue

@@ -144,8 +144,8 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3"
-        ref="orderL" :loading="loading">
+      <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3" ref="orderL"
+        :loading="loading">
       </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"
@@ -270,6 +270,12 @@
       if (this.$route.query.EndTime) {
         this.msg.EndTime = this.$route.query.EndTime + "-01";
       }
+      if (this.$route.query.QStartTime) {
+        this.msg.StartTime = this.$route.query.QStartTime;
+      }
+      if (this.$route.query.QEndTime) {
+        this.msg.EndTime = this.$route.query.QEndTime;
+      }
       if (this.$route.query.EnterID) {
         this.msg.EnterID = Number(this.$route.query.EnterID);
       }
@@ -285,13 +291,13 @@
       this.getCourseList();
     },
     mounted() {
-      if(this.$route.query.UserId){
-        this.msg.EnterID = this.$route.query.UserId-0
-        let y = this.$route.query.Periods.slice(0,4)
-        let m = this.$route.query.Periods.slice(5,8)
-        let d = new Date(y,m,0).getDate()
+      if (this.$route.query.UserId) {
+        this.msg.EnterID = this.$route.query.UserId - 0
+        let y = this.$route.query.Periods.slice(0, 4)
+        let m = this.$route.query.Periods.slice(5, 8)
+        let d = new Date(y, m, 0).getDate()
         this.msg.StartTime = this.$route.query.Periods
-        this.msg.EndTime = y +'-' + m +'-'+ d     
+        this.msg.EndTime = y + '-' + m + '-' + d
       }
       this.getList();
       this.getEmployee(0);