mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-09-17 19:06:39 +08:00
修改前端页面部分细节
This commit is contained in:
parent
66aac47a43
commit
ade82f8aa2
@ -25,7 +25,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item label="产地" name="place" class="smart-query-form-item">
|
<a-form-item label="产地" name="place" class="smart-query-form-item">
|
||||||
<DictSelect :dictCode="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
|
<DictSelect :dict-code="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item label="商品状态" name="goodsStatus" class="smart-query-form-item">
|
<a-form-item label="商品状态" name="goodsStatus" class="smart-query-form-item">
|
||||||
@ -93,7 +93,7 @@
|
|||||||
</a-button>
|
</a-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="smart-table-setting-block">
|
<div class="smart-table-setting-block">
|
||||||
<TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData"/>
|
<TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData" />
|
||||||
</div>
|
</div>
|
||||||
</a-row>
|
</a-row>
|
||||||
<!---------- 表格操作行 end ----------->
|
<!---------- 表格操作行 end ----------->
|
||||||
@ -120,7 +120,7 @@
|
|||||||
{{ text }}
|
{{ text }}
|
||||||
</template>
|
</template>
|
||||||
<template v-if="column.dataIndex === 'place'">
|
<template v-if="column.dataIndex === 'place'">
|
||||||
<DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
|
<DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
|
||||||
</template>
|
</template>
|
||||||
<template v-if="column.dataIndex === 'remark'">
|
<template v-if="column.dataIndex === 'remark'">
|
||||||
<span>{{ text ? text : '' }}</span>
|
<span>{{ text ? text : '' }}</span>
|
||||||
@ -199,7 +199,6 @@
|
|||||||
import { smartSentry } from '/@/lib/smart-sentry';
|
import { smartSentry } from '/@/lib/smart-sentry';
|
||||||
import TableOperator from '/@/components/support/table-operator/index.vue';
|
import TableOperator from '/@/components/support/table-operator/index.vue';
|
||||||
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
|
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 DictSelect from '/@/components/support/dict-select/index.vue';
|
||||||
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
|
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
@ -235,7 +234,6 @@
|
|||||||
title: '商品状态',
|
title: '商品状态',
|
||||||
dataIndex: 'goodsStatus',
|
dataIndex: 'goodsStatus',
|
||||||
resizable: true,
|
resizable: true,
|
||||||
sorter: true,
|
|
||||||
filterOptions: {
|
filterOptions: {
|
||||||
type: 'enum-select',
|
type: 'enum-select',
|
||||||
enumName: 'GOODS_STATUS_ENUM',
|
enumName: 'GOODS_STATUS_ENUM',
|
||||||
@ -248,7 +246,7 @@
|
|||||||
resizable: true,
|
resizable: true,
|
||||||
filterOptions: {
|
filterOptions: {
|
||||||
type: 'dict-select',
|
type: 'dict-select',
|
||||||
dictCode: DICT_CODE_ENUM.GOODS_PLACE,
|
dictCode: DICT_CODE_ENUM.GOODS_PLACE || 'GOODS_PLACE',
|
||||||
},
|
},
|
||||||
width: 150,
|
width: 150,
|
||||||
},
|
},
|
||||||
|
@ -39,7 +39,16 @@
|
|||||||
<TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
|
<TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|
||||||
<a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
|
<a-table
|
||||||
|
size="small"
|
||||||
|
:scroll="{ x: 1000 }"
|
||||||
|
:loading="tableLoading"
|
||||||
|
bordered
|
||||||
|
:dataSource="tableData"
|
||||||
|
:columns="columns"
|
||||||
|
rowKey="configId"
|
||||||
|
:pagination="false"
|
||||||
|
>
|
||||||
<template #bodyCell="{ record, index, column }">
|
<template #bodyCell="{ record, index, column }">
|
||||||
<template v-if="column.dataIndex === 'seq'">
|
<template v-if="column.dataIndex === 'seq'">
|
||||||
{{ index + 1 }}
|
{{ index + 1 }}
|
||||||
|
@ -88,6 +88,7 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
size="small"
|
size="small"
|
||||||
|
:scroll="{ x: 1000 }"
|
||||||
:defaultExpandAllRows="true"
|
:defaultExpandAllRows="true"
|
||||||
:dataSource="tableData"
|
:dataSource="tableData"
|
||||||
bordered
|
bordered
|
||||||
|
@ -120,7 +120,7 @@
|
|||||||
{{ text }}
|
{{ text }}
|
||||||
</template>
|
</template>
|
||||||
<template v-if="column.dataIndex === 'place'">
|
<template v-if="column.dataIndex === 'place'">
|
||||||
<DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
|
<DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
|
||||||
</template>
|
</template>
|
||||||
<template v-if="column.dataIndex === 'remark'">
|
<template v-if="column.dataIndex === 'remark'">
|
||||||
<span>{{ text ? text : '' }}</span>
|
<span>{{ text ? text : '' }}</span>
|
||||||
@ -199,7 +199,6 @@
|
|||||||
import { smartSentry } from '/@/lib/smart-sentry';
|
import { smartSentry } from '/@/lib/smart-sentry';
|
||||||
import TableOperator from '/@/components/support/table-operator/index.vue';
|
import TableOperator from '/@/components/support/table-operator/index.vue';
|
||||||
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
|
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 DictSelect from '/@/components/support/dict-select/index.vue';
|
||||||
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
|
import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
@ -235,7 +234,6 @@
|
|||||||
title: '商品状态',
|
title: '商品状态',
|
||||||
dataIndex: 'goodsStatus',
|
dataIndex: 'goodsStatus',
|
||||||
resizable: true,
|
resizable: true,
|
||||||
sorter: true,
|
|
||||||
filterOptions: {
|
filterOptions: {
|
||||||
type: 'enum-select',
|
type: 'enum-select',
|
||||||
enumName: 'GOODS_STATUS_ENUM',
|
enumName: 'GOODS_STATUS_ENUM',
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
<TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
|
<TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|
||||||
<a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
|
<a-table size="small" :scroll="{ x: 1000 }" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
|
||||||
<template #bodyCell="{ record, index, column }">
|
<template #bodyCell="{ record, index, column }">
|
||||||
<template v-if="column.dataIndex === 'seq'">
|
<template v-if="column.dataIndex === 'seq'">
|
||||||
{{ index + 1 }}
|
{{ index + 1 }}
|
||||||
|
@ -88,6 +88,7 @@
|
|||||||
<a-table
|
<a-table
|
||||||
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
||||||
size="small"
|
size="small"
|
||||||
|
:scroll="{ x: 1000 }"
|
||||||
:defaultExpandAllRows="true"
|
:defaultExpandAllRows="true"
|
||||||
:dataSource="tableData"
|
:dataSource="tableData"
|
||||||
bordered
|
bordered
|
||||||
|
Loading…
Reference in New Issue
Block a user