2022.6.13

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,7 +1,7 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.9'
+// var ip = '47.100.37.243'
 // var ip = '192.168.2.30'
 
 var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -56,26 +56,25 @@
                 </el-form-item>  -->
                 <el-form-item style="float:right;" v-if="permissions.projectImport || permissions.projectExport || permissions.projectClassification || (user.company.packageProject == 1 && permissions.projectCostOfItems)">
                     <el-dropdown>
-                        <span class="el-dropdown-link">
-                            查看更多<i class="el-icon-arrow-down el-icon--right"></i>
-                        </span>
+                        <el-link type="primary" :underline="false">查看更多<i class="el-icon-arrow-down el-icon--right"></i></el-link>
+                        
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item v-if="permissions.projectImport">
                                 <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
-                                    <el-link :underline="false" >导入项目</el-link>
+                                    <el-link type="primary" :underline="false" >导入项目</el-link>
                                 </el-upload>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectImport">
-                                <el-link :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx">模板下载</el-link>
+                                <el-link type="primary" :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx">模板下载</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectExport">
-                                <el-link :underline="false" @click="exportProjectData" download="项目导出.xlsx">导出项目</el-link>
+                                <el-link type="primary" :underline="false" @click="exportProjectData" download="项目导出.xlsx">导出项目</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="user.company.packageProject == 1 && permissions.projectCostOfItems">
-                                <el-link :underline="false" @click="showBaseCostItemDialog">基线成本项</el-link>
+                                <el-link type="primary" :underline="false" @click="showBaseCostItemDialog">基线成本项</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectClassification">
-                                <el-link :underline="false" @click="showClfDialog = true">分类管理</el-link>
+                                <el-link type="primary" :underline="false" @click="showClfDialog = true">分类管理</el-link>
                             </el-dropdown-item>
                         </el-dropdown-menu>
                         </el-dropdown>

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

@@ -183,12 +183,17 @@
 
         
         <!-- 审核记录弹窗 -->
-        <el-dialog title="审核记录" :visible.sync="recordDialogVisible" width="800px" :before-close="handleClose">
+        <el-dialog title="审核记录" :visible.sync="recordDialogVisible" width="1000px" :before-close="handleClose">
             <div style="height: 430px">
                 <el-table :data="recordLists" style="width: 100%" height="400">
-                    <el-table-column prop="userName" label="操作人" width="150"></el-table-column>
-                    <el-table-column prop="indate" label="审核时间"></el-table-column>
-                    <el-table-column prop="result" label="审核结果"></el-table-column>
+                    <el-table-column prop="userName" label="操作人" width="120"></el-table-column>
+                    
+                    <el-table-column prop="indate" label="审核时间">
+                        <template slot-scope="scope">
+                            <span>{{tableIndateEdit(scope.row.indate)}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="result" label="审核结果" width="120"></el-table-column>
                     <el-table-column prop="date" label="员工/日期" width="200">
                         <template slot-scope="scope">
                             <div>
@@ -214,6 +219,7 @@
                             </div>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="projectName" label="项目" width="200" show-overflow-tooltip></el-table-column>
                     <el-table-column prop="date" label="操作" width="100">
                         <template slot-scope="scope">
                             <div>
@@ -239,7 +245,7 @@
         <!-- 审核记录撤销 -->
         <el-dialog title="请输入原因"  v-if="undoFormDialog" :visible.sync="undoFormDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <div>
-                <el-input type="textarea" v-model="undoForm.reason" rows="2" placeholder="请输入您决定撤销原因'" />
+                <el-input type="textarea" v-model="undoForm.reason" rows="2" placeholder="请输入您决定撤销的原因" />
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button  @click="undoFormDialog = false" >取消</el-button>
@@ -336,6 +342,15 @@
             }
         },
         methods: {
+            tableIndateEdit(row){
+                let indate = row[0] + '-' + (row[1] < 10 ? '0' + row[1] : row[1]) + '-' + (row[2] < 10 ? '0' + row[2] : row[2]) + ' ' + (row[3] < 10 ? '0' + row[3] : row[3]) + ':' + (row[4] < 10 ? '0' + row[4] : row[4])
+                if(row[5]){
+                    indate = indate + ':' + (row[5] < 10 ? '0' + row[5] : row[5])
+                }else{
+                    indate = indate + ':00'
+                }
+                return indate
+            },
             detailsClick(item, i) {
                 this.detailsDialog = true
                 this.detailsList = item.membdateList
@@ -372,8 +387,8 @@
             undoCli(item, i) {
                 console.log(item)
                 this.undoFormDialog = true
-                this.undoForm = {}
-                this.undoForm.reason = ''
+                this.undoForm = {reason: ''}
+                // this.undoForm.reason = ''
                 this.undoForm.hisId = item.id
                 this.ioss = i
                 // if(i == 0) {    

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -83,7 +83,7 @@
                     </van-popup>
 
                     <!-- 自定义数值 -->
-                    <van-field v-if="user.timeType.customDataActive==1" type="number" :disabled="!canEdit" v-model="item.customData" :label="user.timeType.customDataName" placeholder="请输入数字" :rules="user.timeType.customDataStatus ? [{ required: true, message: '请选择' + user.timeType.customDataName }] : []"></van-field> 
+                    <van-field v-if="user.timeType.customDataActive==1" type="number" :disabled="!canEdit" v-model="item.customData" :label="user.timeType.customDataName" placeholder="请输入数字" :rules="user.timeType.customDataStatus == 1 ? [{ required: true, message: '请输入' + user.timeType.customDataName }] : []"></van-field> 
                     <!-- 自定义文本 -->
                     <van-field v-if="user.timeType.customTextActive==1" :disabled="!canEdit" v-model="item.customText" :label="user.timeType.customTextName" placeholder="请输入" maxlength="25" :rules="user.timeType.customTextStatus ? [{ required: true, message: '请选择' + user.timeType.customTextName }] : []"></van-field> 
 

fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -3,17 +3,18 @@ const pxtorem = require("postcss-pxtorem");
 const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
-var ip = '192.168.2.30'
+// var ip = '47.100.37.243'
+// var ip = '192.168.2.30'
 // var ip = '127.0.0.1'
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 
 module.exports = {
     // 关闭eslint检查