1

src/components/sale/activeOrder-form.vue

@@ -21,12 +21,25 @@
         </div>
       </div>
       <div style="padding:20px 15px;">
+         <q-select  standout="bg-primary text-white" v-model="OrderMsg.EduStudentId" class="col-12  q-mb-lg" :options="stuList"
+            emit-value map-options label="学员" option-value="Id" option-label="name" @change="stuChange"/>
         <q-input filled stack-label maxlength="30" :dense="false" 
           v-model="OrderMsg.LinkMan"  class="col-12" ref="LinkMan" label="姓名"
           :rules="[val => !!val || '请填写姓名']"  />
-        <q-input filled stack-label maxlength="30" :dense="false" 
+        <q-input filled stack-label maxlength="30" :dense="false" type="number"
           v-model="OrderMsg.LinkTel"  class="col-12" ref="LinkTel" label="联系电话"
           :rules="[val => !!val || '请填写联系电话']"  />
+        <q-select  standout="bg-primary text-white" v-model="OrderMsg.Sex" class="col-12  q-mb-lg" :options="sexList"
+            emit-value map-options label="性别" option-value="Id" option-label="name"/>
+        <q-input filled stack-label maxlength="30" :dense="false"  type="number"
+          v-model="OrderMsg.PeopleNum"  class="col-12" :min="1" label="人数"
+          :rules="[val => !!val || '请填写人数']"  />
+        <div>
+          单价：{{OrderMsg.UnitPrice}}
+        </div>
+        <div>
+          总价：{{OrderMsg.UnitPrice*OrderMsg.PeopleNum}}
+        </div>
         <q-input filled stack-label :dense="false" v-model="OrderMsg.Remark" style="margin-top: 20px"
           type="textarea" class="col-12" ref="Remark" label="备注" />
         <div style="margin:30px 10px 70px 0;">
@@ -50,21 +63,65 @@
         type: Object,
         default: null,
       },
+      sourceType:{
+        type:Number,
+        default:1
+      }
     },
     data() {
       return {
         IsShowEditOrder: true,
         OrderMsg: {
-          Id:0,
-          LinkMan:"",
-          LinkTel:"",
-          Remark:""
+          Id:0,//订单id
+          LinkMan:"",//联系人
+          LinkTel:"",//联系电话
+          Remark:"",//备注
+          ActivityId:0,//活动id
+          PeopleNum:1,//人数
+          Sex:1,//性别
+          EduStudentId:0,//学员id
+          UnitPrice:0,//单价
+          Money:0,//总价
+          EduUserId:0,//销售id
+          PayWay:0,//付款方式
+          TenantId:0,//商户id
+          MallBaseId:0,//小程序id
         },
+        stuList:[],//学员列表
+        loginId:-1,//登录人id
+        sexList:[
+          {
+            Id:1,
+            name:"男"
+          },
+          {
+            Id:2,
+            name:"女"
+          }
+        ]
       }
     },
     mounted() {
       console.log(66,this.saveObj)
-        this.OrderMsg.Id=this.saveObj.Id
+      if(this.saveObj){
+        if(this.sourceType===1){
+           this.OrderMsg.ActivityId=this.saveObj.Id
+           this.OrderMsg.UnitPrice=this.saveObj.Price
+        }else if(this.sourceType===2){
+           this.OrderMsg.Id=this.saveObj.Id
+           this.OrderMsg.ActivityId=this.saveObj.ActivityId
+           this.OrderMsg.UnitPrice=this.saveObj.UnitPrice
+        }
+        this.OrderMsg.LinkMan=this.saveObj.LinkMan
+        this.OrderMsg.LinkTel=this.saveObj.LinkTel     
+        this.OrderMsg.Remark=this.saveObj.Remark
+      }
+      let data=JSON.parse(localStorage.getItem("loginUserInfo")).data
+        this.loginId=data.Id
+        this.OrderMsg.EduUserId=data.JHTenantId
+        this.OrderMsg.TenantId=data.JHTenantId
+        this.OrderMsg.MallBaseId=data.JHMallBaseId
+        this.getStu();
     },
     watch: {
 
@@ -82,9 +139,18 @@
        if (!this.$refs.LinkMan.hasError &&
         !this.$refs.LinkTel.hasError  
        ){
-          this.apipostDS("/api/Education/", this.OrderMsg, (res) => {
+         if(this.saveObj.LnsideLimit===1&&!this.OrderMsg.EduStudentId){
+           this.Error("请选择学员");
+           return
+         }
+         if(this.OrderMsg.PeopleNum<1){
+           this.Error("人数不能小于1");
+           return
+         }
+         this.OrderMsg.Money= this.OrderMsg.UnitPrice*this.OrderMsg.PeopleNum
+          this.apipostDS("/api/Education/SetActivityEnrollInfo", this.OrderMsg, (res) => {
             if (res.data.resultCode === 1) {
-              this.Success(res.data.message);
+              this.Success("报名成功");
               this.closeEditOrder();
               // this.$emit('success');
             } else {
@@ -93,6 +159,19 @@
           })
        }
      },
+     getStu(){
+        this.apipostDS("/api/Education/GetEduStudent", {EduUserId:this.loginId}, (res) => {
+            console.log(111,res)
+            if (res.data.resultCode === 1) {
+              this.stuList=res.data.data
+            } else {
+              this.Error(res.data.message);
+            }
+          })
+     },
+     stuChange(val){
+
+     }
     }
   }
 

src/components/sale/activeOrder-item.vue

@@ -667,7 +667,7 @@
       </table>
     </div>
     <!--修改课程订单-->
-    <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType"
+    <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType" :sourceType="2"
       @close="closeOrderSaveForm" @success="refreshOrder" :isChaBan="isChaBan" :modityOrderType="newModityOrderType">
     </editorder-form>
 
@@ -677,7 +677,7 @@
     </studyorder-form> -->
 
     <!--修改订单备注-->
-    <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType"
+    <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj"  :remarkType="remarkType"
       @close="closeRemarkForm" @success="refreshOrder"></orderremark-form>
 
     <!--转交订单-->

src/pages/sale/activeOrderStatistics.vue

@@ -57,7 +57,7 @@
     <div class="col row wrap q-gutter-x-md" v-if="data.Statistics">
       <div class="col stics">
         <span class="stics-name">应收款</span>
-        <span>{{data.Statistics.PreferPrice?data.Statistics.PreferPrice:0}}</span>
+        <span>{{data.Statistics.Money}}</span>
       </div>
       <div class="col stics">
         <span class="stics-name">实收款</span>

src/pages/sale/activityList.vue

@@ -260,7 +260,7 @@
         </template>
       </q-table>
     </div>
-    <!-- 新增修改活动类型 -->
+    <!-- 新增修改活动订单 -->
      <ActiveOrderForm v-if="showForm" :save-obj="orderObj" @close="closeruleset" @success="refreshPage">
      </ActiveOrderForm>