待审核增加项目编号，系统基础设置增加配置项

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

@@ -338,7 +338,7 @@
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                         <el-form-item :label="$t('fieldnames') ">
-                            <el-input :placeholder="$t('peaseenterthe')" maxlength="6" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="7" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
                         </el-form-item>
                         <el-form-item>
                             <el-button type="primary" size="small" @click="bianji()">{{ $t('datamaintenance') }}</el-button>
@@ -362,7 +362,7 @@
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType" style="margin-top:10px;">
                         <el-form-item :label="$t('fieldnames') ">
-                            <el-input :placeholder="$t('peaseenterthe')" maxlength="5" size="small" v-model="timeType.customDataName" clearable> </el-input>
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="7" size="small" v-model="timeType.customDataName" clearable> </el-input>
                         </el-form-item>
                         <el-form-item :label="$t('maximumvaluelimit') " style="margin-left:10px;">
                             <el-switch v-model="timeType.customDataMaxStatus" active-color="#20a0ff" > </el-switch>
@@ -390,7 +390,7 @@
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                         <el-form-item :label="$t('fieldnames') ">
-                            <el-input :placeholder="$t('peaseenterthe')" maxlength="5" size="small" v-model="timeType.customTextName" clearable> </el-input>
+                            <el-input :placeholder="$t('peaseenterthe')" maxlength="7" size="small" v-model="timeType.customTextName" clearable> </el-input>
                         </el-form-item>
                     </el-form>
                 </div>

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

@@ -75,7 +75,7 @@
                     <el-timeline>
                         <el-timeline-item v-for="(item,index) in props.row.data" :key="index">
                             <el-card shadow="never">
-                                <p>{{ $t('other.project') + '：' }}<b>{{item.project}}<span v-if="item.subProjectName != null"> / {{item.subProjectName}}</span>
+                                <p>{{ $t('other.project') + '：' }}<b>{{item.projectCode+'/'+item.project}}<span v-if="item.subProjectName != null"> / {{item.subProjectName}}</span>
                                 <span style="margin-left:15px;color:#DAA520;" >[ 
                                                 <span v-if="item.isDeptAudit==0">
                                                     <span v-if="item.projectAuditState==0">