Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/stuMan/eventsCalendar.vue

@@ -200,15 +200,29 @@
   }
   .eventsCalendar_box{
       
+  }
+  .eventsCalendar{
+    margin-bottom: 3px;
   }
   .hover_Suspended{
       position: relative;
-      padding: 0 3px;
+      padding: 0 8px;
+      border-radius: 10px;
+      font-size: 15px;
+      color: white;
+  }
+  .hover_Suspended.started{
+    background-color: #A5D6A7;
+  }
+  .hover_Suspended.progress{
+    background-color: #21BA45;
+  }
+  .hover_Suspended.over{
+    background-color: #1976D2;
   }
   .hover_Suspended:hover{
       color: #F8A535;
       background-color: #fff;
-      border-radius: 10px;
   }
   .hover_Suspended:hover .Suspended{
       display: block;
@@ -218,14 +232,15 @@
       bottom: 25px;
       left: 0;
       right: 0;
-      z-index: 2;
+      z-index: 95;
       display: none;
       padding: 10px;
       border-radius: 3px;
       background-color: #fff;
       box-shadow: 2px 5px 10px 0px rgba(36, 36, 36, 0.2);
+      font-size: 14px;
   }
-  .Suspended div{
+  .Suspended .Suspended-b{
         position: absolute;
         width: 0;
         height: 0;
@@ -241,10 +256,30 @@
         left: 20px;
   }
   .Suspended_text{
-      padding: 0;
+      padding:2px 0;
       margin: 0;
       color: #3f4254;
   }
+  .Suspended_text span{
+    width: 80px;
+    text-align: right;
+    margin-right: 5px;
+  }
+  .Suspended_text p{
+    color: #fff;
+    border-radius: 10px;
+    display: inline-block;
+    padding: 0 5px;
+  }
+  .Suspended_text p.started{
+    background-color: #A5D6A7;
+  }
+  .Suspended_text p.progress{
+    background-color: #21BA45;
+  }
+  .Suspended_text p.over{
+    background-color: #1976D2;
+  }
 </style>
 <template>
   <div>
@@ -263,16 +298,19 @@
                         <div class="eventsCalendar_box">
                             <div class="eventsCalendar" v-for="(items,indexs) in item.ActivityList" :key="indexs"
                             @click="eventName(items.ActivityName)">
-                                <div class="hover_Suspended">
+                                <div class="hover_Suspended" :class="items.ActivityStatus==1?'progress':(items.ActivityStatus==2?'over':'started')">
                                     {{items.ActivityName}}
                                     <div class="Suspended">
-                                        <div></div>
-                                        <p class="Suspended_text">标题: {{items.ActivityName}}</p>
-                                        <p class="Suspended_text">结束时间: {{items.StartTime}}~{{items.EndTime}}</p>
-                                        <p class="Suspended_text">活动类型: {{items.ActivityTypeName}}</p>
-                                        <p class="Suspended_text" v-show="!items.IsFree">价格: {{items.Price}}</p>
-                                        <p class="Suspended_text" v-show="items.LocationName">地址: {{items.LocationName}}</p>
-                                        <p class="Suspended_text">状态: {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'')}}</p>
+                                        <div class="Suspended-b"></div>
+                                        <div class="Suspended_text"><span>标题 :</span>{{items.ActivityName}}</div>
+                                        <div class="Suspended_text"><span>时间 :</span>{{items.StartTime}}~{{items.EndTime}}</div>
+                                        <div class="Suspended_text"><span>类型 :</span>{{items.ActivityTypeName}}</div>
+                                        <div class="Suspended_text"><span>价格 :</span>{{!items.IsFree?items.Price:'免费'}}</div>
+                                        <div class="Suspended_text" v-show="items.LocationName"><span>地址 :</span> {{items.LocationName}}</div>
+                                        <div class="Suspended_text"><span>状态 :</span> 
+                                          <p :class="items.ActivityStatus==1?'progress':(items.ActivityStatus==2?'over':'started')">
+                                          {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'未开始')}}</p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -46,7 +46,7 @@
         <q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px" />
       </div>
       <div class="col row wrap q-mr-lg q-col-gutter-md">
-        <div class="col-3">
+        <!-- <div class="col-3">
           <q-select
             filled
             stack-label
@@ -69,7 +69,7 @@
               </q-item>
             </template>
           </q-select>
-        </div>
+        </div> -->
         <div class="col-3">
           <q-select
             filled
@@ -102,6 +102,19 @@
             map-options
           ></q-select>
         </div>
+        <div class="col-3">
+        <q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input input-debounce="0"
+                    v-model="msg.UserId" :options="PersionList" label="销售" :dense="false"
+                    emit-value map-options @filter="filterFn2">
+                    <template v-slot:no-option>
+                    <q-item>
+                        <q-item-section class="text-grey">
+                        未找到相关数据
+                        </q-item-section>
+                    </q-item>
+                    </template>
+                </q-select>
+        </div>
         <div class="col-3">
           <q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" />
         </div>
@@ -238,6 +251,9 @@ import {
   getSellAchievementsUserDetailList,
   getSellAchievementsChangeLog
 } from '../../../api/finance/index'
+import {
+        queryEmployee
+} from '../../../api/users/user'
 import {
   getClassDropDownList,
 } from "../../../api/school/index";
@@ -271,6 +287,8 @@ export default {
       ClassList: [],
       allClassList: [],
       ChangeLog:'',
+      PersionList: [], //员工列表
+      AllemployeeList: [], //所有员工
     }
   },
   created() { },
@@ -286,6 +304,7 @@ export default {
     }
     this.getList()
     this.setClass()
+    this.getEmployee()
   },
   methods: {
 
@@ -369,7 +388,37 @@ export default {
         }
       })
     },
-
+    //获取员工列表
+    getEmployee() {
+        var qMsg = {
+            EmployeeName: ""
+        }
+        queryEmployee(qMsg).then(res => {
+            if (res.Code == 1) {
+                let obj = {
+                EmployeeName: '不限',
+                Id: 0
+                }
+                res.Data.unshift(obj)
+                var jsonData = res.Data;
+                if (jsonData && jsonData.length > 0) {
+                  this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));
+                  this.PersionList = JSON.parse(JSON.stringify(jsonData));;
+                }
+            }
+        })
+    },
+     //筛选员工
+    filterFn2(val, update) {
+        update(() => {
+        if (val === '') {
+            this.PersionList = JSON.parse(JSON.stringify(this.AllemployeeList))
+        } else {
+            const needle = val.toLowerCase()
+            this.PersionList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1)
+        }
+        })
+    },
     goUrl(path, id) {
       this.$router.push({
         path: '/financial/' + path,