yuansh 9 months ago
parent
commit
1d187bdb37

+ 2 - 1
src/utils/request.js

@@ -15,7 +15,8 @@ console.log("baseProject= ",baseProject)
 const service = axios.create({
   //baseURL: '/jeecg-boot',
   baseURL: baseProject, // api base_url
-  timeout: 9000 // 请求超时时间
+  // timeout: 119000 // 请求超时时间
+  timeout: 60000 // 请求超时时间
 })
 
 const err = (error) => {

+ 1 - 1
src/views/dashboard/MyoaTabs.vue

@@ -89,7 +89,7 @@ export default {
                         columnWidth: [150, 190,190, 190, 120, 300],
                         align: ['center'],
                         rowNum: 5,
-                        waitTime: 9000,
+                        waitTime: 30000,
                         data: scrollData // 双向绑定(轮播表数据 绑定到配置的 data数据中)
                     }
                 }

+ 14 - 1
src/views/oa/salary_management/personnelSalary/Payroll.vue

@@ -65,7 +65,7 @@
       <div class="table-operator">
         <a-button @click="createPayroll" type="primary" icon="plus">生成工资单</a-button>
         <a-button @click="addPayroll" type="primary" icon="plus">导入</a-button>
-        <a-button @click="daochu" type="primary" icon="plus">导出明细</a-button>
+        <!-- <a-button @click="daochu" type="primary" icon="plus">导出明细</a-button> -->
       </div>
 
   
@@ -268,6 +268,19 @@
           this.spinning = false
           this.$message.warning('执行失败,请联系系统管理员'+st)
         },
+        // tempChange(){
+        //   // console.log("=====================执行开始-五月考勤 - 森语");
+          
+        //   // let par = {"excelName":"五月考勤 - 马菲羊","month":"2024-05"}
+        //   // let par = {"excelName":"五月考勤 - 正织","month":"2024-05"}
+        //   // let par = {"excelName":"五月考勤 - 森语","month":"2024-05"}
+          
+        //   // getAction('/salary/salaryManagement/tempChange',par).then(res=>{
+        //   //   console.log("=====================执行结束");
+        //   // })
+          
+          
+        // },
         daochu(){
           this.spinning = true
           downFile('/salary/salaryManagement/exportXls99',{}).then(data => {