1
continuous-integration/drone/push Build is passing Details

uat
wangxiaoshuang 2025-09-18 18:12:57 +08:00
parent b7655ebad0
commit f3ff162cdd
2 changed files with 15 additions and 13 deletions

View File

@ -77,7 +77,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ getBodyPart(scope.row.BodyPartForEdit) }} {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
</template> </template>
</el-table-column> </el-table-column>
<!-- 序列数量 --> <!-- 序列数量 -->
@ -493,8 +493,8 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
getBodyPart(bodyPart) { getBodyPart(bodyPart, other) {
if (!bodyPart) return '' if (!bodyPart && !other) return ''
var separator = ',' var separator = ','
if (bodyPart.indexOf('|') > -1) { if (bodyPart.indexOf('|') > -1) {
separator = '|' separator = '|'
@ -507,6 +507,10 @@ export default {
var newArr = arr.map((i) => { var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name') return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
}) })
if (other) {
newArr.push(other)
}
newArr = newArr.filter(Boolean)
return newArr.join(' | ') return newArr.join(' | ')
}, },
// //

View File

@ -75,7 +75,7 @@
sortable sortable
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ getBodyPart(scope.row.BodyPartForEdit) }} {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
</template> </template>
</el-table-column> </el-table-column>
<!-- 序列数量 --> <!-- 序列数量 -->
@ -260,8 +260,8 @@ export default {
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
}, },
getBodyPart(bodyPart) { getBodyPart(bodyPart, other) {
if (!bodyPart) return '' if (!bodyPart && !other) return ''
var separator = ',' var separator = ','
if (bodyPart.indexOf('|') > -1) { if (bodyPart.indexOf('|') > -1) {
separator = '|' separator = '|'
@ -272,14 +272,12 @@ export default {
} }
var arr = bodyPart.split(separator) var arr = bodyPart.split(separator)
var newArr = arr.map((i) => { var newArr = arr.map((i) => {
return this.$fd( return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
'Bodypart',
i.trim(),
'Code',
{ Bodypart: this.bp },
'Name'
)
}) })
if (other) {
newArr.push(other)
}
newArr = newArr.filter(Boolean)
return newArr.join(' | ') return newArr.join(' | ')
}, },
// //