Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/studyabroad/index.js

@@ -247,4 +247,15 @@ export function querySupplierType() {
         method: 'post',
         data
     })
+}
+
+/**
+ * 留学就业类型列表(下拉使用)
+ */
+export function GetStudyabroadTypeList(data) {
+    return request({
+        url: '/StudyAbroad/GetStudyabroadTypeList',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file

src/components/studyAbroad/studyAbroad-form.vue

@@ -22,17 +22,16 @@
               style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
           </div>
           <div class="col-6">
-            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ProductType"
-              ref="ProductType" :options="productList" label="产品类型" :dense="false" class="col-6 q-pb-lg" emit-value
+            <q-select filled stack-label option-value="ID" @input="getCountry(objOption.StudyCountryId)" option-label="Name" v-model="objOption.StudyCountryId"
+              ref="StudyCountryId" :options="CountryList" label="留学国家" :dense="false" class="col-6 q-pb-lg" emit-value
               map-options />
           </div>
         </div>
          <div class="row wrap">
           <div class="col-6">
-            <q-select filled stack-label option-value="ID" option-label="Name" v-model="objOption.StudyCountryId"
-              ref="StudyCountryId" :options="CountryList" label="留学国家" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
+            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ProductType"
+              ref="ProductType" :options="productList" label="产品类型" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value
               map-options />
-            
           </div>
           <div class="col-6">
         
@@ -74,7 +73,8 @@
     saveStudyAbroad,
     queryStudyAbroadInfo,
     querySupplierList,
-    queryStudyAbroadProductType
+    queryStudyAbroadProductType,
+    GetStudyabroadTypeList
   } from '../../api/studyabroad/index'
   import {
     UploadSelfFile,
@@ -113,7 +113,7 @@
           Remark: '', //备注
           School_Id: -1, //所属校区
           ImgCover: '', //封面图
-          ProductType: 1, //产品类型
+          ProductType: '', //产品类型
           StudyFeature: "", //课程特色
           StudyCountryId:"",//留学国家
         },
@@ -128,6 +128,11 @@
         },
         SchoolList: [], //校区列表
         CountryList:[],//国家列表
+        TypeMsg:{
+          Name:"",
+          Type:1,
+          CountryId:0
+        }
       }
     },
     computed: mapState({
@@ -147,7 +152,7 @@
     }),
     created() {
       this.getSchool();
-      this.getProductList();
+      // this.getProductList();
       this.getCountryList()
     },
     mounted() {
@@ -171,9 +176,16 @@
       getEditValue(obj) {
         this.objOption.Remark = obj;
       },
+      //选择国家
+      getCountry(CountryId){
+        this.objOption.ProductType = '';
+        this.getProductList(CountryId);
+      },
       //获取产品类型列表
-      getProductList() {
-        queryStudyAbroadProductType({}).then(res => {
+      getProductList(CountryId) {
+        this.TypeMsg.CountryId = CountryId;
+        GetStudyabroadTypeList(this.TypeMsg).then(res => {
+          console.log(res,'书记');
           if (res.Code == 1) {
             this.productList = res.Data
           }
@@ -219,6 +231,9 @@
                 this.objOption.ProductType = tempObj.ProductType;
                 this.objOption.StudyFeature = tempObj.StudyFeature;
                 this.objOption.StudyCountryId=tempObj.StudyCountryId;
+                if(this.objOption.StudyCountryId){
+                  this.getProductList(this.objOption.StudyCountryId);
+                }
               }
             }
           })
@@ -230,7 +245,7 @@
           this.objOption.SupplierContract = '';
           this.objOption.Remark = '';
           this.objOption.School_Id = -1;
-          this.objOption.ProductType = 1;
+          this.objOption.ProductType = '';
           this.objOption.StudyFeature = "";
           this.objOption.StudyCountryId="";
         }

src/pages/studyAbroad/studyabroad.vue

@@ -3,7 +3,7 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="项目名称"
+          <q-input @input="resetSearch" clearable filled v-model="msg.Name" label="项目名称"
             @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">

src/pages/system/stuReceiveChannel.vue

 <template>
   <div>
     <div class="row q-my-sm">
-      <q-input filled v-model="msg.Name" label="收客渠道" class="col-3" @input="refreshPage"/>
+      <q-input filled v-model="msg.Name" dense label="收客渠道" class="col-3" @input="refreshPage"/>
     </div>
     <q-table
       :pagination="msg"
       :loading="loading"
       no-data-label="暂无相关数据"
       flat
-      class="sticky-column-table no-bottom-table"
+      class="sticky-column-table"
       separator="none"
       :data="dataList"
       :columns="columns"
@@ -116,9 +116,9 @@ export default {
         }
       ],
       msg: {
-        rowsPerPage: 10,
+        rowsPerPage: 12,
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 12,
         Name: ""
       },
       dataList: [],

src/pages/system/studyAim.vue

 <template>
   <div>
     <div class="row q-my-sm">
-      <q-input filled v-model="msg.Name" label="学习目的" class="col-3" @input="refreshPage"/>
+      <q-input filled v-model="msg.Name" dense label="学习目的" class="col-3" @input="refreshPage"/>
     </div>
     <q-table
       :pagination="msg"
       :loading="loading"
       no-data-label="暂无相关数据"
       flat
-      class="sticky-column-table no-bottom-table"
+      class="sticky-column-table"
       separator="none"
       :data="dataList"
       :columns="columns"
@@ -116,9 +116,9 @@ export default {
         }
       ],
       msg: {
-        rowsPerPage: 10,
+        rowsPerPage: 12,
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 12,
         Name: ""
       },
       dataList: [],