优化工时记录和财务核算成本

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -6,7 +6,7 @@
                 <!-- <el-form-item label="财务核算成本 | 月份选择" style="margin-top:5px;"> -->
                 <el-form-item label="月份选择" style="margin-top:5px;">
                 <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM" @change="changeMonth" :clearable="false" type="month" placeholder="选择月份" style="margin-right: 20px"></el-date-picker>
-                <el-link type="primary" :underline="false" @click="audits()">{{revaelse}}</el-link>
+                <el-link type="primary" :underline="false" @click="audits()" v-if="user.timeType.financeAudit == '1'">{{revaelse}}</el-link>
             </el-form-item>
             <!-- <el-radio-group v-model="radio" @change="switchList" style="margin-left:160px;margin-top:5px;"> -->
             <el-radio-group v-model="radio" @change="switchList" style="margin-left:80px;margin-top:5px;">
@@ -31,7 +31,7 @@
             <el-form-item style="float:right;" v-if="user.role == 1 || user.role == 2 || user.role == 4">
                 <el-link type="primary" :underline="false" @click="showItemDialog">自定义薪资项</el-link>
             </el-form-item>
-            <el-form-item style="float:right;" v-if="user.role == 1 || user.role == 2 || user.role == 4">
+            <el-form-item style="float:right;" v-if="(user.role == 1 || user.role == 2 || user.role == 4) && user.timeType.financeAudit == '1'">
                 <el-link type="primary" :underline="false" @click="reviewerVisible = true">设置审核人</el-link>
             </el-form-item>
             </el-form>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1261,11 +1261,13 @@
         },
         methods: {
             addUpload(data) {
-                var zhi = data.fileName.split('.')[0]
-                var sss = zhi + '.xlsx'
+                // var zhi = data.fileName.split('.')[0]
+                // var sss = zhi + '.xlsx'
+                // console.log(sss, data)
+                // return
                 var filePath = '/upload/' + data.serverName;
                 const a = document.createElement('a'); // 创建a标签
-                a.setAttribute('download', sss);// download属性
+                a.setAttribute('download', data.fileName);// download属性
                 a.setAttribute('href', filePath);// href链接
                 a.click(); //自执行点击事件
                 a.remove();