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

src/components/sale/editOrder-form.vue

@@ -8,6 +8,7 @@
     padding: 5px 10px;
     align-items: center;
   }
+
 </style>
 
 <!--订单操作-->
@@ -20,14 +21,15 @@
         </div>
       </div>
       <div style="padding:20px 15px;">
-        <q-input filled stack-label maxlength="100" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')" v-model="OrderMsg.GuestNum"
-          @input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
+        <q-input filled stack-label maxlength="100" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
+          v-model="OrderMsg.GuestNum" @input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
           :disable="modityOrderType==2" />
         <template v-if="isChaBan==1">
-          <q-select filled option-value="CourseId" option-label="CourseName" ref="CourseId"
-            v-model="OrderMsg.CourseId" :options="CourseList" emit-value map-options class="q-pb-lg" :rules="[val => !!val || '请选择课程']" label="选择课程"
+          <q-select filled option-value="CourseId" option-label="CourseName" ref="CourseId" v-model="OrderMsg.CourseId"
+            :options="CourseList" emit-value map-options class="q-pb-lg" :rules="[val => !!val || '请选择课程']" label="选择课程"
             @input="changePrice" />
-          <q-input filled stack-label :dense="false" v-model="OrderMsg.StartClassHours" @keyup.native="checkInteger(OrderMsg,'StartClassHours')" ref="StartClassHours" @blur="countPrice"
+          <q-input filled stack-label :dense="false" v-model="OrderMsg.StartClassHours"
+            @keyup.native="checkInteger(OrderMsg,'StartClassHours')" ref="StartClassHours" @input="countPrice"
             class="col-12" label="起始课时" :rules="[val => !!val || '请填起始课时']" />
         </template>
         <template v-if="modityOrderType==1">
@@ -37,16 +39,16 @@
           <q-toggle v-model="IsShowUpPrice" label="高于定价收生" class="q-mb-md" />
         </template>
         <template v-if="modityOrderType==2">
-          <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @blur="countPrice"
+          <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @input="countPrice"
             class="col-12" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
         </template>
         <template v-if="modityOrderType==3">
-          <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @blur="countPrice" class="col-12"
+          <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @input="countPrice" class="col-12"
             label="成交单价" :rules="[val => !!val || '请填成交单价']" />
-          <q-input filled stack-label v-if="OrderMsg.OrderType==1" :dense="false" maxlength="10"
-            @keyup.native="checkPrice(OrderMsg,'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
-            label="应收" />
         </template>
+        <q-input filled stack-label :disable="modityOrderType!=3" :dense="false" maxlength="10"
+          @keyup.native="checkPrice(OrderMsg,'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
+          label="应收" />
         <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
           v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
           label="客人来源" />
@@ -152,6 +154,7 @@
         EmployeeList: [], //员工列表
         AllemployeeList: [], //所有员工列表
         CourseList: [], //课程列表
+        courseObj: {} //选择的课程
       }
     },
     created() {
@@ -171,6 +174,9 @@
     },
     mounted() {
       this.initData()
+    },
+    watch: {
+
     },
     methods: {
       //获取插班报入配置信息
@@ -187,19 +193,23 @@
             if (this.saveObj && this.saveObj.OrderId > 0) {} else {
               this.OrderMsg.StartClassHours = res.Data.finishHours;
             }
+            if(this.OrderMsg&&this.OrderMsg.CourseId){
+              this.courseObj = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
+            }
           }
         });
       },
       //选择课程切换价格
       changePrice() {
         let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
-        console.log("temp", temp);
         if (temp) {
           this.OrderMsg.Unit_Price = temp.SellPrice;
           this.UnitPrice = temp.SellPrice;
+          this.courseObj = temp;
         } else {
           this.OrderMsg.Unit_Price = 0;
           this.UnitPrice = 0;
+          this.courseObj = {};
         }
         this.countPrice();
       },
@@ -321,23 +331,40 @@
         if (this.OrderMsg.Unit_Price && this.OrderMsg.Unit_Price > 0) {
           unit_price = Number(this.OrderMsg.Unit_Price);
         }
-        this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2);
+        //计算应收价格
+        if (this.OrderMsg.IsChaBan == 1) {
+          var newPreferPrice = 0;
+          if (this.courseObj && this.courseObj.CourseId && this.courseObj.CourseId > 0) {
+            newPreferPrice = (this.courseObj.SellPrice / this.courseObj.ClassHours) * (this.courseObj.ClassHours - this
+              .OrderMsg.StartClassHours) * guestNum
+          }
+          this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);
+        } else {
+          this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2);
+        }
         if (this.OrderMsg.OrderType == 2) {
           this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
         }
       },
       //修改订单
       saveOrderInfo() {
-        if (this.OrderMsg.OrderType == 1) {
-          if (this.modityOrderType == 1 || this.modityOrderType == 2) {
-            this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
-          }
-        }
-        if(this.isChaBan==1){
+        if (this.isChaBan == 1) {
           this.$refs.CourseId.validate();
           this.$refs.StartClassHours.validate();
-          if(this.$refs.CourseId.hasError||this.$refs.StartClassHours.hasError){
-              return;
+          if (this.$refs.CourseId.hasError || this.$refs.StartClassHours.hasError) {
+            return;
+          }
+        }
+        //计算应收价格
+        if (this.OrderMsg.IsChaBan == 1) {
+          if (this.modityOrderType == 1 || this.modityOrderType == 2) {
+            var newPreferPrice = (this.courseObj.SellPrice / this.courseObj.ClassHours) * (this.courseObj.ClassHours -
+              this.OrderMsg.StartClassHours) * this.OrderMsg.GuestNum - this.OrderMsg.LessPrice;
+            this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);
+          }
+        } else {
+          if (this.modityOrderType == 1 || this.modityOrderType == 2) {
+            this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
           }
         }
         setClassOrder(this.OrderMsg).then(res => {

src/components/sale/orderlist.vue

@@ -88,7 +88,7 @@
                 </div>
               </template>
               <template v-if="item.OrderType==1">
-                课程名称:{{item.CourseName}}
+                <div v-if="item.CourseName">课程名称:{{item.CourseName}}</div>
                 <div v-if="item.IsChaBan==1" style="color:red;">
                   插班报入  插班开始课时:{{item.StartClassHours}}
                 </div>

src/pages/course/classManage.vue

@@ -8,6 +8,7 @@
     border: 1px solid #2961FE;
     border-radius: 50%;
     cursor: pointer;
+    color:#2961FE;
   }
 
   .OCourseTable {
@@ -87,7 +88,7 @@
                           <th>课程名称</th>
                           <th>课时数</th>
                         </tr>
-                        <tr v-for="(sItem,sIndex) in props.row.OtherCourseList">
+                        <tr v-for="(sItem,sIndex) in props.row.OtherCourseList" style="border-bottom:1px dashed #d1d1d1;">
                           <td>{{sItem.CourseName}}</td>
                           <td>{{sItem.ClassHours}}</td>
                         </tr>

src/pages/sale/japaneseTrain.vue

@@ -346,7 +346,7 @@
       var month = nowDay.getMonth() + 1; //月
       var day = nowDay.getDate(); //日
       var currentDay = year + '-' + month + '-' + day;
-      // this.msg.StartTime = currentDay
+      this.msg.StartTime = currentDay
     },
     mounted() {
       this.getList();