调整移动端填报样式

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

@@ -217,12 +217,15 @@
                     </div>
                     
                     <div class="overtime" >
-                        <van-checkbox :disabled="!canEdit" v-model="item.isOvertime" >加班</van-checkbox>
-                        <van-field v-model="item.overtimeHours" type="number" :disabled="!canEdit || item.isOvertime==null||item.isOvertime==0"
-                        placeholder="请输入加班时长"></van-field><span style="margin-left:5px">小时</span>    
-
+                        <div class="overTimeClas">
+                            <van-checkbox :disabled="!canEdit" v-model="item.isOvertime" style="width: 4.3rem">加班</van-checkbox>
+                            <van-field v-model="item.overtimeHours" type="number" :disabled="!canEdit || item.isOvertime==null||item.isOvertime==0"
+                            placeholder="请输入加班时长" style="width: 5rem"></van-field>
+                            <span :class="canEdit ? 'overListTime' : 'overListTime hoveOver'">小时</span>    
+                        </div>
                         <van-tag style="position:absolute;right:10px;" v-if="isCorpWX&&canEdit" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag>
                         <!-- <van-tag style="position:absolute;right:10px;" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag> -->
+                        <!-- <van-tag style="position:absolute;right:10px;" type="primary" size="large" @click="takePhoto(index)">拍照上传</van-tag> -->
                     </div>
                     <div style="padding:5px;text-align:center;" v-if="!isIOSystem">
                         <span v-for="(p, index) in item.pics"  :key="p" style="margin-right:15px;">
@@ -1521,7 +1524,12 @@
             margin-right: 5px;
         }
     }
-    
+    .overTimeClas{
+        display: flex;
+        width: 7.4rem;
+        // justify-content: space-between;
+        align-items: center;
+    }
 </style>
 <style lang="less">
     
@@ -1567,6 +1575,14 @@
         text-overflow:ellipsis;
         white-space: nowrap;
     }
+    .overListTime {
+        margin-left:5px;
+        display: inline-block;
+        width: 2rem;
+    }
+    .hoveOver {
+        color: #C8C9CC;
+    }
 </style>
 
 

fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,17 +4,17 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 // var ip = '127.0.0.1'
-// var ip = '192.168.2.159'
+var ip = '192.168.2.27'
 // 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 = {
     // 关闭eslint检查