页面修改

src/api/studyabroad/index.js

@@ -182,4 +182,14 @@ export function querySaleStateList() {
         url: '/StudyAbroad/GetSaleStateList',
         method: 'post',
     })
+}
+
+/**
+ * 获取供应商类别
+ */
+export function querySupplierType() {
+    return request({
+        url: '/StudyAbroad/GetSupplierType',
+        method: 'post',
+    })
 }
\ No newline at end of file

src/components/studyAbroad/studyAbroadprice-form.vue

@@ -67,7 +67,24 @@
                   <template v-else-if="item.PriceDiscountType == 5"> </template>
                   <template v-else>
                     <q-input filled stack-label dense v-model="item.PriceMoney" ref="PriceMoney" label="优惠"
-                      @keyup.native="checkPrice(item, 'PriceMoney')" style="width:125px" suffix="%" />
+                      @keyup.native="checkPrice(item, 'PriceMoney')" style="width:100px">
+                      <template v-slot:append>
+                        <div class="text-dark text-center text-dark cursor-pointer"
+                          style="width:30px;margin-right:-12px;height:100%;font-size:14px;border-left:1px solid #ddd;padding-top:15px;">
+                          <span>{{item.PriceType==0?'%':'￥'}}</span>
+                          <q-menu auto-close>
+                            <q-list>
+                              <q-item clickable v-close-popup @click="item.PriceType=0">
+                                <q-item-section>按百分比（%）</q-item-section>
+                              </q-item>
+                              <q-item clickable v-close-popup @click="item.PriceType=1">
+                                <q-item-section>按固定额度（￥）</q-item-section>
+                              </q-item>
+                            </q-list>
+                          </q-menu>
+                        </div>
+                      </template>
+                    </q-input>
                   </template>
                 </td>
                 <td>

src/components/studyAbroad/studyproaudit-form.vue

@@ -27,9 +27,11 @@
     padding: 8px 0;
     margin-bottom: 10px;
   }
-  .drawer_Span{
+
+  .drawer_Span {
     font-weight: bold;
   }
+
   .studyproPass {
     color: #fff;
     padding: 1px 3px;
@@ -38,6 +40,7 @@
     font-size: 12px;
     background-color: #2bbb7e;
   }
+
   .StudyDirecYijian {
     width: 100%;
     min-height: 50px;
@@ -45,10 +48,11 @@
     background-color: #F5F5F5;
     border-radius: 5px;
     position: relative;
-    word-break:break-all;
+    word-break: break-all;
     max-height: 90px;
     overflow: auto;
   }
+
   .StudyDirecYijian::-webkit-scrollbar {
     width: 3px;
     height: 6px;
@@ -78,6 +82,7 @@
     position: absolute;
     top: -8px;
   }
+
   .stidyRoleLine {
     width: 3px;
     height: 11px;
@@ -85,11 +90,13 @@
     background-color: #3FC4FF;
     display: inline-block;
   }
-  .studyRemark{
-    width:100%;
+
+  .studyRemark {
+    width: 100%;
     overflow: auto;
-    max-height:90px;
+    max-height: 90px;
   }
+
   .studyRemark::-webkit-scrollbar {
     width: 3px;
     height: 6px;
@@ -109,6 +116,7 @@
     -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
     background-color: #2961fe;
   }
+
 </style>
 <template>
   <!--留学就业产品审核-->
@@ -144,7 +152,8 @@
         <div class="row">
           <div class="col-6">
             <div>供应商：{{saveObj.SupplierName}}
-              <a v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''" :href="saveObj.SupplierContract"  style="text-decoration:none;color:#2961fe;" target="_blank">
+              <a v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''" :href="saveObj.SupplierContract"
+                style="text-decoration:none;color:#2961fe;" target="_blank">
                 <i class="iconfont icon-view" style="font-size:18px;cursor:pointer;" @click="" title="查看合同"></i>
               </a>
               <a v-else style="font-size:12px;color:red;">(未上传合同)</a>
@@ -196,13 +205,30 @@
                 买{{ x.BuyNum }}送{{ x.SendNum }}
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 2">
-                单人报名享{{ 100 - x.PriceMoney }}折优惠
+                单人报名享
+                <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>
+                优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 3">
-                双人报名享{{ 100 - x.PriceMoney }}折优惠
+                双人报名享 <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 4">
-                续费享{{ 100 - x.PriceMoney }}折优惠
+                续费享 <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>优惠
               </div>
               <div class="remark-font" v-if="x.PriceDiscountType == 0">
                 暂无优惠政策

src/components/studyAbroad/studyproauditinfo-form.vue

@@ -37,10 +37,11 @@
     background-color: #F5F5F5;
     border-radius: 5px;
     position: relative;
-    overflow:auto;
+    overflow: auto;
     max-height: 90px;
-    word-break:break-all;
+    word-break: break-all;
   }
+
   .DirectYijian::-webkit-scrollbar {
     width: 3px;
     height: 6px;
@@ -83,18 +84,21 @@
     color: #333;
     font-weight: 700;
   }
+
   .stidyRoleLine {
-      width: 3px;
-      height: 11px;
-      margin-right: 10px;
-      background-color: #3FC4FF;
-      display: inline-block;
+    width: 3px;
+    height: 11px;
+    margin-right: 10px;
+    background-color: #3FC4FF;
+    display: inline-block;
   }
-  .studyRemark{
-    width:100%;
+
+  .studyRemark {
+    width: 100%;
     overflow: auto;
-    max-height:90px;
+    max-height: 90px;
   }
+
   .studyRemark::-webkit-scrollbar {
     width: 3px;
     height: 6px;
@@ -114,6 +118,7 @@
     -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
     background-color: #2961fe;
   }
+
 </style>
 <template>
   <q-dialog v-model="persistent" persistent maximized full-height seamless position="right" @hide="closeperForm">
@@ -149,7 +154,8 @@
         <div class="row">
           <div class="col-6">
             <div>供应商：{{saveObj.SupplierName}}
-              <a :href="saveObj.SupplierContract" v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''" style="text-decoration:none;color:#2961fe;" target="_blank">
+              <a :href="saveObj.SupplierContract" v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''"
+                style="text-decoration:none;color:#2961fe;" target="_blank">
                 <i class="iconfont icon-view" style="font-size:18px;cursor:pointer;" @click="" title="查看合同"></i>
               </a>
               <a v-else style="font-size:12px;color:red;">(未上传合同)</a>
@@ -201,13 +207,28 @@
                 买{{ x.BuyNum }}送{{ x.SendNum }}
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 2">
-                单人报名享{{ 100 - x.PriceMoney }}折优惠
+                单人报名享 <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 3">
-                双人报名享{{ 100 - x.PriceMoney }}折优惠
+                双人报名享 <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 4">
-                续费享{{ 100 - x.PriceMoney }}折优惠
+                续费享 <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template v-else>
+                  {{  x.PriceMoney }}元
+                </template>优惠
               </div>
               <div class="remark-font" v-if="x.PriceDiscountType == 0">
                 暂无优惠政策

src/components/studyAbroad/supplier-form.vue

@@ -9,12 +9,33 @@
         <div class="row wrap">
           <q-input filled stack-label maxlength="25" :dense="false" v-model="addMsg.Name" ref="Name"
             class="col-6 q-pr-lg q-pb-lg" label="供应商名称" :rules="[val => !!val || '请填写供应商名称']" />
+          <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.Type" ref="Post_Id"
+            :options="supplierTypeList" label="类别" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
           <q-input filled stack-label maxlength="25" :dense="false" v-model="addMsg.LinkMan" ref="LinkMan"
-            class="col-6 q-pb-lg" label="联系人" />
+            class="col-6 q-pr-lg q-pb-lg" label="联系人" />
           <q-input filled stack-label maxlength="25" :dense="false" v-model="addMsg.LinkTel" ref="LinkTel"
-            class="col-6 q-pr-lg q-pb-lg" label="联系电话" />
+            class="col-6 q-pb-lg" label="联系电话" />
           <q-input filled stack-label maxlength="100" :dense="false" v-model="addMsg.LinkAddress" ref="LinkAddress"
-            class="col-6 q-pb-lg" label="地址" />
+            class="col-6 q-pr-lg q-pb-lg" label="地址" />
+          <q-input filled stack-label dense v-model="addMsg.CommissionMoney" ref="CommissionMoney" label="返佣"
+            class="col-6 q-pr-lg" @keyup.native="checkPrice(item, 'CommissionMoney')" maxlength="6">
+            <template v-slot:append>
+              <div class="text-dark text-center text-dark cursor-pointer"
+                style="width:30px;margin-right:-12px;height:100%;font-size:14px;border-left:1px solid #ddd;padding-top:15px;">
+                <span>{{addMsg.CommissionType==0?'%':'￥'}}</span>
+                <q-menu auto-close>
+                  <q-list>
+                    <q-item clickable v-close-popup @click="addMsg.CommissionType=0">
+                      <q-item-section>按百分比（%）</q-item-section>
+                    </q-item>
+                    <q-item clickable v-close-popup @click="addMsg.CommissionType=1">
+                      <q-item-section>按固定额度（￥）</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </div>
+            </template>
+          </q-input>
           <q-input filled stack-label :dense="false" maxlength="200" v-model="addMsg.Remark" type="textarea"
             class="col-12" label="备注" />
         </div>
@@ -31,7 +52,8 @@
 <script>
   import {
     saveSupplier,
-    querySupplierInfo
+    querySupplierInfo,
+    querySupplierType
   } from '../../api/studyabroad/index'
   export default {
     props: {
@@ -52,13 +74,32 @@
           LinkTel: "", //联系电话
           LinkAddress: "", //地址
           Remark: "", //备注
+          CommissionType: 0, //返佣类型(0-百分比，1-固定金额)
+          CommissionMoney: 0, //返佣值
         },
+        supplierTypeList: [], //供应商类型列表
       }
     },
+    created() {
+      this.getSupplierTypeList();
+    },
     mounted() {
       this.initObj()
     },
     methods: {
+      //获取供应商类型
+      getSupplierTypeList() {
+        querySupplierType().then(res => {
+          if (res.Code == 1) {
+            let obj = {
+              Name: '请选择',
+              Id: 0
+            }
+            this.supplierTypeList = res.Data;
+            this.supplierTypeList.unshift(obj);
+          }
+        })
+      },
       //初始化表单
       initObj() {
         if (this.saveObj && this.saveObj.Id > 0) {
@@ -75,6 +116,8 @@
                 this.addMsg.LinkTel = tempObj.LinkTel;
                 this.addMsg.LinkAddress = tempObj.LinkAddress;
                 this.addMsg.Remark = tempObj.Remark;
+                this.addMsg.CommissionType = tempObj.CommissionType;
+                this.addMsg.CommissionMoney = tempObj.CommissionMoney;
               }
             }
           })
@@ -86,6 +129,8 @@
           this.addMsg.LinkTel = "";
           this.addMsg.LinkAddress = "";
           this.addMsg.Remark = "";
+          this.addMsg.CommissionType = 0;
+          this.addMsg.CommissionMoney = 0;
         }
       },
       //关闭弹窗

src/pages/studyAbroad/employment.vue

@@ -52,13 +52,32 @@
                     买{{ x.BuyNum }}送{{ x.SendNum }}
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 2">
-                    单人报名享{{ 100 - x.PriceMoney }}折优惠
+                    单人报名享
+                    <template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 3">
-                    双人报名享{{ 100 - x.PriceMoney }}折优惠
+                    双人报名享<template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 4">
-                    续费享{{ 100 - x.PriceMoney }}折优惠
+                    续费享<template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="remark-font" v-if="x.PriceDiscountType == 0">
                     暂无优惠政策

src/pages/studyAbroad/studyProAudit.vue

@@ -39,13 +39,32 @@
                 买{{ x.BuyNum }}送{{ x.SendNum }}
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 2">
-                单人报名享{{ 100 - x.PriceMoney }}折优惠
+                单人报名享
+                <template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template>
+                  {{x.PriceMoney}} 元
+                </template>
+                优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 3">
-                双人报名享{{ 100 - x.PriceMoney }}折优惠
+                双人报名享<template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template>
+                  {{x.PriceMoney}} 元
+                </template>
+                优惠
               </div>
               <div class="border-bottom" v-if="x.PriceDiscountType == 4">
-                续费享{{ 100 - x.PriceMoney }}折优惠
+                续费享<template v-if="x.PriceType==0">
+                  {{ 100 - x.PriceMoney }}折
+                </template>
+                <template>
+                  {{x.PriceMoney}} 元
+                </template>
+                优惠
               </div>
               <div class="remark-font" v-if="x.PriceDiscountType == 0">
                 暂无优惠政策

src/pages/studyAbroad/studyabroad.vue

@@ -53,13 +53,32 @@
                     买{{ x.BuyNum }}送{{ x.SendNum }}
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 2">
-                    单人报名享{{ 100 - x.PriceMoney }}折优惠
+                    单人报名享
+                    <template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 3">
-                    双人报名享{{ 100 - x.PriceMoney }}折优惠
+                    双人报名享<template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="border-bottom" v-if="x.PriceDiscountType == 4">
-                    续费享{{ 100 - x.PriceMoney }}折优惠
+                    续费享<template v-if="x.PriceType==0">
+                      {{ 100 - x.PriceMoney }}折
+                    </template>
+                    <template>
+                      {{x.PriceMoney}} 元
+                    </template>
+                    优惠
                   </div>
                   <div class="remark-font" v-if="x.PriceDiscountType == 0">
                     暂无优惠政策

src/pages/studyAbroad/supplier.vue

@@ -6,11 +6,16 @@
           <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="供应商名称"
             @clear="resetSearch" maxlength="20" />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Type" option-value="Id"
+            option-label="Name" :options="supplierTypeList" emit-value map-options label="类别" />
+        </div>
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
-        separator="none" :data="data" :columns="columns" row-key="name">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
+        row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">供应商信息</div>
           <q-space />
@@ -20,7 +25,17 @@
         </template>
         <template v-slot:body-cell-LinkAddress="props">
           <q-td>
-            <div style="width:300px;white-space:normal; word-break:break-all;">{{props.row.LinkAddress}}</div> 
+            <div style="width:300px;white-space:normal; word-break:break-all;">{{props.row.LinkAddress}}</div>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-CommissionType="props">
+          <q-td>
+            <template v-if="props.row.CommissionType==0">
+              {{props.row.CommissionMoney}} %
+            </template>
+            <template v-if="props.row.CommissionType==1">
+              ￥ {{props.row.CommissionMoney}} 元
+            </template>
           </q-td>
         </template>
         <template v-slot:body-cell-Id="props">
@@ -45,7 +60,8 @@
 <script>
   import {
     querySupplierPage,
-    deleteSupplier
+    deleteSupplier,
+    querySupplierType
   } from '../../api/studyabroad/index'
   import supplierForm from '../../components/studyAbroad/supplier-form'
 
@@ -62,7 +78,8 @@
           pageIndex: 1,
           pageSize: 10,
           rowsPerPage: 10,
-          Name: '' //供应商名称
+          Name: '', //供应商名称
+          Type: 0, //供应商类别
         },
         PageCount: 0, //总页数
         data: [],
@@ -75,6 +92,12 @@
             align: 'left',
             field: 'Name'
           },
+          {
+            name: 'TypeName',
+            label: '类别',
+            align: 'left',
+            field: 'TypeName'
+          },
           {
             name: 'LinkMan',
             label: '联系人',
@@ -93,6 +116,12 @@
             align: 'left',
             field: 'LinkAddress'
           },
+          {
+            name: 'CommissionType',
+            label: '返佣',
+            align: 'left',
+            field: 'CommissionType'
+          },
           {
             name: 'CreateByName',
             label: '创建人',
@@ -111,13 +140,30 @@
             field: 'Id'
           }
         ],
+        supplierTypeList: [], //供应商类型列表
       }
     },
+    created() {
+      this.getSupplierTypeList();
+    },
     mounted() {
       this.currentUrl = this.$route.path
       this.getsupplierpage()
     },
     methods: {
+      //获取供应商类型
+      getSupplierTypeList() {
+        querySupplierType().then(res => {
+          if (res.Code == 1) {
+            let obj = {
+              Name: '不限',
+              Id: 0
+            }
+            this.supplierTypeList = res.Data;
+            this.supplierTypeList.unshift(obj);
+          }
+        })
+      },
       //重新查询
       resetSearch() {
         this.msg.pageIndex = 1;