2022.5.10

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/awayOffice/awayOffice.vue

@@ -526,7 +526,7 @@
     <el-dialog title="进行项目关联" :visible.sync="DingdingEditDialog" width="800px">
         <el-form ref="DingdingForm" label-width="80px" style="margin:40px 0">
             <el-form-item label="投入项目" style="width:300px;margin-right:30px;display:inline-block;" prop="projectId">
-                <el-select style="width:100%" @change="getwuduList(2,1)" v-model="DingdingForm.projectId" filterable clearable placeholder="请选择投入项目" @clear="DingdingClear">
+                <el-select style="width:100%" @change="getwuduList(2,1)" v-model="DingdingForm.projectId" filterable clearable placeholder="请选择投入项目">
                     <el-option
                     v-for="item in projectList"
                     :key="item.id"
@@ -706,7 +706,7 @@ export default {
                 e.degreeId = e.degreeId + ''
                 // console.log("e.degreeId",e.degreeId);
             }
-            this.DingdingForm = e
+            this.DingdingForm = JSON.parse(JSON.stringify(e))
             this.getwuduList(2)
             // console.log('editor',this.DingdingForm);
         },
@@ -1398,9 +1398,9 @@ export default {
                     }
                     var pId = this.editItemForm.projectId
                 }else{
-                    // if(i == 1){
-                    //     this.DingdingForm.degreeId = null
-                    // }
+                    if(i == 1){
+                        this.DingdingForm.degreeId = null
+                    }
                     if(this.DingdingForm.projectId == '' || this.DingdingForm.projectId == null){
                         return
                     }

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

@@ -487,7 +487,7 @@
             <el-select v-model="addForm.ownerId" @change="selts()" placeholder="请选择请假人" style="width: 240px" :disabled="true" filterable="true">
                 <span v-for="(item, index) in users" :key="index">
                 <el-option :label="item.name" :value="item.id"></el-option>
-                </span> 
+                </span>
             </el-select>
         </el-form-item>
         <!-- 电话 -->

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

@@ -323,10 +323,10 @@
             <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" style="cursor: pointer;"></el-time-picker>
+                        <el-time-picker v-model="restTime.startTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm"></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" style="cursor: pointer;"></el-time-picker>
+                        <el-time-picker v-model="restTime.endTime" placeholder="请选择时间" format="HH:mm" value-format="HH:mm"></el-time-picker>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">