2022.6.13

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

@@ -64,9 +64,19 @@
                         </el-upload>
                     </el-form-item> -->
                     <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureImport">
-                        <el-upload ref="upload" action="#" :limit="1" :http-request="importUser" :show-file-list="false">
-                            <el-link type="primary" :underline="false">批量导入</el-link>
-                        </el-upload>
+                        <el-dropdown placement="top-start" trigger="hover">
+                            <el-upload slot="reference"  class="el-dropdown-link" ref="upload" action="#" :limit="1" :http-request="importUser" :show-file-list="false">
+                                    <el-link type="primary" :underline="false">批量导入</el-link>
+                                </el-upload>
+                            <el-dropdown-menu slot="dropdown">
+                                
+                                <el-dropdown-item>
+                                    <el-link type="primary" :underline="false" href="./upload/人员导入模板.xlsx" download="人员导入模板.xlsx">模板下载</el-link>
+                                </el-dropdown-item>
+                            </el-dropdown-menu>
+                            
+                            
+                        </el-dropdown>
                     </el-form-item>
 
                     <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureImport">
@@ -276,7 +286,7 @@
                     <el-input v-model="insertForm.position" placeholder="请输入岗位职级别" clearable></el-input>
                 </el-form-item>
 
-                <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书123</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
+                <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
                 <div class="certificateList">
                     <div class="moreList">
                         <div class="moreLiList" v-for="(item,index) in insertForm.certJson" :key="index">

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

@@ -381,8 +381,8 @@
                         </el-select>
                     </el-form-item>
                     <!-- 相关数值 -->
-                    <el-form-item :label="yonghuUser.customDataName" v-if="yonghuUser.customDataActive == 1" :prop="'domains.' + index + '.customData'" :rules="user.timeType.customDataStatus == 1 ? { required: true, message: '请填写' + yonghuUser.customDataName, trigger: ['change','blur'] } : {}">
-                        <el-input-number :id="'numberData_'+index" :disabled="!canEdit" v-model="domain.customData" style="width:200px;" @keyup.native="restrictNumber('numberData_'+index)"></el-input-number>
+                    <el-form-item :label="yonghuUser.customDataName" v-if="yonghuUser.customDataActive == 1 && user.timeType.customDataStatus == 1" :prop="'domains.' + index + '.customData'" :rules="user.timeType.customDataStatus == 1 ? { type: 'number', required: true, message: '请填写' + yonghuUser.customDataName, trigger: ['change','blur'] } : null">
+                        <el-input-number :id="'numberData_'+index" :disabled="!canEdit" v-model="domain.customData" style="width:200px;" @keyup.native="restrictNumber('numberData_'+index)" @change="inpnum"></el-input-number>
                     </el-form-item>
                     <!-- 自定义文本 -->
                     <el-form-item :label="yonghuUser.customTextName" v-if="yonghuUser.customTextActive == 1" :prop="'domains.' + index + '.customText'" :rules="user.timeType.customTextStatus == 1 ? { required: true, message: '请填写' + yonghuUser.customTextName, trigger: ['change','blur'] } : {}">
@@ -500,7 +500,7 @@
                             </el-select>
                         </el-form-item>
                         <!-- 相关数值 -->
-                        <el-form-item :label="yonghuUser.customDataName" v-if="domain.projectId && yonghuUser.customDataActive == 1" :prop="'domains.' + index + '.customData'" :rules="user.timeType.customDataStatus == 1 ? { required: true, message: '请填写' + yonghuUser.customDataName, trigger: ['change','blur'] } : {}">
+                        <el-form-item :label="yonghuUser.customDataName" v-if="domain.projectId && yonghuUser.customDataActive == 1" :prop="'domains.' + index + '.customData'" :rules="user.timeType.customDataStatus == 1 ? { type: 'number', required: true, message: '请填写' + yonghuUser.customDataName, trigger: ['change','blur'] } : null">
                             <el-input-number :id="'numberData_'+index" v-model="domain.customData" style="width:200px;" @keyup.native="restrictNumber('numberData_'+index)"></el-input-number>
                         </el-form-item>
                         <!-- 自定义文本 -->
@@ -1565,6 +1565,9 @@
                     inpu.value = parseFloat(inpu.value);
                 }
             },
+            inpnum(value){
+                console.log(value);
+            },
             
             
             //获取项目下的任务分组
@@ -3469,6 +3472,7 @@
                     param.projectId = this.exportParam.projectId;
                 }
                 param.stateKey = this.stateKey
+                param.departmentId = this.user.departmentId
                 this.http.post( this.port.report.export, param,
                 res => {
                     this.listLoading = false;