Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
330b1cf644
|
@ -457,7 +457,7 @@ export default {
|
||||||
question: {
|
question: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default() {
|
default() {
|
||||||
return []
|
return {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
criterionId: {
|
criterionId: {
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
<el-input
|
<el-input
|
||||||
v-model="scope.row.CDISCCode"
|
v-model="scope.row.CDISCCode"
|
||||||
size="mini"
|
size="mini"
|
||||||
:disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
|
:disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0)"
|
||||||
v-show="!scope.row.IsGroup || !scope.row.HasChildren"
|
v-show="!scope.row.IsGroup || !scope.row.HasChildren"
|
||||||
>
|
>
|
||||||
</el-input>
|
</el-input>
|
||||||
|
@ -68,7 +68,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
loading: false,
|
loading: false,
|
||||||
exportInfo: []
|
exportInfo: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -152,7 +152,7 @@ export default {
|
||||||
} else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
|
} else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
|
||||||
// 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
|
// 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
|
||||||
return true
|
return true
|
||||||
} else if (item.Code === 8 && row.HasChildren) {
|
} else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
|
||||||
// else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
|
// else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
|
||||||
// CDISC导出不能配置表格问题
|
// CDISC导出不能配置表格问题
|
||||||
return true
|
return true
|
||||||
|
|
Loading…
Reference in New Issue