修改

src/components/studyAbroad/studyAbroad-form.vue

@@ -21,13 +21,13 @@
             <a v-if="objOption.SupplierContract&&isHaveViewContractAction"
               style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
           </div>
-          <div class="col-6">
+          <div class="col-6" v-if="Type==1">
             <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="row wrap" v-if="Type==1">
           <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 q-pr-lg" emit-value

src/pages/sale/studyjob.vue

@@ -226,6 +226,18 @@
             field: 'Name',
             align: 'left'
           },
+          {
+            name:'ProductTypeName',
+            label:'类型',
+            field: 'ProductTypeName',
+            align: 'left'
+          },
+          {
+            name:'StudyCountryName',
+            label:'留学国家',
+            field: 'StudyCountryName',
+            align: 'left'
+          },
           {
             name: 'Type',
             label: '项目类型',
@@ -381,7 +393,7 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Name', 'Type', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Name', 'ProductTypeName', 'StudyCountryName','Type', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id',
         ], //可见列

src/pages/studyAbroad/employment.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">
@@ -42,9 +42,9 @@
                 :icon="props.row.expand ? 'remove' : 'add'" />
             </q-td>
 
-            <q-td key="ProductTypeName" :props="props" style="width:100px;">
+            <!-- <q-td key="ProductTypeName" :props="props" style="width:100px;">
               {{props.row.ProductTypeName}}
-            </q-td>
+            </q-td> -->
             <q-td key="Name" :props="props" style="width:100px;">
               {{props.row.Name}}
             </q-td>
@@ -66,9 +66,9 @@
                 </a>
               </div>
             </q-td>
-            <q-td key="StudyCountryName" :props="props">
+            <!-- <q-td key="StudyCountryName" :props="props">
               {{props.row.StudyCountryName}}
-            </q-td>
+            </q-td> -->
             <q-td key="SchoolName" :props="props">
               {{props.row.SchoolName}}
             </q-td>
@@ -326,12 +326,12 @@
             field: 'Remark',
             align: 'left'
           },
-          {
-            name: 'ProductTypeName',
-            label: '类型',
-            field: 'ProductTypeName',
-            align: 'left'
-          },
+          // {
+          //   name: 'ProductTypeName',
+          //   label: '类型',
+          //   field: 'ProductTypeName',
+          //   align: 'left'
+          // },
           {
             name: 'Name',
             label: '项目名称',
@@ -350,12 +350,12 @@
             field: 'SupplierName',
             align: 'left'
           },
-          {
-            name: 'StudyCountryName',
-            label: '留学国家',
-            field: 'StudyCountryName',
-            align: 'left'
-          },
+          // {
+          //   name: 'StudyCountryName',
+          //   label: '留学国家',
+          //   field: 'StudyCountryName',
+          //   align: 'left'
+          // },
           {
             name: 'SchoolName',
             label: '所属校区',