ZaiZai %!s(int64=2) %!d(string=hai) anos
pai
achega
43aeaf2ec8
Modificáronse 4 ficheiros con 15 adicións e 15 borrados
  1. 1 1
      .gitignore
  2. 1 1
      public/version.json
  3. 0 8
      src/api/modules/people/salary.js
  4. 13 5
      src/views/people/salary.vue

+ 1 - 1
.gitignore

@@ -7,4 +7,4 @@ node_modules
 dist
 zip
 
-public/version.json
+version.json

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20230707173106"
+  "value": "20230707182023"
 }

+ 0 - 8
src/api/modules/people/salary.js

@@ -9,14 +9,6 @@ export default {
             params: form
         }, msg);
     },
-    //导入薪酬管理
-    async importUserpay(form, msg = true) {
-        return httpApi({
-            url: '/api/blade-control/userpayinfo/import-userpay',
-            method: 'post',
-            data: form
-        }, msg);
-    },
     //导出模板
     async exportTemplate() {
         return httpApi({

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

@@ -42,7 +42,7 @@
                   saveText="上传excel" @close="importModalClose" @save="importModalSave"
         >
             <div class="w-full">
-                <el-date-picker v-model="uploadTime" type="monthrange" start-placeholder="开始月份" end-placeholder="结束月份" size="large" style="width: 100%;"/>
+                <el-date-picker v-model="uploadParams.dateInfo" class="block" type="month" size="large" format="YYYY-MM" value-format="YYYY-MM"/>
             </div>
         </HcDialog>
         <!--上传控件-->
@@ -146,8 +146,11 @@ const uploadTime = ref(null)
 
 //上传配置
 const uploadFileRef = ref(null)
-const uploadParams = ref({})
+const uploadParams = ref({
+    dateInfo: null
+})
 const uploadOptions = {
+    url: '/api/blade-control/userpayinfo/import-userpay',
     headers: getTokenHeader(),
     multiple: false,
     size: 50
@@ -161,14 +164,19 @@ const toImportTempClick = () => {
 
 //导入数据弹窗保存
 const importModalSave = () => {
-    uploadParams.value = {
-        month: uploadTime.value
+    if(uploadParams.value.dateInfo) {
+        uploadFileRef.value?.selectFile()
+    } else {
+        window.$message?.error('请先选择月份')
     }
 }
 
 // 文件上传成功的回调
 const uploadFileSuccess = () => {
-
+    window.$message?.success('导入成功')
+    uploadFileRef.value?.setModalShow(false)
+    importModalClose()
+    getTableData()
 }
 
 //导入数据弹窗关闭