diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 242f5db1..2a2fc6aa 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -171,7 +171,9 @@
-
+
+
+
@@ -275,32 +277,35 @@
-
-
-
-
- 参数名{{index + 1}}
-
-
-
-
-
-
-
- 参数值{{index + 1}}
-
-
-
-
-
- 删除
-
-
+
+
+
+
+
+ 参数名{{index + 1}}
+
+
+
+
+
+
+
+ 参数值{{index + 1}}
+
+
+
+
+
+ 删除
+
+
+
+
增加列
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 1b9c4180..f1c4f423 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -230,7 +230,7 @@
{{ $t('trials:auditRecord:title:viewDetail') }}
@@ -238,8 +238,8 @@
$t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
instanceof Array ? `(${scope.row.oldValue.length})` : '' }}
-
+
@@ -268,7 +268,7 @@
{{ $t('trials:auditRecord:title:viewDetail') }}
@@ -276,8 +276,8 @@
$t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
instanceof Array ? `(${scope.row.newValue.length})` : '' }}
-
+
@@ -476,7 +476,7 @@
{{ $t('trials:auditRecord:title:viewDetail') }}
@@ -484,8 +484,8 @@
$t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
instanceof Array ? `(${scope.row.oldValue.length})` : '' }}
-
+
@@ -519,7 +519,7 @@
{{ $t('trials:auditRecord:title:viewDetail') }}
@@ -527,8 +527,8 @@
$t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
instanceof Array ? `(${scope.row.newValue.length})` : '' }}
-
+
@@ -863,6 +863,49 @@ export default {
}
return
}
+ // 数组图片
+ if (v.DataType === 'ArrayImage') {
+ let objArr = [], upObjArr = []
+ if (obj[v.Code] && obj[v.Code].length > 0) {
+ obj[v.Code].forEach(item => {
+ objArr.push(item[v.ChildDataValue])
+ })
+ }
+ if (upObj[v.Code] && upObj[v.Code].length > 0) {
+ upObj[v.Code].forEach(item => {
+ upObjArr.push(item[v.ChildDataValue])
+ })
+ }
+ if (obj[v.Code]) {
+ // obj[v.Code] = obj[v.Code].filter(s => s && s.trim())
+ if (row.OptType === 'Add' || row.OptType === 'Init') {
+ item = {
+ key: v.Code,
+ Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+ newValue: objArr.length > 0 ? objArr : '--',
+ oldValue: ''
+ }
+ } else if (row.OptType === 'Delete') {
+ item = {
+ key: v.Code,
+ Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+ oldValue: objArr.length > 0 ? objArr : '--',
+ newValue: '--'
+ }
+ } else {
+ item = {
+ key: v.Code,
+ Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+ newValue: objArr.length > 0 ? objArr : '--',
+ oldValue: upObj.length > 0 ? upObj : '--',
+ }
+ }
+ item.DataType = v.DataType
+ this[auditData].push(item)
+ }
+ return
+ }
+ // 拼接字符
if (v.DataType === 'CombiningString') {
let arr = this.extractBraces(v.Code)
let o = null, up = null;