Jelajahi Sumber

pc填报选择项目展示修改,502报错展示调整

Lijy 3 tahun lalu
induk
melakukan
c3a3429b13

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/http.js

@@ -55,7 +55,7 @@ export default {
             (error) => {
                 if (exception) {
                     var str = error + ''
-                    if(str.indexOf('504') != '-1') {
+                    if(str.indexOf('504') != '-1' || str.indexOf('502') != '-1') {
                         exception('服务器维护中,请稍后重试')
                     } else {
                         exception(error)

+ 5 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -319,7 +319,11 @@
                         <el-select v-model="domain.projectId" :placeholder="user.companyId==781?'请选择工作任务':'请选择项目'" style="width:200px;" clearable="true"  filterable="true"
                         @change="selectProject(domain, index)"
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
-                            <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
+                            <!-- <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id"></el-option> -->
+                            <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id">
+                                <span style="float: left">{{ item.projectName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px">{{ item.projectCode }}</span>
+                            </el-option>
                         </el-select>
                         <span v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                             style="margin-left:45px;">子项目</span>