再次提交

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

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

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

@@ -163,6 +163,9 @@
                             }">
                         </el-time-picker>
                 </el-form-item>
+                <el-form-item label="填报提示 " prop="alertTime" style="width: 50%">
+                        <el-input placeholder="请输入提示" v-model="iptss" clearable class="apu"></el-input>
+                </el-form-item>
                 </el-form>
             </div>
         </el-col>
@@ -278,7 +281,8 @@
                 addSubProject: false,
                 addfm: {
                     name: '',
-                }
+                },
+                iptss: ''
             };
         },
         methods: {
@@ -517,4 +521,7 @@
     // justify-content: space-between;
     padding: 0 20px 0 0;
 }
+.apu {
+    width: 100% !important;
+}
 </style>

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

@@ -18,11 +18,11 @@
             <!--工具条-->
             <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
                 <el-form :inline="true">
-                    <div style="width: 300px;display: inline-block;">
+                    <!-- <div style="width: 300px;display: inline-block;">
                         <el-input v-model="keyword" class="input-with-select" placeholder="请输入人员名字搜索" clearable="true">
                             <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
                         </el-input>
-                    </div>
+                    </div> -->
                     <el-form-item>
                         <div v-if="depData == null || depData.id == -1" class="nowTime" style="cursor:unset">
                             <i class="fa fa-home"></i>全部人员
@@ -60,6 +60,13 @@
                     <el-form-item style="float:right;">
                         <el-link type="primary" v-if="depData != null && depData.id != -1 && depData.id != 0" :underline="false" @click="createDepartment(-2)">新增子部门</el-link>
                     </el-form-item>
+                    <el-form-item style="float:right;">
+                        <div style="width: 300px;display: inline-block;">
+                            <el-input v-model="keyword" class="input-with-select" placeholder="请输入人员名字搜索" clearable="true">
+                                <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
+                            </el-input>
+                        </div>
+                    </el-form-item>
                 </el-form>
             </el-col>
 

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

@@ -296,7 +296,7 @@
                     </el-form-item>
                     <!-- 相关维度 -->
                     <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1">
-                            <el-select v-model="domain.degreeId" clearable placeholder="请选择相关维度">
+                            <el-select v-model="domain.degreeId" clearable placeholder="请选择">
                                 <el-option v-for="item in domain.wuduList" :key="item.value" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>
@@ -373,7 +373,7 @@
                         </el-form-item>
                         <!-- 相关维度 -->
                         <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1">
-                            <el-select v-model="domain.degreeId" clearable placeholder="请选择相关维度">
+                            <el-select v-model="domain.degreeId" clearable placeholder="请选择">
                                 <el-option v-for="item in domain.wuduList" :key="item.value" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>