页面修改

src/components/studyAbroad/studyAbroad-form copy.vue

@@ -38,7 +38,7 @@
         </div>
         <div class="row wrap">
           <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.OfferCommission"
-            ref="OfferCommission" class="col-6 q-pr-lg q-pb-lg" label="校企返佣金额" :rules="[val => !!val || '校企返佣金额']" />
+            ref="SaleCommission" class="col-6 q-pr-lg q-pb-lg" label="校企返佣金额" :rules="[val => !!val || '校企返佣金额']" />
         </div>
         <div class="row wrap">
           <q-input filled stack-label :dense="false" v-model="objOption.Remark" style="margin-top: 20px" type="textarea"
@@ -83,7 +83,6 @@
           CostInfo: '', //成本价包含内容
           B2BCommission: '', //同行返佣
           B2BCommissionType: 0, //同行返佣类型
-          SaleCommission:'', //销售返佣
           SaleCommissionType: 0, //销售返佣类型
           OfferPrice: '', //校企报价
           OfferCommissionType: 0, //校企报价返佣类型
@@ -110,46 +109,44 @@
             if (res.Code == 1) {
               var tempObj = res.Data;
               if (tempObj) {
-                this.objOption.Id = tempObj.Id;
-                this.objOption.Type = tempObj.Type;
-                this.objOption.Name = tempObj.Name;
-                this.objOption.SupplierId = tempObj.SupplierId;
-                this.objOption.SupplierContract = tempObj.SupplierContract;
-                this.objOption.CommissionProfits = tempObj.CommissionProfits;
-                this.objOption.SellPrice = tempObj.SellPrice;
-                this.objOption.CostPrice = tempObj.CostPrice;
-                this.objOption.CostInfo = tempObj.CostInfo;
-                this.objOption.B2BCommission = tempObj.B2BCommission;
-                this.objOption.B2BCommissionType = tempObj.B2BCommissionType;
-                this.objOption.SaleCommission = tempObj.SaleCommission;
-                this.objOption.SaleCommissionType = tempObj.SaleCommissionType;
-                this.objOption.OfferPrice = tempObj.OfferPrice;
-                this.objOption.OfferCommissionType = tempObj.OfferCommissionType;
-                this.objOption.OfferCommission = tempObj.OfferCommission;
-                this.objOption.Remark = tempObj.Remark;
-                this.objOption.SaleState = tempObj.SaleState;
+                this.addMsg.Id = tempObj.Id;
+                this.addMsg.Type = tempObj.Type;
+                this.addMsg.Name = tempObj.Name;
+                this.addMsg.SupplierId = tempObj.SupplierId;
+                this.addMsg.SupplierContract = tempObj.SupplierContract;
+                this.addMsg.CommissionProfits = tempObj.CommissionProfits;
+                this.addMsg.SellPrice = tempObj.SellPrice;
+                this.addMsg.CostPrice = tempObj.CostPrice;
+                this.addMsg.CostInfo = tempObj.CostInfo;
+                this.addMsg.B2BCommission = tempObj.B2BCommission;
+                this.addMsg.B2BCommissionType = tempObj.B2BCommissionType;
+                this.addMsg.SaleCommissionType = tempObj.SaleCommissionType;
+                this.addMsg.OfferPrice = tempObj.OfferPrice;
+                this.addMsg.OfferCommissionType = tempObj.OfferCommissionType;
+                this.addMsg.OfferCommission = tempObj.OfferCommission;
+                this.addMsg.Remark = tempObj.Remark;
+                this.addMsg.SaleState = tempObj.SaleState;
               }
             }
           })
         } else {
-          this.objOption.Id = 0;
-          this.objOption.Type = 1;
-          this.objOption.Name = '';
-          this.objOption.SupplierId = 0;
-          this.objOption.SupplierContract = '';
-          this.objOption.CommissionProfits = '';
-          this.objOption.SellPrice = '';
-          this.objOption.CostPrice = '';
-          this.objOption.CostInfo = '';
-          this.objOption.B2BCommission = '';
-          this.objOption.B2BCommissionType = 0;
-          this.objOption.SaleCommission = '';
-          this.objOption.SaleCommissionType = 0;
-          this.objOption.OfferPrice = '';
-          this.objOption.OfferCommissionType = 0;
-          this.objOption.OfferCommission = '';
-          this.objOption.Remark = '';
-          this.objOption.SaleState = 0;
+          this.addMsg.Id = 0;
+          this.addMsg.Type = 1;
+          this.addMsg.Name = '';
+          this.addMsg.SupplierId = 0;
+          this.addMsg.SupplierContract = '';
+          this.addMsg.CommissionProfits = '';
+          this.addMsg.SellPrice = '';
+          this.addMsg.CostPrice = '';
+          this.addMsg.CostInfo = '';
+          this.addMsg.B2BCommission = '';
+          this.addMsg.B2BCommissionType = 0;
+          this.addMsg.SaleCommissionType = 0;
+          this.addMsg.OfferPrice = '';
+          this.addMsg.OfferCommissionType = 0;
+          this.addMsg.OfferCommission = '';
+          this.addMsg.Remark = '';
+          this.addMsg.SaleState = 0;
         }
       },
       //关闭弹窗

src/components/studyAbroad/studyAbroad-form.vue

@@ -13,10 +13,9 @@
             :options="supplierList" label="供应商" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
         </div>
         <div class="row wrap">
-          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.OfferPrice" ref="OfferPrice"
-            class="col-6 q-pr-lg q-pb-lg" label="校企报价" :rules="[val => !!val || '校企报价']" />
-          <q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.OfferCommission"
-            ref="OfferCommission" class="col-6 q-pr-lg q-pb-lg" label="校企返佣金额" :rules="[val => !!val || '校企返佣金额']" />
+          <div class="col-12">
+            <q-btn color="accent" size="sm" icon="add" label="上传供应商合同" />
+          </div>
         </div>
         <div class="row wrap">
           <q-input filled stack-label :dense="false" v-model="objOption.Remark" style="margin-top: 20px" type="textarea"

src/components/studyAbroad/studyAbroad-form2.vue

@@ -17,11 +17,7 @@
               ref="SellPrice" class="col-6 q-pr-lg q-pb-lg" label="成本"
               @keyup.native="checkPrice(priceObj.courseObj, 'SellPrice')" :rules="[val => !!val || '请填写卖价']" />
           </div>
-          <div class="row wrap">
-            <div class="col-12">
-                <q-btn color="accent" size="sm" icon="add" label="上传供应商合同" />
-            </div>
-          </div>
+  
           </div>
           <div class="q-pt-none scroll" style="max-height:60hv">
             <table>