页面修改

src/components/sale/quotation-form.vue

@@ -31,8 +31,8 @@
             @input="changeDiscountMoney" :rules="[val => !!val || '请选择客户类型']" />
         </div>
         <div class="col">
-          <q-input standout bottom-slots filled v-model="model.JoinNum" ref="JoinNum" label="报名人数" dense mask="#" fill-mask="0"
-            reverse-fill-mask :rules="[val => !!val || '请输入报名人数']" @input="changeDiscountMoney">
+          <q-input standout bottom-slots filled v-model="model.JoinNum" ref="JoinNum" label="报名人数" dense mask="#"
+            fill-mask="0" reverse-fill-mask :rules="[val => !!val || '请输入报名人数']" @input="changeDiscountMoney">
             <template v-slot:append>
               <span style="font-size:14px;">人</span>
             </template>
@@ -45,7 +45,8 @@
             :rules="[val => !!val || '请输入客户姓名']" />
         </div>
         <div class="col">
-          <q-input standout bottom-slots filled v-model="model.CustomerTel" label="客户电话" dense mask="#" reverse-fill-mask />
+          <q-input standout bottom-slots filled v-model="model.CustomerTel" label="客户电话" dense mask="#"
+            reverse-fill-mask />
         </div>
       </div>
       <div class="text-subtitle2 text-weight-bold q-mb-md">
@@ -113,8 +114,8 @@
       <div class="row">
         <div class="col q-mr-md"></div>
         <div class="col">
-          <q-input standout bottom-slots filled v-model="model.EffectiveEnd" ref="EffectiveEnd" label="报价有效期" dense mask="date"
-            class="cursor-pointer" readonly :rules="[val => !!val || '请选择有效日期']">
+          <q-input standout bottom-slots filled v-model="model.EffectiveEnd" ref="EffectiveEnd" label="报价有效期" dense
+            mask="date" class="cursor-pointer" readonly :rules="[val => !!val || '请选择有效日期']">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
                 <q-popup-proxy>
@@ -264,7 +265,8 @@
                 CustomerName: tempObj.CustomerName,
                 CustomerTel: tempObj.CustomerTel,
                 OfferDetails: [],
-                JoinNum: tempObj.JoinNum
+                JoinNum: tempObj.JoinNum,
+                OfferType: tempObj.OfferType, //课程
               };
               if (tempObj.OfferDetails && tempObj.OfferDetails.length > 0) {
                 this.model.OfferDetails = tempObj.OfferDetails;
@@ -276,6 +278,7 @@
           this.model = {
             Id: 0,
             Name: "",
+            OfferType: 1, //课程
             EffectiveStart: "",
             EffectiveEnd: "",
             CustomerType: null,

src/pages/sale/myoffer.vue

@@ -432,10 +432,14 @@
       },
       //显示报价单
       editQuotation(item) {
-        if (item.OfferType == 1) {
-          this.showForm = true;
+        if (item) {
+          if (item.OfferType == 1) {
+            this.showForm = true;
+          } else {
+            this.showStudyForm = true;
+          }
         } else {
-          this.showStudyForm = true;
+ this.showForm = true;
         }
         this.offerObj = item;
       },

src/pages/sale/quotation.vue

@@ -119,7 +119,8 @@
                 <q-btn color="primary" flat label="获取二维码"></q-btn>
               </div>
               <div class="col-auto">
-                <q-btn v-if="model&&model.CustomerStatus&&(model.CustomerStatus==1||model.CustomerStatus==2)" color="dark" label="撤销报价单" @click="setOfferStatus"></q-btn>
+                <q-btn v-if="model&&model.CustomerStatus&&(model.CustomerStatus==1||model.CustomerStatus==2)"
+                  color="dark" label="撤销报价单" @click="setOfferStatus"></q-btn>
               </div>
             </div>
           </div>
@@ -140,6 +141,9 @@
   import print from "print-js";
   import html2canvas from "html2canvas";
   export default {
+    meta: {
+      title: "报价单"
+    },
     data() {
       return {
         icons: [

src/pages/studyAbroad/studyemploymentorder.vue

@@ -21,7 +21,7 @@
   } from '../../api/sale/sale';
   import orderlist from '../../components/sale/orderlist'
   export default {
-      meta: {
+    meta: {
       title: "留学就业订单中心"
     },
     components: {

src/utils/erpindex.js

@@ -311,14 +311,12 @@ export default {
         window.open(url);
       },
       //新页面打开页面
-      Vue.prototype.OpenNewUrl=function(path,queryObj)
-      {
+      Vue.prototype.OpenNewUrl = function (path, queryObj) {
         var newUrl = this.$router.resolve({
           path: path,
-          query:  queryObj
+          query: queryObj
         });
         window.open(newUrl.href, '_blank');
       }
-
   }
 }