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 7b58088c..f25d4234 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
@@ -25,7 +25,7 @@
-
+
@@ -93,7 +93,7 @@
@@ -120,7 +120,7 @@
{{ text }}
-
+
{{ text ? text : '' }}
@@ -199,7 +199,6 @@
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
- import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
import DictSelect from '/@/components/support/dict-select/index.vue';
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
import _ from 'lodash';
@@ -235,7 +234,6 @@
title: '商品状态',
dataIndex: 'goodsStatus',
resizable: true,
- sorter: true,
filterOptions: {
type: 'enum-select',
enumName: 'GOODS_STATUS_ENUM',
@@ -248,7 +246,7 @@
resizable: true,
filterOptions: {
type: 'dict-select',
- dictCode: DICT_CODE_ENUM.GOODS_PLACE,
+ dictCode: DICT_CODE_ENUM.GOODS_PLACE || 'GOODS_PLACE',
},
width: 150,
},
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
index 1b93abf7..80e96c75 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,16 @@
-
+
{{ index + 1 }}
diff --git a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
index 5f1a6da9..9fc15cd7 100644
--- a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@
-
+
{{ text ? text : '' }}
@@ -199,7 +199,6 @@
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
- import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
import DictSelect from '/@/components/support/dict-select/index.vue';
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
import _ from 'lodash';
@@ -235,7 +234,6 @@
title: '商品状态',
dataIndex: 'goodsStatus',
resizable: true,
- sorter: true,
filterOptions: {
type: 'enum-select',
enumName: 'GOODS_STATUS_ENUM',
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
index 9b99085c..2d842036 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,7 @@
-
+
{{ index + 1 }}
diff --git a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
index cf596fbb..bbbe14b3 100644
--- a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@