diff --git a/smart-admin-web-javascript/src/components/dict-preview/index.vue b/smart-admin-web-javascript/src/components/dict-preview/index.vue index 30762b22..64204910 100644 --- a/smart-admin-web-javascript/src/components/dict-preview/index.vue +++ b/smart-admin-web-javascript/src/components/dict-preview/index.vue @@ -1,11 +1,6 @@ @@ -21,8 +16,11 @@ // 当前的值 value: [Number, String, Array], }); - const values = computed(() => { - if (props.value === null || typeof props.value === 'undefined' || props.value === '') return []; - return Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(','); + const dictValueName = computed(() => { + if (props.value === null || typeof props.value === 'undefined' || props.value === '') return ''; + const valueCodeList = Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(','); + const valueNameList = props.options.filter((item) => valueCodeList.includes(item.valueCode)).map((item) => item.valueName); + + return valueNameList.join(','); }); diff --git a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue index 39f793b1..15b01a1f 100644 --- a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue +++ b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue @@ -120,7 +120,7 @@ {{ text }}