1.修改三期优化点

This commit is contained in:
sunFlower
2022-09-21 17:38:32 +08:00
parent 3672382881
commit a87317f920
5 changed files with 46 additions and 4 deletions
+1
View File
@@ -1300,4 +1300,5 @@ module.exports = {
processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data', processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data',
exportFileName:'Export file name', exportFileName:'Export file name',
initiateSupplementaryProcess:'Initiate supplementary process', initiateSupplementaryProcess:'Initiate supplementary process',
whetherTheDisassemblySheetIncluded:'Whether the disassembly sheet is included',
} }
+1
View File
@@ -1402,4 +1402,5 @@ module.exports = {
processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致;请选择一致的数据', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致;请选择一致的数据',
exportFileName:'导出文件名称', exportFileName:'导出文件名称',
initiateSupplementaryProcess:'发起补充流程', initiateSupplementaryProcess:'发起补充流程',
whetherTheDisassemblySheetIncluded:'是否含有拆解单',
} }
@@ -22,6 +22,12 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
:columns="columns" :columns="columns"
> >
<span slot="whetherTheDisassemblySheetIncluded" slot-scope="text,record">
{{record.sarFileSplitInfoList && record.sarFileSplitInfoList.length > 0 ? '是':'否'}}
</span>
<span slot="whetherTheDisassemblySheetIncludedTitle" :title="$t('whetherTheDisassemblySheetIncluded')">
{{$t('whetherTheDisassemblySheetIncluded')}}
</span>
</a-table> </a-table>
<div class="page" v-if="dataSource && dataSource.length > 0"> <div class="page" v-if="dataSource && dataSource.length > 0">
<a-pagination <a-pagination
@@ -332,6 +338,12 @@
ellipsis: true, ellipsis: true,
width: 170, width: 170,
dataIndex: 'corresponding_standard' dataIndex: 'corresponding_standard'
},
{
align: 'center',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'whetherTheDisassemblySheetIncluded',title:'whetherTheDisassemblySheetIncludedTitle' }
} }
] ]
} }
@@ -341,12 +353,12 @@
this.getEvaluationMethodTree() this.getEvaluationMethodTree()
if (this.$route.query.whetherTobring == '1') { if (this.$route.query.whetherTobring == '1') {
this.formInline.whetherTobring = '1' this.formInline.whetherTobring = '1'
this.formInline = {...this.formInline} this.formInline = { ...this.formInline }
this.isTrue = true this.isTrue = true
} else { } else {
this.isTrue = false this.isTrue = false
this.formInline.whetherTobring = '2' this.formInline.whetherTobring = '2'
this.formInline = {...this.formInline} this.formInline = { ...this.formInline }
} }
if (this.$route.query.firstInitiation == '1') { if (this.$route.query.firstInitiation == '1') {
this.whetherDisplay = true this.whetherDisplay = true
@@ -30,7 +30,8 @@
<div class="detail-content" style="padding-bottom: 20px"> <div class="detail-content" style="padding-bottom: 20px">
<div style="width: 100%;height: auto;overflow: hidden"> <div style="width: 100%;height: auto;overflow: hidden">
<div class="detail-content-left"> <div class="detail-content-left">
<div class="detail-content-left-header" :title="resultData.serialNumberLeft + resultData.fileNameLeft"> <div class="detail-content-left-header"
:title="resultData.serialNumberLeft + resultData.fileNameLeft">
{{this.resultData.serialNumberLeft}}&nbsp; {{this.resultData.serialNumberLeft}}&nbsp;
{{this.resultData.fileNameLeft}} {{this.resultData.fileNameLeft}}
</div> </div>
@@ -71,6 +71,7 @@
{{$t('selectedStandard')}} {{$t('selectedStandard')}}
</span> </span>
<span class="box-button-standard-right" <span class="box-button-standard-right"
@click="selecLeftClick(selectedRowKeysLeftRecord[0])"
:title="selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')" :title="selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')"
:class="{'box-button-standard-right-color':selectedRowKeysLeftRecord[0]}"> :class="{'box-button-standard-right-color':selectedRowKeysLeftRecord[0]}">
{{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}} {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}}
@@ -136,6 +137,7 @@
{{$t('selectedStandard')}} {{$t('selectedStandard')}}
</span> </span>
<span class="box-button-standard-right" <span class="box-button-standard-right"
@click="selecLeftClick(selectedRowKeysRightRecord[0])"
:title="selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')" :title="selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')"
:class="{'box-button-standard-right-color':selectedRowKeysRightRecord[0]}"> :class="{'box-button-standard-right-color':selectedRowKeysRightRecord[0]}">
{{selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')}} {{selectedRowKeysRightRecord[0]?selectedRowKeysRightRecord[0].serialNumber+' '+selectedRowKeysRightRecord[0].fileName:$t('noComparisonDocumentSelected')}}
@@ -169,7 +171,9 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction } from '@/api/manage' import { getAction, postAction, deleteAction ,downloadFile} from '@/api/manage'
import { Base64 } from 'js-base64'
import { mapGetters } from 'vuex'
export default { export default {
name: 'initiateDocumentComparison', name: 'initiateDocumentComparison',
@@ -191,6 +195,7 @@
totalRight: 0, totalRight: 0,
pageNoRight: 1, pageNoRight: 1,
formInline: {}, formInline: {},
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
rules: { rules: {
remark: [ remark: [
{ {
@@ -248,6 +253,7 @@
document.title = this.$t('DocumentComparison') + ' - ' + this.$t('initiateComparison') document.title = this.$t('DocumentComparison') + ' - ' + this.$t('initiateComparison')
}, },
methods: { methods: {
...mapGetters(['userInfo']),
Fallback() { Fallback() {
this.$router.push({ this.$router.push({
path: '/documentComparison' path: '/documentComparison'
@@ -371,6 +377,26 @@
} }
}) })
}, },
selecLeftClick(fileQuery){
if (fileQuery){
let fileName = fileQuery.fileName
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.pdf') {
window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.fileId+'&userName='+this.userInfo().username))
} else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
|| fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + fileSuffix)
window.open(url, '_blank')
} else {
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.fileId })
}
}
},
getListRight() { getListRight() {
let queryParam = JSON.parse(JSON.stringify(this.queryParamRight)) let queryParam = JSON.parse(JSON.stringify(this.queryParamRight))
Object.keys(queryParam).forEach(val => { Object.keys(queryParam).forEach(val => {
@@ -580,5 +606,6 @@
.box-button-standard-right-color { .box-button-standard-right-color {
color: #040B29; color: #040B29;
cursor: pointer;
} }
</style> </style>