WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-20 11:11:01 +08:00
parent 97d209b37e 91d31e98b4
commit bc02af774c
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+2 -1
View File
@@ -192,8 +192,9 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
* @param params * @param params
*/ */
@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls") @RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, Map<String,Object> params) { public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
projectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params); projectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+1 -1
View File
@@ -449,7 +449,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
String[] titleArr = title.split(","); String[] titleArr = title.split(",");
Row firstRow = sheet.createRow(0); Row firstRow = sheet.createRow(0);
for (int i = 0; i <= 2; i++){ for (int i = 0; i < 2; i++){
Cell cell = firstRow.createCell(i); Cell cell = firstRow.createCell(i);
cell.setCellValue(titleArr[i]); cell.setCellValue(titleArr[i]);
} }
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+15 -15
View File
@@ -185,27 +185,27 @@
{{$t('cancel')}} {{$t('cancel')}}
</a-button> </a-button>
</template> </template>
<div class="engineeringBox"> <div class="engineeringBox" v-if="detailsList.length > 0">
<div style="width: calc(100% - 12px)" v-for="(item,index) in detailsList" v-if="detailsList.length > 0"> <div style="width: calc(100% - 12px)" v-for="(item,index) in detailsList">
<div class="title-header-text" v-if="index == 0"> <div class="title-header-text" v-if="index == 0">
{{this.$t('currentInformation')}} {{$t('currentInformation')}}
</div> </div>
<div class="title-header-text" style="margin-top: 40px" v-if="index == 1"> <div class="title-header-text" style="margin-top: 40px" v-if="index == 1">
{{this.$t('deliveryHistory')}} {{$t('deliveryHistory')}}
</div> </div>
<a-row :gutter="24" style="margin-bottom: 18px"> <a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('projectDeliveryRequirements')}}:</div> <div class="text-field-left">{{$t('projectDeliveryRequirements')}}:</div>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="19">
<div class="text-field-right"> <div class="text-field-right">
{{item.deliveryInstructions}} {{item.deliveryRequirements}}
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="margin-bottom: 18px"> <a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('feedbackFromTheEngineer')}}:</div> <div class="text-field-left">{{$t('feedbackFromTheEngineer')}}:</div>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="19">
<div class="text-field-right"> <div class="text-field-right">
@@ -215,18 +215,18 @@
</a-row> </a-row>
<a-row :gutter="24" style="margin-bottom: 18px"> <a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('Deliverables')}}:</div> <div class="text-field-left">{{$t('Deliverables')}}:</div>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="19">
<div v-if="item.fileId" class="text-field-right text-field-cou" <div v-if="item.fileId" class="text-field-right text-field-cou"
@click="viewFileClick(item.fileId)"> @click="viewFileClick(item.fileId)">
{{this.$t('viewUploadedFiles')}} {{$t('viewUploadedFiles')}}
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="margin-bottom: 18px"> <a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('completedBy')}}:</div> <div class="text-field-left">{{$t('completedBy')}}:</div>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<div class="text-field-right"> <div class="text-field-right">
@@ -234,7 +234,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('completedTime')}}:</div> <div class="text-field-left">{{$t('completedTime')}}:</div>
</a-col> </a-col>
<a-col :span="7"> <a-col :span="7">
<div class="text-field-right"> <div class="text-field-right">
@@ -244,7 +244,7 @@
</a-row> </a-row>
<a-row :gutter="24" style="margin-bottom: 18px"> <a-row :gutter="24" style="margin-bottom: 18px">
<a-col :span="5"> <a-col :span="5">
<div class="text-field-left">{{this.$t('replyFromProjectContactPerson')}}:</div> <div class="text-field-left">{{$t('replyFromProjectContactPerson')}}:</div>
</a-col> </a-col>
<a-col :span="19"> <a-col :span="19">
<div class="text-field-right"> <div class="text-field-right">
@@ -253,9 +253,9 @@
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
<div class="noData"> </div>
{{this.$t('noData')}} <div class="noData" v-else>
</div> {{$t('noData')}}
</div> </div>
<div class="page" v-if="detailsList.length > 0"> <div class="page" v-if="detailsList.length > 0">
<a-pagination <a-pagination