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

src/components/sale/orderlist.vue

@@ -124,41 +124,66 @@
               <template v-if="item.Unit_Price>=0">
                 {{item.Unit_Price.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.Unit_Price.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="border:none">
               <template v-if="item.PreferPrice>=0">
                 {{item.PreferPrice.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.PreferPrice.toFixed(2)}}</span>
+              </template>
+              
             </td>
             <td style="border:none">
               <template v-if="item.Income>=0">
                 {{item.Income.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.Income.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="color:var(--q-color-negative);border:none">
               <template v-if="item.DiscountMoney>=0">
                 {{item.DiscountMoney.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.DiscountMoney.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="border:none">
               <template v-if="item.LessPrice>=0">
                 {{item.LessPrice.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.LessPrice.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="border:none">
               <template v-if="item.Refund>=0">
                 {{item.Refund.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.Refund.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="border:none">
               <template v-if="item.PlatformTax>=0">
                 {{item.PlatformTax.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.PlatformTax.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="color:#2961FE;border:none">
               <template v-if="item.DueInMoney>=0">
                 {{item.DueInMoney.toFixed(2)}}
               </template>
+              <template v-else >
+                <span class="redstyle">{{item.DueInMoney.toFixed(2)}}</span>
+              </template>
             </td>
             <td style="border:none">
               <div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
@@ -1547,5 +1572,8 @@
     overflow-x: hidden;
     overflow-y: auto;
   }
+  .classorder .redstyle{
+    color:var(--q-color-negative);
+  }
 
 </style>

src/pages/course/makeup.vue

@@ -56,6 +56,11 @@
             <span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-ClassDate="props">
+          <q-td auto-width :props="props">
+            {{props.row.ClassDate}} {{props.row.StartTime}}-{{props.row.EndTime}}
+          </q-td>
+        </template>
         <!--处理状态-->
         <template v-slot:body-cell-MakeUpStatusStr="props">
           <q-td>
@@ -188,6 +193,7 @@
           }
         ],
         statusMsg: {
+          Id: 0,
           MakeUpStatus: 2,
           ClassCheckId: 0,
           GuestId: 0,
@@ -232,8 +238,10 @@
       getClickItem(item) {
         this.statusMsg.ClassCheckId = item.ClassCheckId;
         this.statusMsg.GuestId = item.OrderGuestId;
+        this.statusMsg.Id = item.Id;
       },
       clearMsg() {
+        this.statusMsg.Id = 0;
         this.statusMsg.MakeUpStatus = 2;
         this.statusMsg.ClassCheckId = 0;
         this.statusMsg.GuestId = 0;

src/pages/sale/orderStatistics.vue

@@ -54,7 +54,7 @@
         </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="业务员" />
+            option-label="EmployeeName" v-model="msg.EnterID"  :options="EmployeeList" emit-value map-options label="业务员" use-input  @filter="filterFn2"/>
         </div>
       </div>
     </div>
@@ -186,6 +186,7 @@
           isShowRenewClass:false,//不显示续课
         },
         EmployeeList:[],//业务员
+        AllemployeeList:[],
       }
     },
     created() {
@@ -315,11 +316,23 @@
                 EmployeeName:"不限"
             }
             this.EmployeeList.unshift(obj)
+            this.AllemployeeList = JSON.parse(JSON.stringify(this.EmployeeList));
           }
         }).catch(() => {
 
         })
       },
+      //筛选业务员
+      filterFn2(val, update) {
+            update(() => {
+                if (val === '') {
+                    this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList))
+                } else {
+                    const needle = val.toLowerCase()
+                    this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1)
+                }
+            })
+        },
     }
   }