修改禅道已知bug
This commit is contained in:
@@ -225,6 +225,10 @@
|
||||
@click="resultReportedClick(record)">
|
||||
{{$t('resultReported')}}
|
||||
</a>
|
||||
<a class="text-operation"
|
||||
@click="viewClick(record)">
|
||||
{{$t('view')}}
|
||||
</a>
|
||||
</span>
|
||||
<span slot="titleName" slot-scope="text,record" :title="text">
|
||||
<span class="textName">
|
||||
@@ -238,7 +242,8 @@
|
||||
</a>
|
||||
</span>
|
||||
<span slot="designDeliverableTemplateName" slot-scope="text,record">
|
||||
<span>{{ record.designDeliverableTypeName }}</span><br v-if="record.designDeliverableTypeName">
|
||||
<span :title="record.designDeliverableTypeName">{{ record.designDeliverableTypeName }}</span><br
|
||||
v-if="record.designDeliverableTypeName">
|
||||
<a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
|
||||
:title="record.designDeliverableTemplateName"
|
||||
@click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
|
||||
@@ -250,7 +255,8 @@
|
||||
</span>
|
||||
|
||||
<span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
|
||||
<span>{{ record.prehomoDeliverableTypeName }}</span><br v-if="record.prehomoDeliverableTypeName">
|
||||
<span :title="record.prehomoDeliverableTypeName">{{ record.prehomoDeliverableTypeName }}</span><br
|
||||
v-if="record.prehomoDeliverableTypeName">
|
||||
<a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
|
||||
:title="record.prehomoDeliverableTemplateName"
|
||||
@click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
|
||||
@@ -262,7 +268,8 @@
|
||||
</span>
|
||||
|
||||
<span slot="verifyDeliverableTemplateName" slot-scope="text,record">
|
||||
<span>{{ record.verifyDeliverableTypeName }}</span><br v-if="record.verifyDeliverableTypeName">
|
||||
<span :title="record.verifyDeliverableTypeName">{{ record.verifyDeliverableTypeName }}</span><br
|
||||
v-if="record.verifyDeliverableTypeName">
|
||||
<a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
|
||||
:title="record.verifyDeliverableTemplateName"
|
||||
@click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
|
||||
@@ -424,6 +431,7 @@
|
||||
</a-modal>
|
||||
<JLoading :loading="JLoading">{{$t('dataLoading')}}</JLoading>
|
||||
<resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
|
||||
<listOfRegulationsView ref="listOfRegulationsViewRef"/>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
@@ -435,6 +443,7 @@
|
||||
import transferList from './transferList'
|
||||
import fixedPlate from './fixedPlateForm'
|
||||
import resultReportedUpload from './resultReportedUpload'
|
||||
import listOfRegulationsView from './listOfRegulationsView'
|
||||
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
|
||||
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
@@ -452,7 +461,8 @@
|
||||
transferList,
|
||||
globalAdvancedQuery,
|
||||
fixedPlate,
|
||||
resultReportedUpload
|
||||
resultReportedUpload,
|
||||
listOfRegulationsView
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -726,7 +736,7 @@
|
||||
title: this.$t('operation'),
|
||||
align: 'center',
|
||||
fixed: 'right',
|
||||
width: 210,
|
||||
width: 240,
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
}
|
||||
],
|
||||
@@ -1008,6 +1018,19 @@
|
||||
},
|
||||
methods: {
|
||||
...mapGetters(['userInfo']),
|
||||
viewClick(row) {
|
||||
let roleCodeIndex
|
||||
if (this.isDisplay) {
|
||||
roleCodeIndex = 0
|
||||
} else {
|
||||
roleCodeIndex = 4
|
||||
}
|
||||
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
|
||||
roleCodeIndex = 0
|
||||
}
|
||||
row.roleCodeIndex = roleCodeIndex
|
||||
this.$refs.listOfRegulationsViewRef.editModel(JSON.parse(JSON.stringify(row)))
|
||||
},
|
||||
handleModule() {
|
||||
downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {})
|
||||
},
|
||||
@@ -1191,7 +1214,7 @@
|
||||
for (let j = 0; j < selectedRowKeys.length; j++) {
|
||||
if (this.dataSource[i].id == selectedRowKeys[j]) {
|
||||
if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted')||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
|
||||
isTrue = true
|
||||
} else {
|
||||
@@ -1398,7 +1421,7 @@
|
||||
}
|
||||
})
|
||||
if (queryParam.dutyTerritory) {
|
||||
queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*'
|
||||
queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
|
||||
}
|
||||
let query = {
|
||||
...this.queryParamQuery,
|
||||
|
||||
Reference in New Issue
Block a user