新增接口

src/api/studyabroad/index.js

@@ -70,6 +70,18 @@ export function queryStudyAbroadPage(data) {
 }
 
 
+/**
+ * 获取留学就业审核分页列表
+ */
+export function queryStudyAbroadAuditPage(data) {
+    return request({
+        url: '/StudyAbroad/GetStudyAbroadAuditPage',
+        method: 'post',
+        data
+    })
+}
+
+
 /**
  * 获取留学就业列表
  */

src/pages/studyAbroad/studyProAudit.vue

@@ -6,6 +6,18 @@
           <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 class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
+            v-model="msg.Type" ref="Type" :options="studyAbroadList" label="类型" :dense="false" emit-value map-options
+            @input="resetSearch">
+          </q-select>
+        </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.AuditState" ref="AuditState" :options="AuditStateList" label="审核状态" :dense="false" emit-value
+            map-options @input="resetSearch">
+          </q-select>
+        </div>
       </div>
     </div>
     <div class="page-content">
@@ -113,8 +125,17 @@
         </template>
         <template v-slot:body-cell-Id="props">
           <q-td :props="props">
-            <q-btn v-if="props.row.SaleState==2&&msg.AuditType>0" flat size="xs" icon="edit" color="accent"
-              style="font-weight:400" label="审核" @click="EditStudy(props.row)" />
+            <!--部门主管审核-->
+            <template v-if="AuditType==1">
+              <q-btn v-if="props.row.SaleState==2&&props.row.DirectorStatus==0" flat size="xs" icon="edit"
+                color="accent" style="font-weight:400" label="审核" @click="AuditStudy(props.row)" />
+            </template>
+            <!--部门负责人审核-->
+            <template v-if="AuditType==2">
+              <q-btn v-if="props.row.SaleState==2&&props.row.DirectorStatus==1&&props.row.ManagerStatus==0" flat
+                size="xs" icon="edit" color="accent" style="font-weight:400" label="审核"
+                @click="AuditStudy(props.row)" />
+            </template>
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="详情"
               @click="getviewInfo(props.row)" />
           </q-td>
@@ -124,16 +145,16 @@
             :input="true" @input="changePage" />
         </template>
       </q-table>
-      <studyproaudit-form v-if="isShowStudy" :Id="Id" @close="closeStudyForm" @success="refreshPage()">
+      <studyproaudit-form v-if="isShowStudyAudit" :Id="studyObj.Id" @close="closeStudyForm" @success="refreshPage()">
       </studyproaudit-form>
-      <studyproauditinfo-form v-if="isShowInfo" :Id="Id" @close="closeStudyInfo"></studyproauditinfo-form>
+      <studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyInfo"></studyproauditinfo-form>
     </div>
   </div>
 </template>
 
 <script>
   import {
-    queryStudyAbroadPage
+    queryStudyAbroadAuditPage
   } from '../../api/studyabroad/index'
   import studyproauditForm from '../../components/studyAbroad/studyproaudit-form'
   import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
@@ -157,8 +178,7 @@
           rowsPerPage: 10,
           Name: "",
           IsQPrice: 1,
-          SaleState: 2, //销售状态
-          AuditType: 0, //审核类型(1-部门主管审核,2-部门负责人审核)
+          Type: "", //项目类型
           AuditState: 1, //审核状态(1-待审核,2-已审核)
         },
         dataList: [],
@@ -234,17 +254,37 @@
             field: 'Id'
           }
         ],
+        //审核类型
+        AuditStateList: [{
+            Id: 1,
+            Name: "待审核"
+          },
+          {
+            Id: 2,
+            Name: "已审核"
+          },
+        ],
+        //项目类型列表
+        studyAbroadList: [{
+            Id: 1,
+            Name: "留学"
+          },
+          {
+            Id: 2,
+            Name: "就业"
+          },
+        ],
         //表格可见列
         visibleColumns: [
-          'Name','Type','SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Name', 'Type', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列
         PageCount: 0,
-        isShowStudy: false, //是否显示留学弹窗
-        Id: 0,
-        currentUserId: 0, //当前用户登录Id
-        isShowInfo: false
+        isShowStudyAudit: false, //是否显示留学就业审核弹窗
+        isShowInfo: false, //是否显示详情
+        studyObj: {}, //留学就业申请对象
+        AuditType: 0, //1-部门主管审核,2-部门负责人审核
       }
     },
     computed: mapState({
@@ -280,12 +320,11 @@
     },
     created() {
       let userInfo = this.getLocalStorage();
-      this.currentUserId = userInfo.Id;
       let StudyAbroadObj = userInfo.StudyAbroadObj;
       if (StudyAbroadObj && StudyAbroadObj.length > 0) {
         StudyAbroadObj.forEach(x => {
           if (x.Id === userInfo.Id) {
-            this.msg.AuditType = x.AuditType
+            this.AuditType = x.AuditType
           }
         })
       }
@@ -302,7 +341,7 @@
       //获取留学分页列表
       getList() {
         this.loading = true;
-        queryStudyAbroadPage(this.msg).then(res => {
+        queryStudyAbroadAuditPage(this.msg).then(res => {
             this.loading = false;
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
@@ -317,26 +356,27 @@
       },
       //关闭弹窗
       closeStudyForm() {
-        this.isShowStudy = false;
+        this.isShowStudyAudit = false;
       },
       closeStudyInfo() {
         this.isShowInfo = false;
       },
-      //编辑留学
-      EditStudy(obj) {
-        this.Id = obj.Id;
-        this.isShowStudy = true;
+      //留学就业审核
+      AuditStudy(obj) {
+        this.studyObj = obj;
+        this.isShowStudyAudit = true;
       },
       refreshPage() {
         this.getList();
       },
-      //申请审核
+      //审核详情
       getviewInfo(obj) {
-        this.Id = obj.Id;
+        this.studyObj = obj;
         this.isShowInfo = true;
       }
     }
   }
+
 </script>
 <style scoped>
   .border-bottom {