2022.6.9

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,8 +1,8 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.9'
-// var ip = '192.168.2.39'
+// var ip = '192.168.2.9'
+var ip = '192.168.2.39'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

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

@@ -94,7 +94,7 @@
                 </el-form-item>
                 
                 <el-form-item label="选择人员" v-if="radio == '项目' || radio == '部门'">
-                    <el-select v-model="exportParam.userId"  placeholder="请选择人员" style="width: 350px" filterable="true" clearable="true">
+                    <el-select v-model="exportParam.userId"  placeholder="全部人员" style="width: 350px" filterable="true" clearable="true">
                         <span v-for="(item, index) in users" :key="index">
                         <el-option :label="item.name" :value="item.id"></el-option>
                         </span> 

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

@@ -890,6 +890,7 @@
                                 return
                             }
                         }
+                        delete param.userList
                         // console.log(param, '将要提交的值')
                         // return
                         this.http.post('/time-type/save',param,

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

@@ -19,13 +19,14 @@
                          @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
                          <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
                     </div> -->
-                        <span v-for="(item,index) in allDate" :id="'day'+index" :class="index==choseDay?'chooseDate date_item':'date_item'"
+                        <span v-for="(item,index) in allDate" :id="'day'+index" class="date_item"
                         @click="choseDate(index, item)" :key="index" :style="'padding:0 6px;display: inline-block;width: 46px;text-align: center;' + (canClick(index,item) == false ? 'color:#c0c0c0;cursor:not-allowed;' : '') ">
                         <div :style="'display:inline-block;text-align: center;'+(item.state == null?'':'')" >
-                            <div style="text-align:center;position:relative;"><span>{{item.showDate}}</span>
+                            <div style="text-align:center;"><span :class="statusStyle[item.state]">{{item.showDate}}</span>
                             <br>
                             <span style="font-size:10px;text-align:center;color:#999;">{{item.weekDay}}</span>
-                        <i v-if="item.state != null" class="iconfont firerock-icondot" :class="statusStyle[item.state]" style="position:absolute;top:-1px;right:-18px"></i>
+                            <span class="chooseDate" v-if="index == choseDay"></span>
+                        <!-- <i v-if="item.state != null" class="iconfont firerock-icondot" :class="statusStyle[item.state]" style="position:absolute;top:-1px;right:-18px"></i> -->
 
                             </div>
                         </div>
@@ -1304,7 +1305,7 @@
                 membListVisible: false,
                 isBatch:0,//是否是批量填报
                 weekDay : ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-                statusStyle:["waiting", "filledReportStyle", "RejectStyle", ""],
+                statusStyle:["waiting", "filledReportStyle", "RejectStyle", "waitSubmitStyle"],
                 fillStatusList: [],
                 exportParam:{projectId: null, dateRange:[]},
                 exportDialog:false,
@@ -5084,6 +5085,23 @@
 }
 .RejectStyle {
     color:red;
+}
+.waitSubmitStyle{
+    color: #999;
+}
+.chooseDate {
+    .waiting {
+        color: #20a0ff;
+    }
+    .filledReportStyle {
+        color:#20a0ff;
+    }
+    .RejectStyle {
+        color: #20a0ff;
+    }
+    .waitSubmitStyle{
+        color: #20a0ff;
+    }
 }
     .allDaily {
         width:82%;
@@ -5100,9 +5118,15 @@
         .date_item {
             padding: 0 3px;
             cursor: pointer;
+            position: relative;
         }
         .chooseDate {
-            color: #20a0ff;
+            position: absolute;
+            bottom: -3px;
+            width: 34px;
+            height: 2px;
+            left: 12px;
+            background: #20a0ff;
         }
     }
     .one_daily {