diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue
index 06e1ec76..5d7f4d57 100644
--- a/src/views/dictionary/template/components/AddCriterion.vue
+++ b/src/views/dictionary/template/components/AddCriterion.vue
@@ -24,6 +24,16 @@
/>
+
+
+
+
+
@@ -72,6 +82,7 @@ export default {
Id: '',
CriterionName: '',
CriterionType: null,
+ CriterionGroup: null,
IsEnable: true,
IsCompleteConfig: false,
ShowOrder: null,
@@ -80,7 +91,8 @@ export default {
},
rules: {
CriterionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
- CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+ CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
+ CriterionGroup: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
},
loading: false,
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index f75e41d8..629d700b 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -8,6 +8,54 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
重置
查询
@@ -25,6 +73,8 @@
stripe
size="small"
height="100"
+ @sort-change="handleSortByColumn"
+ ref="criterionsTbl"
>
@@ -32,20 +82,33 @@
prop="CriterionName"
label="标准名称"
show-overflow-tooltip
+ sortable="custom"
/>
{{ $fd('CriterionType',scope.row.CriterionType) }}
+
+
+ {{ $fd('CriterionGroup',scope.row.CriterionGroup) }}
+
+
@@ -62,22 +125,32 @@
label="描述"
show-overflow-tooltip
/>
-
-
-
{{ $fd('YesOrNo', scope.row.IsEnable) }}
-
+
+
+
+ {{ $fd('YesOrNo', scope.row.IseCRFShowInDicomReading) }}
+
+
{
return {
CriterionName: '',
+ CriterionType: null,
+ CriterionGroup: null,
+ IsCompleteConfig: null,
+ IsEnable: null,
PageIndex: 1,
- PageSize: 20
+ PageSize: 20,
+ Asc: true,
+ SortField: ''
}
}
export default {
@@ -271,6 +350,18 @@ export default {
// 重置
handleReset() {
this.searchData = searchDataDefault()
+ this.$refs['criterionsTbl'].clearSort()
+ this.getList()
+ },
+ // 指定排序字段,对列表进行排序
+ handleSortByColumn(column) {
+ if (column.order === 'ascending') {
+ this.searchData.Asc = true
+ } else {
+ this.searchData.Asc = false
+ }
+ this.searchData.SortField = column.prop
+ this.searchData.PageIndex = 1
this.getList()
}
}
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index bbbf1780..320764dc 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -26,7 +26,9 @@
changeState(scope, item.Code)"
- :checked="getCheckState(scope, item.Code)">
+ :checked="getCheckState(scope, item.Code)"
+ :disabled="getDisabledState(scope.row, item)"
+ >
@@ -129,6 +131,19 @@ export default {
changeState(item, code) {
item.row.ExportResult.indexOf(code) > -1 ? item.row.ExportResult.splice(item.row.ExportResult.indexOf(code), 1) : item.row.ExportResult.push(code);
},
+ // 获取禁用状态
+ getDisabledState(row, item) {
+ // 肿瘤评估标准阅片结果表(1)和阅片结果明细表(2)禁用
+ if (this.exportInfo.CriterionGroup === 1 && (item.Code === 1 || item.Code === 2)) {
+ return true
+ } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
+ // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
+ return true
+ } else {
+ return false
+ }
+
+ }
}
}
\ No newline at end of file