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

src/components/sale/editOrder-form.vue

@@ -79,16 +79,19 @@
           <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @input="calcPrice()" class="col-12"
             label="成交单价" :rules="[val => !!val || '请填成交单价']" />
         </template>
-
         <template v-if="OrderMsg.Unit_PriceType==2">
           <q-input filled stack-label :dense="false" v-model="OrderMsg.TotalClassHours" @input="calcPrice()" class="col-12"
             label="总课时数" type="number" :min="0" :rules="[val => !!val || '请填总课时数']" />
         </template>
-         <q-input filled stack-label :dense="false" v-model="OrderMsg.TextbookFee" @input="calcPrice()" class="col-12"
+      <template v-if="OrderMsg.ClassList&&OrderMsg.ClassList.length>0">
+        
+         <q-input v-if="OrderMsg.ClassList[0].ClassScrollType==2" filled stack-label :dense="false" v-model="OrderMsg.TextbookFee" @input="calcPrice()" class="col-12"
             label="教材费" type="number" :min="0" :rules="[val => !!val || '请填教材费']" />
-        <q-input filled stack-label :dense="false" v-model="OrderMsg.CoursewareFee" @input="calcPrice()" class="col-12"
+        <q-input v-if="OrderMsg.ClassList[0].ClassScrollType==2" filled stack-label :dense="false" v-model="OrderMsg.CoursewareFee" @input="calcPrice()" class="col-12"
             label="课件费" type="number" :min="0" :rules="[val => !!val || '请填课件费']" />
 
+      </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="应收" />
@@ -232,6 +235,7 @@
           TotalClassHours:0,//总课时数 2024-08-26 add by:W
           CoursewareFee:0,//教材费
           TextbookFee:0,//课件费
+          ClassList:[],
         },
         Unit_PriceRemark: "", //单价规则
         IsShowUpPrice: false, //是否显示高于定价
@@ -275,6 +279,7 @@
         }
         queryChaClassInfo(qMsg).then(res => {
           if (res.Code == 1) {
+    
             this.CourseList = res.Data.otherCourse;
             if (this.saveObj && this.saveObj.OrderId > 0) {} else {
               this.OrderMsg.StartClassHours = res.Data.finishHours;
@@ -445,6 +450,7 @@
               this.OrderMsg.TotalClassHours = tempData.TotalClassHours;
               this.OrderMsg.CoursewareFee = tempData.CoursewareFee;
               this.OrderMsg.TextbookFee = tempData.TextbookFee;
+              this.OrderMsg.ClassList= JSON.parse(JSON.stringify(tempData.ClassList));
               this.IsShowEditOrder = true;
             }
           })
@@ -503,6 +509,7 @@
           }
           this.OrderMsg.DiscountMoney=this.OrderMsg.Class_Price*this.OrderMsg.GuestNum*(this.OrderMsg.B2CRatio>1?this.OrderMsg.B2CRatio/100:this.OrderMsg.B2CRatio)
           this.IsShowEditOrder = true;
+          this.OrderMsg.ClassList=[];
           this.calcPrice();
         }
       },

src/components/sale/orderlist.vue

@@ -200,9 +200,7 @@
               <template v-if="item.OrderType == 1">
                 <div v-if="item.ClassList&&item.ClassList.length>0">
                   课程名称：
-                  <span v-for="(itemc, indexc) in item.ClassList">
-                 {{indexc>1?',':""}}{{ itemc.CourseName }}
-                  </span>
+                  <span v-for="(itemc, indexc) in item.ClassList">{{indexc>0?',':""}}{{itemc.CourseName }}</span>
                 </div>
                 <div v-else="item.CourseName">
                   课程名称：{{ item.CourseName }}

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

@@ -301,18 +301,22 @@ export default {
         this.saveObj = val[0];
         this.saveObj.Unit_Price = this.saveObj.SellPrice;
         this.defaultCourse = val;
+        this.saveObj.OrderCourseList =[];
+        this.saveObj.OrderCourseList.push(JSON.parse(JSON.stringify(this.saveObj)));
+        this.saveObj.TextbookFee=0;
+        this.saveObj.CoursewareFee=0;
       } else {
         this.saveObj = {};
         this.saveObj.Unit_Price = 0;
         this.defaultCourse = [];
       }
+     
+      
     },
     // 选择课程
     selectCourse(val) {
       this.selectedCourseList = []
       if (val.length > 0) {
-       // this.saveObj = val[0];
-       // this.saveObj.Unit_Price = this.saveObj.SellPrice;
         this.selectedCourseList = val;
       } 
       this.saveObj = {};
@@ -322,10 +326,8 @@ export default {
       this.selectedCourseList.forEach((item,index) => {
         if(index==0){
           this.saveObj = JSON.parse(JSON.stringify(item));
-          console.log("this.saveObj111",this.saveObj);
           this.saveObj.Unit_Price = item.SellPrice;
           this.saveObj.PreferPrice = item.SellPrice;
-          console.log("this.saveObj111.Unit_Price",this.saveObj.Unit_Price);
         }
       else{
           this.saveObj.CourseName+=","+item.CourseName

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

@@ -196,6 +196,7 @@
           />
         </template>
         <q-input
+        v-if="mode!=1"
             filled
             stack-label
             :dense="false"
@@ -207,6 +208,7 @@
             label="课件费"
           />
           <q-input
+          v-if="mode!=1"
             filled
             stack-label
             :dense="false"
@@ -348,6 +350,7 @@
           label="协助老师"
         /> -->
         <q-select 
+        v-if="mode!=1"
           v-model="OrderMsg.HelpEnterId"
           :options="AssistList"
           filled

src/utils/erpindex.js

@@ -82,7 +82,7 @@ export default {
       Vue.prototype.domainManager = function () {
 
         //let domainUrl = 'http://192.168.10.214';
-        let domainUrl = 'http://192.168.5.34';
+        let domainUrl = 'http://192.168.5.57';
         let viewFileUrl = 'http://192.168.5.214:8120';
         let mallUrl = "http://192.168.5.2:8088";