2022.6.1

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

@@ -43,7 +43,7 @@
       <h3 ref="headHe" style="padding-left: 210px">{{shuz[ins]}}</h3>
       <div class="headScreen" v-if="ins != 4 && ins != 6">
         <el-select v-model="proJuctId" placeholder="请选择项目" clearable filterable size="small" @change="selcts()">
-          <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + item.projectCode" :value="item.id">
+          <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
             <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
             <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
           </el-option>
@@ -302,7 +302,7 @@
                     <el-option v-for="(item, index) in proList" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
                   </el-select> -->
                   <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
-                    <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + item.projectCode" :value="item.id" @change="selscts(item)">
+                    <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id" @change="selscts(item)">
                       <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
                       <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
                     </el-option>