FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2022-03-08 18:16:24 +08:00
parent 8378c4d6ab a7d19ead3b
commit fa88fea340
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+1 -1
View File
@@ -2529,7 +2529,7 @@ export default {
this.$message.error('水印下载仅支持PDF,pdf格式文件')
} else {
if (attId != null && attId !== '') {
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
} else {
this.$message.error('请选择要下载的文件')
}
src/pages/details/otherLawsStandDetails/index.vue
+1 -1
View File
@@ -1625,7 +1625,7 @@ export default {
this.$message.error('水印下载仅支持PDF,pdf格式文件')
} else {
if (attId != null && attId !== '') {
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
} else {
this.$message.error('请选择要下载的文件')
}
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+1
View File
@@ -87,6 +87,7 @@
</el-table-column>
<el-table-column
align="center"
width="180"
label="标准号"
>
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+1 -1
View File
@@ -40,7 +40,7 @@
@selection-change="selectStandChange">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column label="标准号" prop="standNumber">
<el-table-column label="标准号" width="180" prop="standNumber">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
-18
View File
@@ -119,18 +119,6 @@
align="center"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
align="center"
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
align="center"
label="质量工程师">
</el-table-column>
<el-table-column
prop="actualCloseTime"
width="130"
@@ -194,12 +182,6 @@
<el-form-item class="add-form-item" label="责任工程师:">
<div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="认证工程师:">
<div class="seeItem">{{historySeeForm.authEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="质量工程师:">
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>