|
@@ -125,32 +125,32 @@
|
|
|
dataIndex: 'activatedTime',
|
|
dataIndex: 'activatedTime',
|
|
|
width: 180,
|
|
width: 180,
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- title: '出库类型',
|
|
|
|
|
- dataIndex: 'outType',
|
|
|
|
|
- width: 80,
|
|
|
|
|
- customRender: ({ record }) => {
|
|
|
|
|
- let typeObj ={
|
|
|
|
|
- '0':t('routes.product.outType.0'),
|
|
|
|
|
- '4':t('routes.product.outType.4'),
|
|
|
|
|
- '1':t('routes.product.outType.1'),
|
|
|
|
|
- '2':t('routes.product.outType.2'),
|
|
|
|
|
- '3':t('routes.product.outType.3'),
|
|
|
|
|
- }
|
|
|
|
|
- return typeObj[record.outType] || '未出库'
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '经销商名称',
|
|
|
|
|
- dataIndex: 'agentName',
|
|
|
|
|
- ellipsis: false,
|
|
|
|
|
- width: 100,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '客户名称',
|
|
|
|
|
- dataIndex: 'companyName',
|
|
|
|
|
- width: 80,
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // title: '出库类型',
|
|
|
|
|
+ // dataIndex: 'outType',
|
|
|
|
|
+ // width: 80,
|
|
|
|
|
+ // customRender: ({ record }) => {
|
|
|
|
|
+ // let typeObj ={
|
|
|
|
|
+ // '0':t('routes.product.outType.0'),
|
|
|
|
|
+ // '4':t('routes.product.outType.4'),
|
|
|
|
|
+ // '1':t('routes.product.outType.1'),
|
|
|
|
|
+ // '2':t('routes.product.outType.2'),
|
|
|
|
|
+ // '3':t('routes.product.outType.3'),
|
|
|
|
|
+ // }
|
|
|
|
|
+ // return typeObj[record.outType] || '未出库'
|
|
|
|
|
+ // }
|
|
|
|
|
+ // },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // title: '经销商名称',
|
|
|
|
|
+ // dataIndex: 'agentName',
|
|
|
|
|
+ // ellipsis: false,
|
|
|
|
|
+ // width: 100,
|
|
|
|
|
+ // },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // title: '客户名称',
|
|
|
|
|
+ // dataIndex: 'companyName',
|
|
|
|
|
+ // width: 80,
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
title: '绑定账号',
|
|
title: '绑定账号',
|
|
|
dataIndex: 'userName',
|
|
dataIndex: 'userName',
|
|
@@ -173,10 +173,6 @@
|
|
|
const searchForm: Partial<FormProps> = {
|
|
const searchForm: Partial<FormProps> = {
|
|
|
labelWidth: 100,
|
|
labelWidth: 100,
|
|
|
// showAdvancedButton: true,
|
|
// showAdvancedButton: true,
|
|
|
- autoAdvancedLine:1,
|
|
|
|
|
- actionColOptions: {
|
|
|
|
|
- span: 24,
|
|
|
|
|
- },
|
|
|
|
|
// compact: true,
|
|
// compact: true,
|
|
|
schemas: [
|
|
schemas: [
|
|
|
{
|
|
{
|
|
@@ -187,120 +183,7 @@
|
|
|
xl: 6,
|
|
xl: 6,
|
|
|
xxl: 6,
|
|
xxl: 6,
|
|
|
},
|
|
},
|
|
|
- },{
|
|
|
|
|
- field: 'type',
|
|
|
|
|
- component: 'Select',
|
|
|
|
|
- label: '设备类型',
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 6,
|
|
|
|
|
- xxl: 6,
|
|
|
|
|
- },
|
|
|
|
|
- componentProps: {
|
|
|
|
|
- options: [
|
|
|
|
|
- {
|
|
|
|
|
- // label: t('routes.product.type.0'),
|
|
|
|
|
- // value: 0,
|
|
|
|
|
- // key: '0',
|
|
|
|
|
- // },{
|
|
|
|
|
- // label: t('routes.product.type.1'),
|
|
|
|
|
- // value: 1,
|
|
|
|
|
- // key: '1',
|
|
|
|
|
- // },{
|
|
|
|
|
- label: t('routes.product.type.2'),
|
|
|
|
|
- value: 9,
|
|
|
|
|
- key: '9',
|
|
|
|
|
- // },{
|
|
|
|
|
- // label: t('routes.product.type.3'),
|
|
|
|
|
- // value: 10,
|
|
|
|
|
- // key: '10',
|
|
|
|
|
- },
|
|
|
|
|
- ],
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- field: 'ctivated',
|
|
|
|
|
- label: '激活时间',
|
|
|
|
|
- component: 'RangePicker',
|
|
|
|
|
- componentProps: {
|
|
|
|
|
- format: 'YYYY-MM-DD',
|
|
|
|
|
- valueFormat:'YYYY-MM-DD',
|
|
|
|
|
- },
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 7,
|
|
|
|
|
- xxl: 7,
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- field: 'outType',
|
|
|
|
|
- component: 'Select',
|
|
|
|
|
- label: '出库类型',
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 6,
|
|
|
|
|
- xxl: 6,
|
|
|
|
|
- },
|
|
|
|
|
- componentProps: {
|
|
|
|
|
- options: [
|
|
|
|
|
- {
|
|
|
|
|
- label: t('routes.product.outType.0'),
|
|
|
|
|
- value: 0,
|
|
|
|
|
- key: '0',
|
|
|
|
|
- },{
|
|
|
|
|
- label: t('routes.product.outType.4'),
|
|
|
|
|
- value: 4,
|
|
|
|
|
- key: '4',
|
|
|
|
|
- },{
|
|
|
|
|
- label: t('routes.product.outType.1'),
|
|
|
|
|
- value: 1,
|
|
|
|
|
- key: '1',
|
|
|
|
|
- },{
|
|
|
|
|
- label: t('routes.product.outType.2'),
|
|
|
|
|
- value: 2,
|
|
|
|
|
- key: '2',
|
|
|
|
|
- },{
|
|
|
|
|
- label: t('routes.product.outType.3'),
|
|
|
|
|
- value: 3,
|
|
|
|
|
- key: '3',
|
|
|
|
|
- },
|
|
|
|
|
- ],
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- field: 'companyName',
|
|
|
|
|
- label: '客户名称',
|
|
|
|
|
- component: 'Input',
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 6,
|
|
|
|
|
- xxl: 6,
|
|
|
|
|
- },
|
|
|
|
|
- componentProps: {
|
|
|
|
|
- // api: brandTypeListApi,
|
|
|
|
|
- resultField: 'list',
|
|
|
|
|
- labelField: 'name',
|
|
|
|
|
- valueField: 'brandType',
|
|
|
|
|
- params: {
|
|
|
|
|
- page: 1,
|
|
|
|
|
- limit: 1000,
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- field: 'agentName',
|
|
|
|
|
- component: 'Input',
|
|
|
|
|
- label: '经销商名称',
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 7,
|
|
|
|
|
- xxl: 7,
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- field: 'userName',
|
|
|
|
|
- component: 'Input',
|
|
|
|
|
- label: '绑定账号',
|
|
|
|
|
- colProps: {
|
|
|
|
|
- xl: 6,
|
|
|
|
|
- xxl: 6,
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
],
|
|
],
|
|
|
};
|
|
};
|
|
|
const [registerTable, { reload }] = useTable({
|
|
const [registerTable, { reload }] = useTable({
|
