公司制度

public/version.json

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

src/views/people/salary.vue

@@ -38,26 +38,15 @@
         </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-form-item>
-            </el-form>
-            <template #rightRowFooter>
-                <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>
-                    </el-button>
-                </HcUploadFile>
-                <el-button type="primary" @click="importModalClose" size="large" class="ml-2">
-                    <HcIcon name="close-circle"/>
-                    <span>取消</span>
-                </el-button>
-            </template>
+        <HcDialog bgColor="#ffffff" widths="26rem" isToBody :show="importModal" title="导入数据"
+                  saveText="上传excel" @close="importModalClose" @save="importModalSave"
+        >
+            <div class="w-full">
+                <el-date-picker class="block" v-model="uploadTime" type="monthrange" start-placeholder="开始月份" end-placeholder="结束月份" size="large"/>
+            </div>
         </HcDialog>
+        <!--上传控件-->
+        <HcUploadFile ref="uploadFileRef" :options="uploadOptions" :params="uploadParams" @success="uploadFileSuccess"/>
     </HcCard>
 </template>
 
@@ -151,46 +140,42 @@ 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 = () => {
-    importModal.value = false
+const uploadTime = ref(null)
+
+//上传配置
+const uploadFileRef = ref(null)
+const uploadParams = ref({})
+const uploadOptions = {
+    headers: getTokenHeader(),
+    multiple: false,
+    size: 50
 }
-const formModel = ref({})
 
+//打开导入数据弹窗
 const toImportTempClick = () => {
+    uploadTime.value = null
     importModal.value = true
-
-}
-//上传配置
-const UploadFileOptions = {
-    //此处设置header
-    headers: getTokenHeader(),
 }
 
-// 文件上传进度
-const HcUploadFileProgress = (res) => {
-    console.log('文件上传进度', res)
+//导入数据弹窗保存
+const importModalSave = () => {
+    //uploadParams
 }
 
-const HcUploadFileRef = ref(null)
 // 文件上传成功的回调
-const HcUploadFileSuccess = (res) => {
-    HcUploadFileRef.value?.setModalShow(false);
-    importModal.value = false
-    getTableData()
+const uploadFileSuccess = () => {
 
 }
 
-// 文件全部上传成功
-const HcUploadFileChange = () => {
-    console.log('文件全部上传成功')
+//导入数据弹窗关闭
+const importModalClose = () => {
+    uploadTime.value = null
+    importModal.value = false
 }
 </script>
+
 <style lang='scss' scoped>
+
 </style>