页面修改

src/pages/studyAbroad/employment.vue

@@ -12,6 +12,16 @@
             map-options @input="resetSearch">
           </q-select>
         </div>
+        <div class="col-3">
+          <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
+            v-model="msg.ProductType" :options="productList" label="产品类型" :dense="false" emit-value map-options
+            @input="resetSearch" />
+        </div>
+        <div class="col-3">
+          <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="ID" option-label="Name"
+            v-model="msg.StudyCountryId" :options="CountryList" label="就业国家" :dense="false" emit-value map-options
+            @input="resetSearch" />
+        </div>
       </div>
     </div>
     <div class="page-content">
@@ -31,7 +41,7 @@
               <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
                 :icon="props.row.expand ? 'remove' : 'add'" />
             </q-td>
-            
+
             <q-td key="ProductTypeName" :props="props" style="width:100px;">
               {{props.row.ProductTypeName}}
             </q-td>
@@ -68,8 +78,6 @@
             <q-td key="SellPrice" :props="props">
               {{props.row.SellPrice}}
             </q-td>
-
-
             <q-td key="B2CRatio" :props="props">
               {{props.row.B2CRatio}}%
             </q-td>
@@ -79,7 +87,7 @@
             <q-td key="B2BRebateRatio" :props="props">
               {{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
-             <q-td key="B2BReNewRatio" :props="props">
+            <q-td key="B2BReNewRatio" :props="props">
               {{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
             <q-td key="SchoolRebateRatio" :props="props">
@@ -97,7 +105,7 @@
             <q-td key="InnerRecommendRatio" :props="props">
               {{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
-   
+
             <q-td key="InnerRecommendReNewRatio" :props="props">
               {{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
             </q-td>
@@ -195,7 +203,7 @@
                 <div class="remark-font">暂无佣金信息</div>
               </div>
             </q-td> -->
-            
+
             <q-td key="Id" style="width:200px;">
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                 @click="EditStudy(props.row)" />
@@ -275,10 +283,14 @@
     queryStudyAbroadPage,
     saveSaleState,
     querySaleStateList,
-    deleteStudyAbroad
+    deleteStudyAbroad,
+    queryStudyAbroadProductType
   } from '../../api/studyabroad/index'
+  import {
+    queryCountryList
+  } from '../../api/common/common'
   import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
-    // import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
+  // import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
   import studyAbroadpriceForm from '../../components/studyAbroad/newstudyAbroadprice-form'
   import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
   import {
@@ -302,7 +314,9 @@
           rowsPerPage: 10,
           Name: "",
           IsQPrice: 1,
-          SaleState: "" //销售状态
+          SaleState: "", //销售状态
+          ProductType: "", //产品类型
+          StudyCountryId: "", //国家编号
         },
         dataList: [],
         loading: true,
@@ -311,7 +325,7 @@
             label: '备注',
             field: 'Remark',
             align: 'left'
-          }, 
+          },
           {
             name: 'ProductTypeName',
             label: '类型',
@@ -324,7 +338,7 @@
             field: 'Name',
             align: 'left'
           },
-           {
+          {
             name: 'SaleStateName',
             label: '销售状态',
             field: 'SaleStateName',
@@ -355,7 +369,7 @@
           //   align: 'left',
           //   field: row => row.SuggestPrice.toFixed(2)
           // },
-      
+
           {
             name: 'SellPrice',
             label: '实际卖价',
@@ -363,7 +377,7 @@
             align: 'left',
             field: row => row.SellPrice.toFixed(2)
           },
-           {
+          {
             name: "B2CRatio",
             required: true,
             label: "直客优惠",
@@ -475,7 +489,7 @@
           //   align: "left",
           //   field: row => row.PreferentialList
           // },
-        
+
           {
             name: 'Id',
             label: '操作',
@@ -495,6 +509,8 @@
         isShowStudyPrice: false, //是否显示价格设置
         saleDownList: [], //销售状态下拉
         isShowInfo: false, //是否显示审核信息
+        productList: [], //产品类型列表
+        CountryList: [], //国家列表
       }
     },
     computed: mapState({
@@ -530,11 +546,27 @@
     },
     created() {
       this.getSaleStateList();
+      this.getCountryList();
+      this.getProductType();
       if (!this.isHaveViewSupplierAction) {
         this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
       }
     },
     methods: {
+      //获取国家列表
+      getCountryList() {
+        queryCountryList({}).then(res => {
+          if (res.Code == 1) {
+            this.CountryList = res.Data;
+          }
+        });
+      },
+      //获取产品类型列表
+      getProductType() {
+        queryStudyAbroadProductType({}).then(res => {
+          this.productList = res.Data;
+        });
+      },
       //删除留学就业产品
       removeStudy(item, status) {
         let delMsg = {