调整项目点击查看点击无效

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

@@ -39,7 +39,10 @@
             <el-form ref="form3" :model="exportParam" >
                 <el-form-item prop="projectId" label="选择项目" >
                     <el-select v-model="exportParam.projectId" placeholder="全部项目"  clearable style="width:350px;" filterable="true">
-                        <el-option v-for="item in projectList"  :key="item.id" :label="item.projectName" :value="item.id"></el-option>
+                        <el-option v-for="item in projectList"  :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
+                            <span style="float: left;color: #8492a6; font-size: 13px">{{ item.projectCode }}</span>
+                            <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
+                        </el-option>
                     </el-select>
                 </el-form-item>
                 <!-- <el-form-item prop="userIds" label="选择人员" >

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

@@ -60,11 +60,23 @@
                             查看更多<i class="el-icon-arrow-down el-icon--right"></i>
                         </span>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item v-if="permissions.projectImport">导入项目</el-dropdown-item>
-                            <el-dropdown-item v-if="permissions.projectImport">模板下载</el-dropdown-item>
-                            <el-dropdown-item v-if="permissions.projectExport">导出项目</el-dropdown-item>
-                            <el-dropdown-item v-if="user.company.packageProject == 1 && permissions.projectCostOfItems">基线成本项</el-dropdown-item>
-                            <el-dropdown-item v-if="permissions.projectClassification">分类管理</el-dropdown-item>
+                            <el-dropdown-item v-if="permissions.projectImport">
+                                <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
+                                    <el-link :underline="false" >导入项目</el-link>
+                                </el-upload>
+                            </el-dropdown-item>
+                            <el-dropdown-item v-if="permissions.projectImport">
+                                <el-link :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx">模板下载</el-link>
+                            </el-dropdown-item>
+                            <el-dropdown-item v-if="permissions.projectExport">
+                                <el-link :underline="false" @click="exportProjectData" download="项目导出.xlsx">导出项目</el-link>
+                            </el-dropdown-item>
+                            <el-dropdown-item v-if="user.company.packageProject == 1 && permissions.projectCostOfItems">
+                                <el-link :underline="false" @click="showBaseCostItemDialog">基线成本项</el-link>
+                            </el-dropdown-item>
+                            <el-dropdown-item v-if="permissions.projectClassification">
+                                <el-link :underline="false" @click="showClfDialog = true">分类管理</el-link>
+                            </el-dropdown-item>
                         </el-dropdown-menu>
                         </el-dropdown>
                 </el-form-item>