各科

src/views/system/UserList.vue

@@ -114,9 +114,10 @@
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrls" @change="handleImportExcels" >
         <a-button type="primary" icon="import">薪资导入</a-button>
       </a-upload>
+      <a-button type="primary" icon="download" @click="handleExportXlst('员工假期')" v-has='"user:vation"'>假期导出</a-button>
       <a-button type="primary" icon="hdd" @click="recycleBinVisible=true" v-has='"user:recovery"'>回收站</a-button>
      
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <a-dropdown v-if="selectedRowKeys.length > 0&&selectionRows[0].employmentStatus==40">
         <a-menu slot="overlay" @click="handleMenuClick">
           <a-menu-item key="1" v-if="selectionRows[0].employmentStatus==40" v-has='"user:delete"'>
             <a-icon type="delete" @click="batchDel" />
@@ -373,6 +374,21 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
             dataIndex: 'entryDate',
             sorter: true
           },
+          
+          {
+            title: '试用期结束时间',
+            align: "center",
+            width: 120,
+            dataIndex: 'trialEndDate',
+            sorter: true
+          },
+          {
+            title: '合同到期时间',
+            align: "center",
+            width: 120,
+            dataIndex: 'cEndDate',
+            
+          },
           {
             title: '人员类别',
             align: "center",
@@ -402,6 +418,7 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
+            fixed: 'right',
             width: 170
           }
 
@@ -417,6 +434,7 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
           delete: "/sys/user/delete",
           deleteBatch: "/sys/user/deleteBatch",
           exportXlsUrl: "/sys/user/exportXls",
+          exportXlsUrls: "/sys/user/exportXlsts",
           importExcelUrl: "sys/user/importExcel",
           importExcelUrls:'sys/user/importExcels',
           pulldata:"/sys/weixin/pullData",
@@ -604,6 +622,33 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
           }
         })
       },
+      
+      handleExportXlst(fileName){
+        
+      
+        if(!fileName || typeof fileName != "string"){
+          fileName = "导出文件"
+        }
+        downFile(this.url.exportXlsUrls,this.queryParam).then((data)=>{
+          if (!data) {
+            this.$message.warning("文件下载失败")
+            return
+          }
+          if (typeof window.navigator.msSaveBlob !== 'undefined') {
+            window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
+          }else{
+            let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
+            let link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', fileName+'.xls')
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          }
+        })
+      },
       /* 导入 */
       handleImportExcels(info){
         if (info.file.status !== 'uploading') {
@@ -664,5 +709,5 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+  @import '~@assets/less/common.less';
 </style>

src/views/system/modules/StatutoryLeaveModal.vue

@@ -186,6 +186,9 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.id=record.id;
+        if(record.isF!=null&&record.isF!=""){
+          this.isF=record.isF;
+        }
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'name','sum'))
 		  //时间格式化
@@ -198,7 +201,7 @@
         this.$emit('close');
         this.visible = false;
         this.type="2";
-        this.isF='1';
+        this.isF='2';
       },
       handleOk () {
         const that = this;