2022.5.10 14：05

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,18 +1,18 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.24'
+// var ip = '192.168.2.24'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
-// 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 = {
   build: {

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

@@ -190,9 +190,9 @@
             </div>
           </div>
             <el-table v-loading="loading" :data="tableData" style="width: 100%" height="90%">
-                <el-table-column prop="ownerName" label="请假人" width="120" fixed="left"></el-table-column>
-                <el-table-column prop="tel" label="电话" width="120"></el-table-column>
-                <el-table-column prop="leaveType" label="请假类型" width="120">
+                <el-table-column prop="ownerName" label="请假人" min-width="120" fixed="left"></el-table-column>
+                <el-table-column prop="tel" label="电话" min-width="120"></el-table-column>
+                <el-table-column prop="leaveType" label="请假类型" min-width="120">
                   <template slot-scope="scope">
                     <!-- <div v-if="scope.row.leaveType == 0">事假</div>
                     <div v-if="scope.row.leaveType == 1">病假</div>
@@ -201,20 +201,20 @@
                     {{qjType[scope.row.leaveType].name}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="startDate" label="请假开始时间" width="150"></el-table-column>
-                <el-table-column prop="endDate" label="请假结束时间" width="150"></el-table-column>
-                <el-table-column label="请假天数" width="120">
+                <el-table-column prop="startDate" label="请假开始时间" min-width="150"></el-table-column>
+                <el-table-column prop="endDate" label="请假结束时间" min-width="150"></el-table-column>
+                <el-table-column label="请假天数" min-width="120">
                   <template slot-scope="scope">
                     <div v-if="scope.row.timeType == '1'">/</div>
                     <div v-else>{{scope.row.timeDays}}天</div>
                   </template>
                 </el-table-column>
-                <el-table-column label="请假时长" width="120">
+                <el-table-column label="请假时长" min-width="120" v-if="!user.timeType.syncDingding">
                   <template slot-scope="scope">
                     <div>{{scope.row.timeHours}}小时</div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="status" label="状态" width="100">
+                <el-table-column prop="status" label="状态" min-width="100">
                   <template slot-scope="scope">
                     <div v-if="scope.row.status == 0 || scope.row.status == 1 || scope.row.status == 2 || scope.row.status == 3 || scope.row.status == 4">
                       <div v-if="scope.row.status == 0" >审核通过</div>
@@ -227,7 +227,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="remark" label="备注" width="200">
+                <el-table-column prop="remark" label="备注" min-width="200" header-align="center">
                   <template slot-scope="scope">
                     <!-- <div class="apls">{{scope.row.remark}}</div> -->
                     <el-popover placement="top-start" title="标题" width="200" trigger="hover" :content="scope.row.remark">
@@ -235,7 +235,7 @@
                     </el-popover>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right" v-if="isAuditList && !isDingding">
+                <el-table-column label="操作" min-width="180" fixed="right" v-if="isAuditList && !isDingding">
                     <template slot-scope="scope">
                       <div>
                         <el-button icon="el-icon-check" circle size="mini" @click.stop.native="approve(scope.row)"></el-button>
@@ -243,7 +243,7 @@
                       </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right" v-if="!isAuditList && !isDingding">
+                <el-table-column label="操作" min-width="180" fixed="right" v-if="!isAuditList && !isDingding">
                     <template slot-scope="scope">
                       <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll">
                         <el-button icon="el-icon-delete" circle size="mini"  @click.stop.native="deletes(scope.row)" ></el-button>

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -323,15 +323,15 @@
             <el-dialog :title="setupItemId == null ? '新增' : '修改'" v-if="setupRestAppendDialog" :visible.sync="setupRestAppendDialog" :close-on-click-modal="false" customClass="customWidth" width="400px" append-to-body>
                 <el-form label-width="100px">
                     <el-form-item label="开始时间">
-                        <el-time-picker v-model="restTime.startTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm"></el-time-picker>
+                        <el-time-picker v-model="restTime.startTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm" @change="timeRule(0)"></el-time-picker>
                     </el-form-item>
                     <el-form-item label="结束时间">
-                        <el-time-picker v-model="restTime.endTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm"></el-time-picker>
+                        <el-time-picker v-model="restTime.endTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm" @change="timeRule(1)"></el-time-picker>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click.native="setupRestAppendDialog = false">取消</el-button>
-                    <el-button type="primary" @click="setupRestSure">确认</el-button>
+                    <el-button type="primary" @click="setupRestSure()">确认</el-button>
                 </div>
             </el-dialog>
         </el-dialog>
@@ -392,6 +392,18 @@
                 // this.getRestList()
                 this.setupRestDialog = true
             },
+            timeRule(e){
+                let st = this.restTime.startTime
+                let et = this.restTime.endTime
+                if(st == null || et == null){ return }
+                if(st.split(':')[0] > et.split(':')[0]){
+                    e ? this.restTime.startTime = this.restTime.endTime : this.restTime.endTime = this.restTime.startTime
+                }else if(st.split(':')[0] = et.split(':')[0]){
+                    if(st.split(':')[1] > et.split(':')[1]){
+                        e ? this.restTime.startTime = this.restTime.endTime : this.restTime.endTime = this.restTime.startTime
+                    }
+                }
+            },
             getRestList(){
                 this.http.post('/time-auto-exclude/list',{
                 },res => {
@@ -449,28 +461,32 @@
                 })
             },
             setupRestSure(){
-                if(this.setupItemId != null){
-                    this.restTime.id = this.setupItemId
-                }
-                this.http.post('/time-auto-exclude/addOrMod',this.restTime,
-                res => {
-                    if(res.code == 'ok'){
-                        this.getRestList()
-                        this.setupRestAppendDialog = false
-                    }else {
+                    if(this.setupItemId != null){
+                        this.restTime.id = this.setupItemId
+                    }
+                    if(this.restTime.startTime == null || this.restTime.endTime == null){
+                        this.$message('请选择时间段')
+                        return
+                    }
+                    this.http.post('/time-auto-exclude/addOrMod',this.restTime,
+                    res => {
+                        if(res.code == 'ok'){
+                            this.getRestList()
+                            this.setupRestAppendDialog = false
+                        }else {
+                            this.setupRestAppendDialog = false
+                            this.$message({
+                                message: res.msg,
+                                type: 'error'
+                            })
+                        }
+                    },err => {
                         this.setupRestAppendDialog = false
                         this.$message({
-                            message: res.msg,
+                            message: err,
                             type: 'error'
                         })
-                    }
-                },err => {
-                    this.setupRestAppendDialog = false
-                    this.$message({
-                        message: err,
-                        type: 'error'
                     })
-                })
             },
             bianji() {
                 this.subProjectVisible = true