From 51c35aedce240e407c0d6055b3eb97a64d749960 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Fri, 14 Feb 2025 18:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=B7=AE=E6=8A=A5=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process/eightMembers.js          |  9 +++++
 src/views/process/eightMembers/index.vue | 10 ++++--
 src/views/process/evection/index.vue     | 45 +++++++++++++++++++++---
 src/views/system/userInfo/index.vue      |  2 +-
 4 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/api/process/eightMembers.js b/src/api/process/eightMembers.js
index 990d7cd..54c4afd 100644
--- a/src/api/process/eightMembers.js
+++ b/src/api/process/eightMembers.js
@@ -27,3 +27,12 @@ export function getMoreOrgData(query) {
   })
 }
 
+// 导出
+export function exportEightMembers(query) {
+  return request({
+    url: '/system/proDeptRole/exportEightMembers',
+    method: 'get',
+    responseType: 'blob',
+    params: query
+  })
+}
diff --git a/src/views/process/eightMembers/index.vue b/src/views/process/eightMembers/index.vue
index caa1f33..adaef10 100644
--- a/src/views/process/eightMembers/index.vue
+++ b/src/views/process/eightMembers/index.vue
@@ -126,7 +126,7 @@
 </template>
 
 <script>
-import { getOrgEightRoleTable } from "@/api/process/eightMembers";
+import { getOrgEightRoleTable,exportEightMembers } from "@/api/process/eightMembers";
 import {
   treeselect as staffTreeselect,
   roleStaffTreeselect,
@@ -262,7 +262,13 @@ export default {
     },
     // 导出按钮
     onHandleExport() {
-      console.log("导出--");
+      exportEightMembers(this.queryParams).then(res => {
+        this.downloadFile({
+          fileName: `八大员统计报表_${new Date().getTime()}.xlsx`,
+          fileData: res,
+          fileType: 'application/vnd.ms-excel;charset=utf-8'
+        })
+      })
     },
   },
 };
diff --git a/src/views/process/evection/index.vue b/src/views/process/evection/index.vue
index 8c472e9..0dedd06 100644
--- a/src/views/process/evection/index.vue
+++ b/src/views/process/evection/index.vue
@@ -368,10 +368,10 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="是否高原：" prop="isOutside">
-              <el-radio-group>
+            <el-form-item label="是否高原：" prop="isPlateau">
+              <el-radio-group v-model="form.isPlateau">
                 <el-radio
-                  v-for="item in isOutsideList"
+                  v-for="item in isPlateauList"
                   :key="item.id"
                   :label="item.id"
                   >{{ item.name }}
@@ -379,6 +379,17 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12" v-if="form.isPlateau == 1">
+            <el-form-item label="高原补贴:" prop="plateauSubsidy">
+              <el-select v-model="form.plateauSubsidy"  filterable  placeholder="请选择高原补贴" clearable style="width: 100%;">
+                <el-option v-for="dict in dict.type.plateau_subsidy" :key="dict.value" :label="dict.label"
+                           :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
         </el-row>
 
         <el-row>
@@ -544,6 +555,21 @@
           </el-col>
         </el-row>
 
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否高原：" prop="isPlateau">
+              <el-radio-group v-model="form.isPlateau" :disabled="true">
+                <el-radio
+                  v-for="item in isPlateauList"
+                  :key="item.id"
+                  :label="item.id"
+                >{{ item.name }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="出差事由：" prop="leaveReason">
@@ -595,7 +621,7 @@ import { getDaysDate } from "@/api/process/leaveReporting";
 
 export default {
   name: "Evection",
-  dicts: ["apply_status"],
+  dicts: ["plateau_subsidy"],
   components: { Treeselect },
   data() {
     return {
@@ -628,6 +654,10 @@ export default {
         { id: "0", name: "否" },
         { id: "1", name: "是" },
       ],
+      isPlateauList: [
+        { id: "0", name: "否" },
+        { id: "1", name: "是" },
+      ],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -688,6 +718,12 @@ export default {
         isXizang: [
           { required: true, message: "是否西藏同意不能为空", trigger: "blur" },
         ],
+        isPlateau: [
+          { required: true, message: "是否高原同意不能为空", trigger: "blur" },
+        ],
+        plateauSubsidy: [
+          { required: true, message: "高原补贴不能为空", trigger: "blur" },
+        ],
         hostUserId: [
           {
             required: true,
@@ -805,6 +841,7 @@ export default {
         isAgree: "0",
         isOutside: "0",
         isXizang: "0",
+        isPlateau: "0",
         hostUserId: [],
         orgHeadUserIdList: [],
         travelers: [],
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index c402d2e..356f61f 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -139,7 +139,7 @@
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="岗位名称" prop="postIds">
-                        <el-select v-model="form.postIds" multiple  placeholder="人员岗位" clearable style="width: 100%;">
+                        <el-select v-model="form.postIds" multiple filterable  placeholder="人员岗位" clearable style="width: 100%;">
                           <el-option v-for="dict in dict.type.post_list" :key="dict.value" :label="dict.label"
                           :value="dict.value"></el-option>
                         </el-select>