提交

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

@@ -77,6 +77,7 @@
                 <el-col :span="24">
                     <div class="box">
                         <div class="box_head">
+                            日期区间：
                             <el-date-picker
                             v-model="dateSelect"
                             type="daterange"
@@ -94,23 +95,23 @@
                             <div class="boxBoxMax_con">
                                 <el-card class="box-card">
                                     <div slot="header" class="clearfix">
-                                        <span>工时成本</span>
+                                        工时成本
                                     </div>
                                     <div class="text item boxBoxMax_con_one">
-                                        工时合计: {{ chengbenData.workingTime }}
+                                        <span>工时合计</span> ￥ {{ chengbenData.workingTime }} 
                                     </div>
                                     <div class="text item">
-                                        成本: {{ chengbenData.cost }}
+                                        <span style="letter-spacing: 26px;">成本</span>￥ {{ chengbenData.cost }} 
                                     </div>
                                 </el-card>
                             </div>
                             <div class="boxBoxMax_con">
                                 <el-card class="box-card">
                                     <div slot="header" class="clearfix">
-                                        <span>费用报销成本</span>
+                                        费用报销成本
                                     </div>
                                     <div class="text item boxBoxMax_con_two">
-                                        报销合计: {{ chengbenData.expense }}
+                                       <span>报销合计 </span>￥ {{ chengbenData.expense }} 
                                     </div>
                                 </el-card>
                             </div>
@@ -582,14 +583,17 @@
     color: #999;
 }
 .box_head {
-    margin: 20px 20px 20px 20px;
+    margin: 20px 20px 20px 0px;
+    color: #333;
 }
 .boxBoxMax {
     display: flex;
+    justify-content: space-between;
 }
 .boxBoxMax_con {
-    width: 30%;
-    margin-right: 30px;
+    width: 48%;
+    /* margin-right: 30px; */
+    color: #333;
 }
 .boxBoxMax_con_one {
     margin-bottom: 8px;
@@ -597,4 +601,9 @@
 .boxBoxMax_con_two {
     margin-bottom: 25px;
 }
+.boxBoxMax_con span{
+    color: #999;
+    display: inline-block;
+    width: 80px;
+}
 </style>

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -485,7 +485,7 @@
 
             <div style="margin-right: 10px">将该员工的工时数据、参与的项目与任务转移 至</div>
             <el-select v-if="user.userNameNeedTranslate != 1" v-model="moveReportUserId" style="width:140px;" :placeholder="$t('defaultText.pleaseChoose')" clearable size="small" filterable popper-class="managePopperClass">
-                <el-option v-for="item in users" :key="item.id" :label="item.name + '\u3000' + item.jobNumber" :value="item.id">
+                <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6;">{{ item.jobNumber }}</span>
                 </el-option>
@@ -1861,6 +1861,7 @@ export default {
     },
     // 转移日报
     transferDaily() {
+      this.deleteUserFlgloading = true
       this.http.post("/user/moveUserData", {
           targetId: this.moveReportUserId,
           sourceId: this.deleteUserFlgData.id