1

src/components/school/student/abroad-form.vue

@@ -28,7 +28,7 @@
                 :input="true" @input="changePage" />
             </q-step>
             <q-step :name="2" title="确认" icon="settings" :done="step > 2">
-              <studyForm ref="orderForm" :save-obj="saveObj" @success="$emit('close')" @cancelloading='cancelloading'></studyForm>
+              <studyForm ref="orderForm" :save-obj="saveObj" :select="selectedArr" @success="$emit('close')" @cancelloading='cancelloading'></studyForm>
             </q-step>
           </q-stepper>
         </q-card-section>
@@ -92,10 +92,14 @@
           Id: 2,
           Name: '就业'
         }],
-        PageCount: 0
+        PageCount: 0,
+        selectedArr:[]
       };
     },
     mounted() {
+      if(this.select){
+        this.selectedArr = this.select;
+      }
       this.getList();
     },
     methods: {
@@ -119,7 +123,6 @@
       selectCourse(val) {
         if(val&&val.length>0){
             this.saveObj = val[0];
-            this.saveObj.Id = this.saveObj.Id;
             this.defaultCourse = val;
         }
       },

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

@@ -2,99 +2,25 @@
 <template>
   <div>
     <div class="q-mb-sm text-accent">
-      <span class="text-primary" v-if="mode === 1">班级：</span>
-      <span v-if="mode === 1">{{ saveObj.ClassName }}</span>
-      <span class="q-ml-md text-primary">课程：</span>{{ saveObj.CourseName }}
-    </div>
-    <div class="row q-mb-md">
-      <!-- <div class="col-10 flex">
-        <div v-for="(item, index) in stuData.StuList">
-          <q-chip icon="person" class="primary"
-            >{{ item.StuName }}
-            <span v-if="item.IsRenewGuest === 1">(续费)</span>
-          </q-chip>
-        </div>
-      </div> -->
-      <div class="col-2" v-if="mode == 1">
-        <q-toggle
-          v-model="OrderMsg.IsChaBan"
-          :true-value="1"
-          :false-value="0"
-          label="插班报入"
-        />
-      </div>
+      <span>{{ saveObj.ClassName }}</span>
     </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
-          :dense="false"
-          v-model="OrderMsg.Unit_Price"
-          :disable="true"
-          @input="calcPrice()"
-          class="col-6 q-py-sm"
-          label="成交单价"
-          :rules="[val => !!val || '请填成交单价']"
-        />
-        <q-input
-          filled
-          stack-label
-          :dense="false"
-          v-model="OrderMsg.DiscountMoney"
-          :disable="true"
-          class="col-6 q-py-sm"
-          label="优惠金额"
-        />
-        <q-input
-          filled
-          stack-label
-          :disable="true"
-          :dense="false"
-          maxlength="10"
-          @keyup.native="checkPrice(OrderMsg, 'PreferPrice')"
-          v-model="OrderMsg.PreferPrice"
-          class="col-6 q-py-sm"
-          label="应收"
-        />
-        <q-select
-          standout="bg-primary text-white"
-          option-value="Id"
-          option-label="Name"
-          v-model="OrderMsg.OrderSource"
-          :options="SourceEnumList"
-          emit-value
-          map-options
-          class="col-6 q-py-sm"
-          label="客人来源"
-        />
-        <q-select
-          v-model="OrderMsg.HelpEnterId"
-          :options="EmployeeList"
-          filled
-          use-input
-          label="协助老师"
-          option-label="EmployeeName"
-          option-value="Id"
-          ref="EmployeeName"
-          class="col-6 q-py-sm"
-          emit-value
-          map-options
-          @filter="filterFn"
-        >
+        <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 :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @input="calcPrice()"
+          class="col-6 q-py-sm" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
+        <q-input filled stack-label :dense="false" v-model="OrderMsg.DiscountMoney" :disable="true"
+          class="col-6 q-py-sm" label="优惠金额" />
+        <q-input filled stack-label :disable="true" :dense="false" maxlength="10"
+          @keyup.native="checkPrice(OrderMsg, 'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-6 q-py-sm"
+          label="应收" />
+        <q-select standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource"
+          :options="SourceEnumList" emit-value map-options class="col-6 q-py-sm" label="客人来源" />
+        <q-select v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled use-input label="协助老师"
+          option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-py-sm" emit-value map-options
+          @filter="filterFn">
           <template v-slot:no-option>
             <q-item>
               <q-item-section class="text-grey">
@@ -103,20 +29,9 @@
             </q-item>
           </template>
         </q-select>
-        <q-select
-          v-model="OrderMsg.CourseConsultantId"
-          :options="EmployeeList2"
-          filled
-          use-input
-          label="课程顾问"
-          option-label="EmployeeName"
-          option-value="Id"
-          ref="EmployeeName2"
-          class="col-6 q-py-sm"
-          emit-value
-          map-options
-          @filter="filterFn2"
-        >
+        <q-select v-model="OrderMsg.CourseConsultantId" :options="EmployeeList2" filled use-input label="课程顾问"
+          option-label="EmployeeName" option-value="Id" ref="EmployeeName2" class="col-6 q-py-sm" emit-value map-options
+          @filter="filterFn2">
           <template v-slot:no-option>
             <q-item>
               <q-item-section class="text-grey">
@@ -125,23 +40,13 @@
             </q-item>
           </template>
         </q-select>
-        <q-input
-          filled
-          stack-label
-          :dense="false"
-          v-model="OrderMsg.SaleRemark"
-          type="textarea"
-          class="col-12 q-py-sm"
-          label="备注"
-        />
+        <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" type="textarea" class="col-12 q-py-sm"
+          label="备注" />
       </div>
     </div>
 
-    <div
-      class="dialog-out-close"
-      @click="closeEditOrder"
-      style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;"
-    >
+    <div class="dialog-out-close" @click="closeEditOrder"
+      style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
       <q-icon name="iconfont icon-jujue1" size="26px" />
     </div>
     <q-dialog v-model="inception">
@@ -156,45 +61,32 @@
 
         <q-card-actions align="right" class="text-primary">
           <q-btn flat label="取消" size="sm" v-close-popup />
-          <q-btn
-            label="立即查看"
-            size="sm"
-            color="accent q-px-md"
-            style="font-weight:400 !important"
-            @click="goorder"
-          />
+          <q-btn label="立即查看" size="sm" color="accent q-px-md" style="font-weight:400 !important" @click="goorder" />
         </q-card-actions>
       </q-card>
     </q-dialog>
   </div>
 </template>
 <script>
-import {
+  import {
     getClassOrderInfo, //获取订单操作日志列表
     getOrderSourceEnumList, //获取订单来源 枚举
     setClassOrder, //修改订单
     queryChaClassInfo,
-} from "../../../../api/sale/sale";
-import { queryEmployee } from "../../../../api/users/user"; //获取员工
-export default {
+  } from "../../../../api/sale/sale";
+  import {
+    queryEmployee
+  } from "../../../../api/users/user"; //获取员工
+  export default {
     props: {
       saveObj: {
         type: Object,
         default: null
       },
-    mode: {
-      type: Number, //1:约课，2：班课
-      default: 1
-    },
-    //订单类型
-    orderType: {
-      type: Number,
-      default: 1
-    },
-    schoolList: {
+      select: {
         type: Array,
         default: () => []
-    }
+      },
     },
     data() {
       return {
@@ -208,12 +100,27 @@ export default {
         AllemployeeList2: [], //所有课程顾问列表
         inception: false,
         inceptionData: null,
-      OrderMsg:{}
+        OrderMsg: {
+          OrderType:2,
+          GuestNum:1, //人数
+          Unit_Price:'', //成交单价
+          DiscountMoney:0, //优惠金额
+          PreferPrice:'', //应收
+          OrderSource:'', //客人来源
+          HelpEnterId:'', //协助老师
+          CourseConsultantId:'', //课程顾问
+          SourceId:1, //传入Id
+          SaleRemark:'' //备注
+        }
       };
     },
     created() {
-    if (this.saveObj && this.saveObj.CourseId) {
-      this.OrderMsg.CourseId = this.saveObj.CourseId;
+      console.log(this.saveObj,'saveObj');
+      console.log(this.select,'select');
+      if (this.saveObj) {
+        this.OrderMsg.SourceId = this.saveObj.Id;
+        this.OrderMsg.Unit_Price = this.saveObj.SellPrice;
+        this.OrderMsg.PreferPrice = this.OrderMsg.Unit_Price;
       }
       this.getOrderSEList();
       this.getEmployee(0);
@@ -320,5 +227,6 @@ export default {
         this.inception = false;
       },
     }
-};
+  };
+
 </script>