1

src/components/sale/editOrder-form.vue

@@ -22,7 +22,7 @@
       <div style="padding:20px 15px;">
         <q-input filled stack-label maxlength="3" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
           v-model="OrderMsg.GuestNum" @input="calcPrice()" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
-          :disable="modityOrderType==2" />
+          :disable="modityOrderType==2||OrderMsg.OrderIdentify==2" />
         <template v-if="isChaBan==1">
           <q-select filled option-value="CourseId" :disable="modityOrderType==2" option-label="CourseName"
             ref="CourseId" v-model="OrderMsg.CourseId" :options="CourseList" emit-value map-options class="q-pb-lg"
@@ -71,7 +71,7 @@
         <!-- <q-input filled stack-label :dense="false" v-model="OrderMsg.PerDiscountMoney" :disable="true"
           class="col-12 q-pb-lg" label="优惠金额(每人)" :hint="'总优惠金额：'+(OrderMsg.PerDiscountMoney*OrderMsg.GuestNum)" /> -->
 
-        <q-input filled stack-label :dense="false" :value="OrderMsg.Class_Price*OrderMsg.GuestNum*OrderMsg.B2CRatio" :disable="true"
+        <q-input filled stack-label :dense="false" v-model="OrderMsg.DiscountMoney" disable
           class="col-12 q-pb-lg" label="优惠金额"  />
 
         <template v-if="modityOrderType==3">
@@ -278,6 +278,7 @@
           guestNum = Number(this.OrderMsg.GuestNum);
         }
         let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
+        console.log('temp', temp)
         if (temp) {
           this.courseObj = temp;
           var tempDiscountMoney = 0; //优惠金额
@@ -377,6 +378,7 @@
           }).then(res => {
             if (res.Code == 1) {
               var tempData = res.Data.OrderInfo;
+              console.log('tagtempData', tempData)
               this.OrderMsg.ClassId = tempData.ClassId;
               this.OrderMsg.GuestNum = tempData.GuestNum;
               this.OrderMsg.Unit_Price = tempData.Unit_Price;
@@ -408,6 +410,7 @@
               this.OrderMsg.CustomerId=tempData.CustomerId
               this.OrderMsg.CourseConsultantId=tempData.CourseConsultantId
               this.UnitPrice = this.OrderMsg.Unit_Price;
+              this.OrderMsg.OrderIdentify = tempData.OrderIdentify;
               this.IsShowEditOrder = true;
             }
           })
@@ -434,6 +437,7 @@
           this.OrderMsg.B2CReNewRatio = 0;
           this.OrderMsg.CustomerId=0;
           this.OrderMsg.CourseConsultantId=0;
+          this.OrderMsg.OrderIdentify =1;
           if (this.OrderMsg.OrderType == 2) {
             this.OrderMsg.OrderNature = 1;
           }

src/components/school/student/transfer-order/order-form.vue

@@ -26,19 +26,19 @@
     </div>
     <div style="row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
-          <q-input
-            filled
-            stack-label
-            maxlength="3"
-            :dense="false"
-            @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
-            v-model="OrderMsg.GuestNum"
-            @input="calcPrice()"
-            label="人数"
-            :rules="[val => !!val || '请填写人数']"
-            disable
-            class="col-6 q-py-sm"
-          />
+        <q-input
+          filled
+          stack-label
+          maxlength="3"
+          :dense="false"
+          @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
+          v-model="OrderMsg.GuestNum"
+          @input="calcPrice()"
+          label="人数"
+          :rules="[val => !!val || '请填写人数']"
+          disable
+          class="col-6 q-py-sm"
+        />
         <template v-if="OrderMsg.isChaBan == 1">
           <q-select
             filled
@@ -485,7 +485,6 @@ export default {
       let temp = this.CourseList.find(
         x => x.CourseId == this.OrderMsg.CourseId
       );
-      console.log('tagtemp', this.CourseList)
       if (temp) {
         this.courseObj = temp;
         var tempDiscountMoney = 0; //优惠金额
@@ -559,7 +558,6 @@ export default {
           this.OrderMsg.SourceId = this.saveObj.SourceId;
         }
         this.courseObj = {};
-       
       }
 
       /**计算少价---开始*/
@@ -608,119 +606,69 @@ export default {
       });
     },
     initData() {
-      console.log("init", this.saveObj);
-      if (this.saveObj && this.saveObj.OrderId > 0) {
-        getClassOrderInfo({
-          OrderId: this.saveObj.OrderId
-        }).then(res => {
-          if (res.Code == 1) {
-            var tempData = res.Data.OrderInfo;
-            this.OrderMsg.ClassId = tempData.ClassId;
-            // this.OrderMsg.GuestNum = tempData.GuestNum;
-            this.OrderMsg.Unit_Price = tempData.Unit_Price;
-            this.OrderMsg.PreferPrice = tempData.PreferPrice;
-            this.OrderMsg.OrderSource = tempData.OrderSource;
-            this.OrderMsg.SaleRemark = tempData.SaleRemark;
-            this.OrderMsg.Class_Price = tempData.Class_Price;
-            this.OrderMsg.OrderId = tempData.OrderId;
-            this.OrderMsg.OrderType = tempData.OrderType;
-            this.OrderMsg.SourceId = tempData.SourceId;
-            this.OrderMsg.HelpEnterId = tempData.HelpEnterId;
-            this.OrderMsg.GeneralOccupation = tempData.GeneralOccupation;
-            this.OrderMsg.EduOccupation = tempData.EduOccupation;
-            this.OrderMsg.IsLessPrice = tempData.IsLessPrice;
-            this.OrderMsg.LessPrice = tempData.LessPrice;
-            this.OrderMsg.PerLessMoney = tempData.PerLessMoney;
-            this.OrderMsg.OrderNature = tempData.OrderNature;
-            this.OrderMsg.OldPreferPrice = tempData.OldPreferPrice;
-            this.OrderMsg.CourseId = tempData.CourseId;
-            this.OrderMsg.JoinType = tempData.JoinType;
-            this.OrderMsg.StartClassHours = tempData.StartClassHours;
-            this.OrderMsg.IsChaBan = tempData.IsChaBan;
-            this.OrderMsg.EffectTime = tempData.EffectTime;
-            this.OrderMsg.UpOrderId = tempData.UpOrderId;
-            this.OrderMsg.DiscountMoney = tempData.DiscountMoney;
-            this.OrderMsg.PerDiscountMoney = tempData.PerDiscountMoney;
-            this.OrderMsg.B2CRatio =
-              tempData.B2CRatio > 1
-                ? tempData.B2CRatio / 100
-                : tempData.B2CRatio;
-            this.OrderMsg.B2CReNewRatio =
-              tempData.B2CReNewRatio > 1
-                ? tempData.B2CReNewRatio / 100
-                : tempData.B2CReNewRatio;
-            this.OrderMsg.CustomerId = tempData.CustomerId;
-            this.OrderMsg.CourseConsultantId = tempData.CourseConsultantId;
-            this.UnitPrice = this.OrderMsg.Unit_Price;
-            this.IsShowEditOrder = true;
-          }
-        });
-      } else {
-       
-        this.OrderMsg.HelpEnterId = 0;
-        this.OrderMsg.GeneralOccupation = "";
-        this.OrderMsg.EduOccupation = "";
-        this.OrderMsg.IsLessPrice = 0;
-        this.OrderMsg.LessPrice = 0;
-        this.OrderMsg.PerLessMoney = 0;
-        this.OrderMsg.OrderNature = 0;
-        this.OrderMsg.OldPreferPrice = 0;
-        // this.OrderMsg.GuestNum = 1;
-        this.OrderMsg.StartClassHours = 0;
-        this.OrderMsg.IsChaBan = this.isChaBan;
-        this.OrderMsg.EffectTime = "";
-        this.OrderMsg.UpOrderId = 0;
-        this.OrderMsg.JoinType = 1;
-        this.OrderMsg.DiscountMoney = 0;
-        this.OrderMsg.PerDiscountMoney = 0;
-        this.OrderMsg.OrderType = this.orderType;
-        this.OrderMsg.B2CRatio = 0;
-        this.OrderMsg.B2CReNewRatio = 0;
-        this.OrderMsg.CustomerId = 0;
-        this.OrderMsg.CourseConsultantId = 0;
-        if (this.OrderMsg.OrderType == 2) {
-          this.OrderMsg.OrderNature = 1;
+      this.OrderMsg.HelpEnterId = 0;
+      this.OrderMsg.GeneralOccupation = "";
+      this.OrderMsg.EduOccupation = "";
+      this.OrderMsg.IsLessPrice = 0;
+      this.OrderMsg.LessPrice = 0;
+      this.OrderMsg.PerLessMoney = 0;
+      this.OrderMsg.OrderNature = 0;
+      this.OrderMsg.OldPreferPrice = 0;
+      this.OrderMsg.StartClassHours = 0;
+      this.OrderMsg.IsChaBan = this.isChaBan;
+      this.OrderMsg.EffectTime = "";
+      this.OrderMsg.UpOrderId = 0;
+      this.OrderMsg.JoinType = 1;
+      this.OrderMsg.DiscountMoney = 0;
+      this.OrderMsg.PerDiscountMoney = 0;
+      this.OrderMsg.OrderType = this.orderType;
+      this.OrderMsg.B2CRatio = 0;
+      this.OrderMsg.B2CReNewRatio = 0;
+      this.OrderMsg.CustomerId = 0;
+      this.OrderMsg.CourseConsultantId = 0;
+      if (this.OrderMsg.OrderType == 2) {
+        this.OrderMsg.OrderNature = 1;
+      }
+      if (this.saveObj) {
+        if (this.saveObj.ClassId) {
+          this.OrderMsg.ClassId = this.saveObj.ClassId;
+        }
+        if (this.saveObj.Unit_Price) {
+          this.OrderMsg.Unit_Price = this.saveObj.Unit_Price;
+          this.OrderMsg.Class_Price = this.saveObj.Unit_Price;
+          this.UnitPrice = this.saveObj.Unit_Price;
+        }
+        if (this.saveObj.SourceId) {
+          this.OrderMsg.SourceId = this.saveObj.SourceId;
         }
-        if (this.saveObj) {
-          if (this.saveObj.ClassId) {
-            this.OrderMsg.ClassId = this.saveObj.ClassId;
-          }
-          if (this.saveObj.Unit_Price) {
-            this.OrderMsg.Unit_Price = this.saveObj.Unit_Price;
-            this.OrderMsg.Class_Price = this.saveObj.Unit_Price;
-            this.UnitPrice = this.saveObj.Unit_Price;
-          }
-          if (this.saveObj.SourceId) {
-            this.OrderMsg.SourceId = this.saveObj.SourceId;
-          }
 
-          if (this.saveObj.CourseId) {
-            this.OrderMsg.CourseId = this.saveObj.CourseId;
-          } else {
-            this.OrderMsg.CourseId = "";
-          }
-          if (this.saveObj.B2CRatio) {
-            this.OrderMsg.B2CRatio =
-              this.saveObj.B2CRatio > 1
-                ? this.saveObj.B2CRatio / 100
-                : this.saveObj.B2CRatio;
-          }
-          if (this.saveObj.B2CReNewRatio) {
-            this.OrderMsg.B2CReNewRatio =
-              this.saveObj.B2CReNewRatio > 1
-                ? this.saveObj.B2CReNewRatio / 100
-                : this.saveObj.B2CReNewRatio;
-          }
+        if (this.saveObj.CourseId) {
+          this.OrderMsg.CourseId = this.saveObj.CourseId;
+        } else {
+          this.OrderMsg.CourseId = "";
+        }
+        if (this.saveObj.B2CRatio) {
+          this.OrderMsg.B2CRatio =
+            this.saveObj.B2CRatio > 1
+              ? this.saveObj.B2CRatio / 100
+              : this.saveObj.B2CRatio;
         }
-        this.IsShowEditOrder = true;
-        
-        this.calcPrice();
-        if(this.stuData.RenewNum>0){
-           this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj.B2CRatio ?? 0}%;直客续费优惠比例${this.saveObj.B2CReNewRatio ?? 0}%`; //备注
-        }else{
-           this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj.B2CRatio ?? 0}%`; //备注
+        if (this.saveObj.B2CReNewRatio) {
+          this.OrderMsg.B2CReNewRatio =
+            this.saveObj.B2CReNewRatio > 1
+              ? this.saveObj.B2CReNewRatio / 100
+              : this.saveObj.B2CReNewRatio;
         }
-        
+      }
+      this.IsShowEditOrder = true;
+
+      this.calcPrice();
+      if (this.stuData.RenewNum > 0) {
+        this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj
+          .B2CRatio ?? 0}%;直客续费优惠比例${this.saveObj.B2CReNewRatio ?? 0}%`; //备注
+      } else {
+        this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj
+          .B2CRatio ?? 0}%`; //备注
       }
     },
     //筛选员工

src/pages/system/noticeSysSet.vue

@@ -171,7 +171,6 @@ export default {
           x.EditorStatus = false;
         });
         this.dictList = r.Data;
-        console.log("tag140", this.dictList);
       });
     },
     //获取业务员