2

src/components/sale/orderlist.vue

@@ -679,7 +679,7 @@
     </table>
      </div>
     <!--修改订单-->
-    <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshOrder">
+    <editorder-form v-if="isShowEditOrderForm" :save-obj="editObj" @close="closeOrderSaveForm" @success="refreshOrder">
     </editorder-form>
 
     <!--修改订单备注-->
@@ -820,6 +820,7 @@
         isShowPop:false,
         showChooseStudent:false,//收款单据，是否显示单选学生
         chooseStudent:"",//收款单据，单选学生
+        editObj:{}
       }
     },
     created() {
@@ -1013,9 +1014,8 @@
       },
       //显示修改订单
       editOrder(item) {
-        // this.orderObj = item;
-        this.orderObj.OrderId = item.OrderId;
-        this.orderObj.Type = 1;
+        this.orderObj = item;
+        this.editObj.OrderId = item.OrderId;
         this.isShowEditOrderForm = true;
       },
       //刷新页面

src/pages/sale/japaneseTrain.vue

@@ -266,7 +266,7 @@
           <q-icon name="iconfont icon-jujue1" size="26px" />
         </div>
       </q-dialog> -->
-      <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshOrder">
+      <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :saveType="1" @close="closeOrderSaveForm" @success="refreshOrder">
       </editorder-form>
     </div>
   </div>
@@ -346,10 +346,7 @@
         EmployeeList: [], //员工列表
         AllemployeeList: [], //所有员工列表
         isShowEditOrderForm:false,
-        orderObj:{
-          OrderId:0,
-          Type:1
-        }
+        orderObj:{}
       }
     },
     created() {
@@ -608,8 +605,10 @@
         this.enrollMsg.EduOccupation='';
         this.enrollMsg.IsLessPrice=0;
         this.enrollMsg.LessPrice=0;
-        
-        
+       
+        this.orderObj.ClassId = item.ClassId;
+        this.orderObj.Unit_Price = this.countPrice(this.enrollMsg.GuestNum);
+
         this.isShowEditOrderForm = true;
         console.log(item);
         // this.orderObj.Id = item.

src/pages/sale/studyjob.vue

@@ -121,9 +121,9 @@
         <quotationstudy-form :obj="null" @save="showForm=false"></quotationstudy-form>
       </q-dialog>
 
-      <studyorder-form v-if="isShowOrderForm" :saveObj="studyObj" @close="cloStudyform" @save="refreshPage()">
-      </studyorder-form>
-
+      <!-- <studyorder-form v-if="isShowOrderForm" :saveObj="studyObj" @close="cloStudyform" @save="refreshPage()">
+      </studyorder-form> -->
+      <editorderForm v-if="isShowOrderForm" :save-obj="studyObj" :saveType="2" @close="cloStudyform" @save="refreshPage()"></editorderForm>
     </div>
   </div>
 </template>
@@ -134,6 +134,8 @@
   } from '../../api/studyabroad/index'
   import quotationstudyForm from '../../components/sale/quotationstudy-form'
   import studyorderForm from '../../components/sale/studyorder-form'
+  import editorderForm from '../../components/sale/editOrder-form'
+
   import {
     mapState
   } from "vuex";
@@ -144,7 +146,8 @@
     },
     components: {
       quotationstudyForm,
-      studyorderForm
+      studyorderForm,
+      editorderForm
     },
     data() {
       return {
@@ -269,7 +272,9 @@
       //显示下单弹窗
       showOrderForm(item) {
         this.isShowOrderForm = true;
-        this.studyObj = item;
+        this.studyObj.Unit_Price = item.SellPrice;
+        this.studyObj.SourceId = item.Id;
+        // this.studyObj = item;
       },
       //显示报价单弹窗
       createQuotation() {