ZaiZai преди 2 години
родител
ревизия
b5f41d6c5f
променени са 2 файла, в които са добавени 7 реда и са изтрити 23 реда
  1. 2 1
      src/api/modules/people/salary.js
  2. 5 22
      src/views/people/salary.vue

+ 2 - 1
src/api/modules/people/salary.js

@@ -22,7 +22,8 @@ export default {
         return httpApi({
             url: '/api/blade-control/userpayinfo/export-template',
             method: 'get',
-            params: {}
+            params: {},
+            responseType: 'blob'
         }, false);
     },
 }

+ 5 - 22
src/views/people/salary.vue

@@ -36,32 +36,17 @@
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange"/>
         </template>
+
         <!--导入数据弹窗-->
         <HcDialog bgColor="#ffffff" widths="34rem" isToBody :show="importModal" title="导入数据"
                   @close="importModalClose" footer isRowFooter>
             <el-form label-position="top" label-width="auto" :model="formModel" size="large">
                 <el-form-item label="请选择导入薪酬所时间属范围:">
-                    <el-date-picker
-                        v-model="formModel.time"
-                        type="daterange"
-                        start-placeholder="起始时间"
-                        end-placeholder="结束时间"
-                        :default-time="defaultTime"
-                    />
+                    <el-date-picker v-model="formModel.time" type="daterange" start-placeholder="起始时间" end-placeholder="结束时间" :default-time="defaultTime"/>
                 </el-form-item>
             </el-form>
             <template #rightRowFooter>
-                <!-- <el-button type="primary" @click="toImportTempClick" size="large" class="ml-2">
-                            <HcIcon name="folder-upload"/>
-                            <span>上传excel</span>
-                </el-button> -->
-                <HcUploadFile
-                    ref="HcUploadFileRef"
-                    :options="UploadFileOptions"
-                    @progress="HcUploadFileProgress"
-                    @success="HcUploadFileSuccess"
-                    @change="HcUploadFileChange"
-                >
+                <HcUploadFile ref="HcUploadFileRef" :options="UploadFileOptions" @progress="HcUploadFileProgress" @success="HcUploadFileSuccess" @change="HcUploadFileChange">
                     <el-button type="primary" size="large" class="ml-2">
                         <HcIcon name="folder-upload"/>
                         <span>上传excel</span>
@@ -77,7 +62,7 @@
 </template>
 
 <script setup>
-import {onActivated, ref, watch} from 'vue'
+import {onActivated, ref} from 'vue'
 import {getuserList} from "~api/other";
 import mainApi from "~api/people/salary";
 import {getTokenHeader} from "~src/api/request/header";
@@ -166,13 +151,11 @@ const downloadXlsx = async () => {
 }
 
 
-
-
-
 const defaultTime = ref([
     new Date(2000, 1, 1, 0, 0, 0),
     new Date(2000, 2, 1, 23, 59, 59),
 ])
+
 //导入数据弹窗
 const importModal = ref(false)
 const importModalClose = () => {