修改

src/pages/studyAbroad/employment.vue

@@ -101,7 +101,7 @@
               @click="EditStudy(props.row)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
               @click="EditStudyPrice(props.row)" />
-            <q-btn v-if="props.row.SaleState==1&&props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
+            <q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
               style="font-weight:400" label="申请审核" @click="applyApply(props.row)" />
           </q-td>
         </template>

src/pages/studyAbroad/studyProAudit.vue

@@ -7,9 +7,9 @@
             @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select class="q-pb-lg q-pr-lg" filled stack-label
-            option-value="Id" option-label="Name" v-model="msg.SaleState" ref="SaleState" :options="saleDownList"
-            label="销售状态" :dense="false" emit-value map-options>
+          <q-select class="q-pb-lg q-pr-lg" filled stack-label option-value="Id" option-label="Name"
+            v-model="msg.SaleState" ref="SaleState" :options="saleDownList" label="销售状态" :dense="false" emit-value
+            map-options>
           </q-select>
         </div>
       </div>
@@ -18,22 +18,25 @@
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
         separator="none" :data="dataList" :columns="columns" row-key="name">
         <template v-slot:top="props">
-          <div class="col-2 q-table__title">留学信息</div>
+          <div class="col-2 q-table__title">留学就业审核信息</div>
           <q-space />
-          <!-- <div class="page-option">
-            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增留学" @click="EditStudy(null)" />
-          </div> -->
         </template>
         <template v-slot:body-cell-SupplierName="props">
           <q-td>
             <div>{{props.row.SupplierName}}</div>
             <div>
-              <a :href="props.row.SupplierContract" target="_blank" style="color:#2961FE;text-decoration:none;" v-if="props.row.SupplierContract">
+              <a :href="props.row.SupplierContract" target="_blank" style="color:#2961FE;text-decoration:none;"
+                v-if="props.row.SupplierContract">
                 查看合同
               </a>
             </div>
           </q-td>
         </template>
+        <template v-slot:body-cell-Type="props">
+          <q-td>
+            {{props.row.Type==1?"留学":"就业"}}
+          </q-td>
+        </template>
         <template v-slot:body-cell-PreferentialList="props">
           <q-td :props="props" style="padding-right:0px">
             <div v-for="x in props.value">
@@ -98,8 +101,8 @@
           <q-td :props="props">
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="详情"
               @click="EditStudy(props.row)" />
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="审核"
-              @click="applyApply(props.row)" />
+            <q-btn v-if="props.row.SaleState==2&&AuditType>0" flat size="xs" icon="edit" color="accent"
+              style="font-weight:400" label="审核" @click="applyApply(props.row)" />
           </q-td>
         </template>
         <template v-slot:bottom>
@@ -115,7 +118,8 @@
 
 <script>
   import {
-    queryStudyAbroadPage
+    queryStudyAbroadPage,
+    queryStudyAbroadAudit
   } from '../../api/studyabroad/index'
   import studyproauditForm from '../../components/studyAbroad/studyproaudit-form'
 
@@ -135,7 +139,7 @@
           rowsPerPage: 10,
           Name: "",
           IsQPrice: 1,
-          SaleState:0 //销售状态
+          SaleState: 2 //销售状态
         },
         dataList: [],
         loading: true,
@@ -145,6 +149,12 @@
             field: 'Name',
             align: 'left'
           },
+          {
+            name: 'Type',
+            label: '项目类型',
+            field: 'Type',
+            align: 'left'
+          },
           {
             name: 'SupplierName',
             label: '供应商',
@@ -206,27 +216,38 @@
         ],
         PageCount: 0,
         isShowStudy: false, //是否显示留学弹窗
-        Id:0,
-
-        saleDownList:[{
-          Id:0,
-          Name:'不限'
-        },{
-          Id:1,
-          Name:'销售中'
-        },{
-          Id:2,
-          Name:'已下架'
+        Id: 0,
+        saleDownList: [{
+          Id: 0,
+          Name: '不限'
+        }, {
+          Id: 1,
+          Name: '销售中'
+        }, {
+          Id: 2,
+          Name: '已下架'
         }], //销售状态下拉
+        AuditType: 0, //审核类型
       }
     },
     mounted() {
       this.getList();
     },
     created() {
-
+      this.queryStudy();
     },
     methods: {
+      queryStudy() {
+        queryStudyAbroadAudit({}).then(res => {
+          this.auditList = res.Data;
+          let userInfo = this.getLocalStorage();
+          this.auditList.forEach((x, index) => {
+            if (x.Id === userInfo.Id) {
+              this.AuditType = index + 1;
+            }
+          })
+        })
+      },
       //重新查询
       resetSearch() {
         this.msg.pageIndex = 1;
@@ -259,7 +280,7 @@
         this.isShowStudy = true;
       },
       //申请审核
-      applyApply(obj){
+      applyApply(obj) {
 
       }
     }

src/pages/studyAbroad/studyabroad.vue

@@ -101,7 +101,7 @@
               @click="EditStudy(props.row)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
               @click="EditStudyPrice(props.row)" />
-            <q-btn v-if="props.row.SaleState==1&&props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
+            <q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent"
               style="font-weight:400" label="申请审核" @click="applyApply(props.row)" />
           </q-td>
         </template>