Skip to content

J
jinfa-platform
Commit 17fe950c authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

fix:商品列表操作按钮

parent 2517a999
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 100 deletions
package.json
View file @ 17fe950c
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"@umijs/test": "^3.2.0", "@umijs/test": "^3.2.0",
"bizcharts": "^4.0.7", "bizcharts": "^4.0.7",
"copy-to-clipboard": "^3.3.1", "copy-to-clipboard": "^3.3.1",
"god": "0.1.20", "god": "^0.1.20",
"lingxi-design-ui": "^1.0.6", "lingxi-design-ui": "^1.0.6",
"lint-staged": "^10.0.7", "lint-staged": "^10.0.7",
"mobx": "^5.15.4", "mobx": "^5.15.4",
......
src/components/NiceForm/components/CustomInputSearch.tsx
View file @ 17fe950c
...@@ -20,7 +20,6 @@ const { Option } = Select ...@@ -20,7 +20,6 @@ const { Option } = Select
// } // }
const CustomInputSearch = props => { const CustomInputSearch = props => {
console.log(props, 'props')
const { form } = props const { form } = props
const justifyAlign = props.props['x-component-props'].align || 'flex-end' const justifyAlign = props.props['x-component-props'].align || 'flex-end'
const option = props.props['x-component-props'].dataOption const option = props.props['x-component-props'].dataOption
......
src/pages/commodity/products/addDirectChannel.tsx
View file @ 17fe950c
...@@ -13,9 +13,17 @@ import { StandardTable } from 'god' ...@@ -13,9 +13,17 @@ import { StandardTable } from 'god'
import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController'; import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController';
import ReutrnEle from '@/components/ReturnEle'; import ReutrnEle from '@/components/ReturnEle';
import styles from './index.less' import styles from './index.less'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import NiceForm from '@/components/NiceForm';
import { createFormActions, FormEffectHooks } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect';
import { addChannelSchema } from './schema/channelSchema';
import { PublicApi } from '@/services/api';
import ModalTable from '@/components/ModalTable'
const {Item}:any = Form const {Item}:any = Form
// const { Option } = Select
// 定义选择的行数据的类型 // 定义选择的行数据的类型
interface Item { interface Item {
...@@ -91,36 +99,24 @@ const dataSetMember = [ ...@@ -91,36 +99,24 @@ const dataSetMember = [
class: '铁皮会员', class: '铁皮会员',
}, },
] ]
// 模拟请求
const fetchData = (params:any) => { const productFormActions = createFormActions()
return new Promise((resolve, reject) => {
const queryResult = data.find(v => v.key === params.keywords)
setTimeout(() => {
resolve({
code: 200,
message: '',
data: queryResult ? [queryResult] : data
})
}, 1000)
})
}
const AddDirectChannel:React.FC<{}> = (props) => { const AddDirectChannel:React.FC<{}> = (props) => {
const ref = useRef({}) const ref = useRef<any>({})
const [form] = Form.useForm() const [form] = Form.useForm()
const [setForm] = Form.useForm() const [setForm] = Form.useForm()
const [origin, setOrigin] = useState(0) const [origin, setOrigin] = useState(1)
const [memberType, setMemberType] = useState(0) const [memberType, setMemberType] = useState(0)
const [visibleAddTabs, setVisibleAddTabs] = useState(false) const [visibleAddTabs, setVisibleAddTabs] = useState(false)
const [modifyModal, setModifyModal] = useState(false) const [modifyModal, setModifyModal] = useState(false)
const [ladderPrice, setLadderPrice] = useState(false) const [ladderPrice, setLadderPrice] = useState(false)
const [visibleChannelMember, setVisibleChannelMember] = useState(false) const [visibleChannelMember, setVisibleChannelMember] = useState(false)
const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据 const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [visibleAddSpec, setVisibleAddSpec] = useState(false) const [visibleAddSpec, setVisibleAddSpec] = useState(false)
const [productRowSelection, productRowCtl] = useRowSelectionTable()
const columns: ColumnType<any>[] = [ const columns: ColumnType<any>[] = [
{ {
...@@ -192,6 +188,21 @@ const AddDirectChannel:React.FC<{}> = (props) => { ...@@ -192,6 +188,21 @@ const AddDirectChannel:React.FC<{}> = (props) => {
value:'2' value:'2'
}] }]
}, },
{
type: 'Select',
value: 'parent',
col: 6,
placeHolder: '上级渠道',
statusList: [{
type: 'Select',
label:'AAAAA',
value:'1'
},{
type: 'Select',
label: 'BBBBB',
value:'2'
}]
},
] ]
const searchBarActions: IButtonFilter[] = [ const searchBarActions: IButtonFilter[] = [
...@@ -301,13 +312,41 @@ const AddDirectChannel:React.FC<{}> = (props) => { ...@@ -301,13 +312,41 @@ const AddDirectChannel:React.FC<{}> = (props) => {
} }
] ]
// 获取渠道商品
const fetchProductData = (params: any) => {
return new Promise((resolve, reject) => {
//@ts-ignore
PublicApi.getProductChannelCommodityGetCommodityList(params).then(res => {
console.log(res, 'res')
const { data } = res
resolve(data)
})
})
}
const fetchData = (params:any) => {
return new Promise((resolve, reject) => {
//@ts-ignore
PublicApi.getProductChannelCommodityGetCommodityList(params).then(res => {
console.log(res, 'res')
const { data } = res
resolve(data)
})
})
}
const callback = (key: any) => { const callback = (key: any) => {
console.log(key) console.log(key)
} }
const handleOriginChange = (v:any) => { const handleOriginChange = (v:any) => {
setOrigin(v.target.value) setOrigin(v.target.value)
console.log(v.target.value,'v') productFormActions.setFieldState('parentMemberId', state => {
console.log(state, 'state')
state.visible = v.target.value?true:false
})
} }
const handleMemberTypeChange = (v:any) => { const handleMemberTypeChange = (v:any) => {
...@@ -433,20 +472,21 @@ const AddDirectChannel:React.FC<{}> = (props) => { ...@@ -433,20 +472,21 @@ const AddDirectChannel:React.FC<{}> = (props) => {
initialValue={origin} initialValue={origin}
> >
<Radio.Group onChange={handleOriginChange}> <Radio.Group onChange={handleOriginChange}>
<Radio value={0}>上级渠道商品</Radio> <Radio value={1}>上级渠道商品</Radio>
<Radio value={1}>渠道自有商品</Radio> <Radio value={0}>渠道自有商品</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
</Form> </Form>
<Button onClick={handleAddButton} style={{width:'100%', marginTop: 24, backgroundColor: '#fafbfc'}}> <Button onClick={handleAddButton} style={{width:'100%', marginTop: 24, marginBottom: 24, backgroundColor: '#fafbfc'}}>
<PlusOutlined /> 新增{origin?'渠道自有商品':'上级渠道商品'} <PlusOutlined /> 新增{origin?'上级渠道商品':'渠道自有商品'}
</Button> </Button>
<Table dataSource={[]} columns={columnsSetPrice} rowSelection={{type: 'checkbox',...rowSelectionSetPrice}} />
</TabPane> </TabPane>
<TabPane tab="设置价格" key="2"> <TabPane tab="设置价格" key="2">
<Button onClick={handleAddSpecificationButton} style={{width:'100%', marginBottom: 24, backgroundColor: '#fafbfc'}}> <Button onClick={handleAddSpecificationButton} style={{width:'100%', marginBottom: 24, backgroundColor: '#fafbfc'}}>
<PlusOutlined /> 选择商品规格 <PlusOutlined /> 选择商品规格
</Button> </Button>
<Table dataSource={dataSetPrice} columns={columnsSetPrice} rowSelection={{type: 'checkbox',...rowSelectionSetPrice,}} /> <Table dataSource={dataSetPrice} columns={columnsSetPrice} rowSelection={{type: 'checkbox',...rowSelectionSetPrice}} />
</TabPane> </TabPane>
<TabPane tab="适用会员" key="3"> <TabPane tab="适用会员" key="3">
<Form <Form
...@@ -455,6 +495,12 @@ const AddDirectChannel:React.FC<{}> = (props) => { ...@@ -455,6 +495,12 @@ const AddDirectChannel:React.FC<{}> = (props) => {
name="add-direct-channel" name="add-direct-channel"
labelAlign="left" labelAlign="left"
> >
<Form.Item>
<Radio.Group defaultValue="1" buttonStyle="solid" className={styles.customizeRadio}>
<Radio.Button value="1">渠道采购商</Radio.Button>
<Radio.Button value="2">渠道自有采购商</Radio.Button>
</Radio.Group>
</Form.Item>
<Form.Item <Form.Item
name="memberType" name="memberType"
label="选择渠道会员" label="选择渠道会员"
...@@ -475,26 +521,88 @@ const AddDirectChannel:React.FC<{}> = (props) => { ...@@ -475,26 +521,88 @@ const AddDirectChannel:React.FC<{}> = (props) => {
<Button onClick={handleAddMemberBtn} style={{width:'100%', marginBottom: 24, backgroundColor: '#fafbfc'}}> <Button onClick={handleAddMemberBtn} style={{width:'100%', marginBottom: 24, backgroundColor: '#fafbfc'}}>
<PlusOutlined /> 选择指定会员 <PlusOutlined /> 选择指定会员
</Button> </Button>
<Table dataSource={dataSetMember} columns={columnsSetMember} rowSelection={{type: 'checkbox',...rowSelectionSetMember,}} /> <Table dataSource={dataSetMember} columns={columnsSetMember} rowSelection={{type: 'checkbox',...rowSelectionSetMember}} />
</> : '' </> : ''
} }
</TabPane> </TabPane>
</Tabs> </Tabs>
<Modal
title={origin?'选择渠道自有商品':'选择上级渠道商品'} <ModalTable
modalTitle={origin?'选择上级渠道商品':'选择渠道自有商品'}
confirm={handleOkAddTabs}
cancel={handleCancelAddTabs}
visible={visibleAddTabs}
columns={columns}
rowSelection={productRowSelection}
fetchTableData={(params:any) => fetchProductData(params)}
tableProps={{
rowKey: 'id',
onRow: (record) => ({
onClick: () => {
productRowCtl.setSelectRow([record]);
productRowCtl.setSelectedRowKeys([record.id]);
},
})
}}
controlRender={
<NiceForm
actions={productFormActions}
onSubmit={values =>ref.current.reload(values)}
effects={($, actions) => {
useStateFilterSearchLinkageEffect(
$,
actions,
'name',
FORM_FILTER_PATH,
)
FormEffectHooks.onFieldChange$('brandId').subscribe(state => {
searchBrandOptionEffect(actions, 'brandId')
})
FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => {
searchCustomerCategoryOptionEffect(actions, 'customerCategoryId')
})
}}
schema={addChannelSchema}
/>
}
/>
{/* <Modal
title={origin?'选择上级渠道商品':'选择渠道自有商品'}
visible={visibleAddTabs} visible={visibleAddTabs}
onOk={handleOkAddTabs} onOk={handleOkAddTabs}
onCancel={handleCancelAddTabs} onCancel={handleCancelAddTabs}
width={704}
> >
<StandardTable <StandardTable
columns={columns} columns={columns}
rowSelection={rowSelection} rowSelection={channelRowSelection}
currentRef={ref} currentRef={ref}
fetchTableData={(params:any) => fetchData(params)} fetchTableData={(params:any) => fetchProductData(params)}
formFilters={search} tableProps={{ rowKey: "id" }}
buttonFilters={searchBarActions} controlRender={
<NiceForm
actions={formActions}
onSubmit={values =>ref.current.reload(values)}
effects={($, actions) => {
useStateFilterSearchLinkageEffect(
$,
actions,
'name',
FORM_FILTER_PATH,
)
FormEffectHooks.onFieldChange$('brandId').subscribe(state => {
searchBrandOptionEffect(actions, 'brandId')
})
FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => {
searchCustomerCategoryOptionEffect(actions, 'customerCategoryId')
})
}}
schema={addChannelSchema}
/>
}
/> />
</Modal> </Modal> */}
<Modal <Modal
title="设置价格" title="设置价格"
visible={modifyModal} visible={modifyModal}
......
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @ 17fe950c
...@@ -185,7 +185,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => { ...@@ -185,7 +185,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
// _tempObj['单价'] = {} // _tempObj['单价'] = {}
if(productInfoByEdit?.id){ if(productInfoByEdit?.id){
// 编辑的时候，先指定数据中的货品id，如果是重新组合的不存在id就使用选择的货品中的第一个，如果没有置为0；同理，不存在单价就置为{} // 编辑的时候，先指定数据中的货品id，如果是重新组合的不存在id就使用选择的货品中的第一个，如果没有置为0；同理，不存在单价就置为{}
_tempObj['对应货品'] = productInfoByEdit.unitPriceAndPicList[i]?.goods?.id || selectedGoods[0].id || 0 _tempObj['对应货品'] = productInfoByEdit.unitPriceAndPicList[i]?.goods?.id || selectedGoods[0]?.id || 0
_tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {} _tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {}
}else{ }else{
_tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0 _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0
......
src/pages/commodity/products/addProductsItem/selectGoodsForm.tsx
View file @ 17fe950c
...@@ -37,7 +37,7 @@ const SelectGoodsForm: React.FC<Iprops> = (props) => { ...@@ -37,7 +37,7 @@ const SelectGoodsForm: React.FC<Iprops> = (props) => {
const { id } = history.location.query const { id } = history.location.query
if(id){ if(id){
let _goodsArr: any = productInfoByEdit?.unitPriceAndPicList.map(_ => _.goods) let _goodsArr: any = productInfoByEdit?.unitPriceAndPicList.map(_ => _.goods)
let goodsArr: any = _goodsArr.toString() && _goodsArr.length>0 && Object.values(_goodsArr.reduce((item, next)=>{ let goodsArr: any = _goodsArr.indexOf(null)===-1 && _goodsArr.length>0 && Object.values(_goodsArr.reduce((item, next)=>{
item[next.id] = next; item[next.id] = next;
return item return item
},{})) },{}))
......
src/pages/commodity/products/directChannel.tsx
View file @ 17fe950c
...@@ -24,6 +24,7 @@ import { PublicApi } from '@/services/api' ...@@ -24,6 +24,7 @@ import { PublicApi } from '@/services/api'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect' import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect' import { searchBrandOptionEffect, searchCustomerCategoryOptionEffect } from './effect'
import EyePreview from '@/components/EyePreview' import EyePreview from '@/components/EyePreview'
import moment from 'moment'
// 定义选择的行数据的类型 // 定义选择的行数据的类型
interface Item { interface Item {
...@@ -48,18 +49,6 @@ const DirectChannel: React.FC<{}> = () => { ...@@ -48,18 +49,6 @@ const DirectChannel: React.FC<{}> = () => {
const [isUp, setIsUp] = useState(1) // 1上0下架状态 const [isUp, setIsUp] = useState(1) // 1上0下架状态
const [upDownModal, setUpDownModal] = useState(false) const [upDownModal, setUpDownModal] = useState(false)
// brand: {id: 33, name: "沙县",…}
// code: "P00002M"
// customerCategory: {id: 49, name: "男装"}
// id: 85
// name: "沙县沙滩裤"
// parentMemberId: null
// parentMemberName: null
// priceType: 1
// source: null
// status: 5
// unitName: "件"
const columns: ColumnType<any>[] = [ const columns: ColumnType<any>[] = [
{ {
title: 'ID', title: 'ID',
...@@ -106,17 +95,17 @@ const DirectChannel: React.FC<{}> = () => { ...@@ -106,17 +95,17 @@ const DirectChannel: React.FC<{}> = () => {
title: '商品来源', title: '商品来源',
dataIndex: 'source', dataIndex: 'source',
key: 'source', key: 'source',
render: (text, record) => text === 1 ? '上级渠道' : '渠道自有'
}, },
{ {
title: '操作时间', title: '操作时间',
dataIndex: 'batch', dataIndex: 'createTime',
align: 'center', key: 'createTime',
key: 'batch', render: (text, record) => moment(text).format('YYYY-MM-DD HH:mm:ss')
}, },
{ {
title: '状态', title: '状态',
dataIndex: 'status', dataIndex: 'status',
align: 'center',
key: 'status', key: 'status',
render: (text:any, record:any) => { render: (text:any, record:any) => {
let component: ReactNode = null let component: ReactNode = null
...@@ -149,9 +138,8 @@ const DirectChannel: React.FC<{}> = () => { ...@@ -149,9 +138,8 @@ const DirectChannel: React.FC<{}> = () => {
const fetchData = (params: any) => { const fetchData = (params: any) => {
console.log(params, 'params') console.log(params, 'params')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PublicApi.getProductChannelCommodityGetCommodityList(params).then(res => { PublicApi.getProductChannelCommodityGetChannelCommodityList(params).then(res => {
const { data } = res const { data } = res
console.log(data,'data')
resolve(data) resolve(data)
}) })
}) })
...@@ -290,7 +278,7 @@ const DirectChannel: React.FC<{}> = () => { ...@@ -290,7 +278,7 @@ const DirectChannel: React.FC<{}> = () => {
FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => { FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => {
searchCustomerCategoryOptionEffect(actions, 'customerCategoryId') searchCustomerCategoryOptionEffect(actions, 'customerCategoryId')
}) })
}} }}
schema={channelSchema} schema={channelSchema}
/> />
} }
......
src/pages/commodity/products/fastModifyPrice.tsx
View file @ 17fe950c
...@@ -261,6 +261,7 @@ const FastModifyPrice: React.FC<{}> = () => { ...@@ -261,6 +261,7 @@ const FastModifyPrice: React.FC<{}> = () => {
_priceRange['0-0'] = v.uniquePrice _priceRange['0-0'] = v.uniquePrice
} }
console.log(_priceRange) console.log(_priceRange)
// @ts-ignore
PublicApi.postProductCommodityUpdateCommodityPrice({ commodityId: currentRow.id, unitPriceAndPicId: currentRow.commodityId, unitPrice: _priceRange }).then(res => { PublicApi.postProductCommodityUpdateCommodityPrice({ commodityId: currentRow.id, unitPriceAndPicId: currentRow.commodityId, unitPrice: _priceRange }).then(res => {
if(res.code === 100){ if(res.code === 100){
ref.current.reload() ref.current.reload()
......
src/pages/commodity/products/index.less
View file @ 17fe950c
...@@ -210,4 +210,19 @@ ...@@ -210,4 +210,19 @@
.site-input-right:hover, .site-input-right:hover,
.site-input-right:focus { .site-input-right:focus {
border-right-width: 1px; border-right-width: 1px;
}
// 添加渠道
.customizeRadio{
:global {
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
background-color: #6B778C !important;
border-color: #6B778C !important;
background: #6B778C !important;
}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before{
background-color: #6B778C !important;
}
}
} }
\ No newline at end of file
src/pages/commodity/products/index.tsx
View file @ 17fe950c
...@@ -10,7 +10,8 @@ import { ...@@ -10,7 +10,8 @@ import {
DownOutlined, DownOutlined,
DeleteOutlined, DeleteOutlined,
CaretUpOutlined, CaretUpOutlined,
CaretDownOutlined CaretDownOutlined,
ExclamationCircleOutlined
} from '@ant-design/icons' } from '@ant-design/icons'
import { StandardTable } from 'god' import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface' import { ColumnType } from 'antd/lib/table/interface'
...@@ -20,6 +21,7 @@ import { PublicApi } from '@/services/api' ...@@ -20,6 +21,7 @@ import { PublicApi } from '@/services/api'
import { GetProductCommodityGetShopResponse } from '@/services' import { GetProductCommodityGetShopResponse } from '@/services'
const { Option } = Select; const { Option } = Select;
const { confirm } = Modal;
// 定义选择的行数据的类型 // 定义选择的行数据的类型
interface Item { interface Item {
...@@ -203,45 +205,70 @@ const Products: React.FC<{}> = () => { ...@@ -203,45 +205,70 @@ const Products: React.FC<{}> = () => {
title: '操作', title: '操作',
dataIndex: 'option', dataIndex: 'option',
align: 'center', align: 'center',
render: (text: any, record: any) => { render: (text: any, record: any) => renderOptionButton(record)
return ( // {
<> // return (
<Popconfirm // <>
title="确定要执行这个操作?" // <Popconfirm
onConfirm={() => handleBatchDelete([record.id])} // title="确定要执行这个操作?"
onCancel={cancel} // onConfirm={() => handleBatchDelete([record.id])}
okText="是" // onCancel={cancel}
cancelText="否" // okText="是"
> // cancelText="否"
<Button type='link'>删除</Button> // >
</Popconfirm> // <Button type='link'>删除</Button>
<Dropdown overlay={ // </Popconfirm>
// <Dropdown overlay={
// <Menu>
// <Menu.Item>
// {record.status === 1 ? <Button type='link' onClick={()=>clickSubmitCheck(record)}>提交审核</Button> : ''}
// </Menu.Item>
// {(record.status === 4 || record.status === 6) ? <Menu.Item><Button type='link' onClick={() => clickUp(1, record.id)}>上架</Button></Menu.Item> : ''}
// {record.status === 5 ? <Menu.Item><Button type='link' onClick={() => clickUp(0, record.id)}>下架</Button></Menu.Item> : ''}
// {record.status === 3 || record.status === 1 ? <Menu.Item><Button type='link' onClick={() => clickModify(record.id)}>修改</Button></Menu.Item> : ''}
// <Menu.Item>
// <Button type='link' onClick={()=>clickCopy(record)}>复制</Button>
// </Menu.Item>
// </Menu>
// }>
// <a className="ant-dropdown-link" onClick={e => e.preventDefault()}>
// 更多 <CaretDownOutlined />
// </a>
// </Dropdown>
// </>
// )
// }
}
];
const renderOptionButton = (record: any) => {
return (
<>
<Button type='link' onClick={()=>clickCopy(record)}>复制</Button>
{
record.status === 5 ? <Button type='link' onClick={() => clickUp(0, record.id)}>下架</Button> :
(
record.status !== 2 && <Dropdown overlay={
<Menu> <Menu>
<Menu.Item> {record.status === 1 ? <Menu.Item><Button type='link' onClick={()=>clickSubmitCheck(record)}>提交审核</Button></Menu.Item> : ''}
{record.status === 1 ? <Button type='link' onClick={()=>clickSubmitCheck(record)}>提交审核</Button> : ''}
</Menu.Item>
{(record.status === 4 || record.status === 6) ? <Menu.Item><Button type='link' onClick={() => clickUp(1, record.id)}>上架</Button></Menu.Item> : ''} {(record.status === 4 || record.status === 6) ? <Menu.Item><Button type='link' onClick={() => clickUp(1, record.id)}>上架</Button></Menu.Item> : ''}
{record.status === 5 ? <Menu.Item><Button type='link' onClick={() => clickUp(0, record.id)}>下架</Button></Menu.Item> : ''} {(record.status !== 5) ? <Menu.Item><Button type='link' onClick={() => clickModify(record.id)}>修改</Button></Menu.Item> : ''}
{record.status === 3 || record.status === 1 ? <Menu.Item><Button type='link' onClick={() => clickModify(record.id)}>修改</Button></Menu.Item> : ''} {(record.status === 1 || record.status === 3) ? <Menu.Item><Button type='link' onClick={() => confirmDelete(record.id)}>删除</Button></Menu.Item> : ''}
<Menu.Item>
<Button type='link' onClick={()=>clickCopy(record)}>复制</Button>
</Menu.Item>
</Menu> </Menu>
}> }>
<a className="ant-dropdown-link" onClick={e => e.preventDefault()}> <a className="ant-dropdown-link" onClick={e => e.preventDefault()}>
更多 <CaretDownOutlined /> 更多 <CaretDownOutlined />
</a> </a>
</Dropdown> </Dropdown>
</> )
) }
} </>
} )
]; }
const fetchData = (params: any) => { const fetchData = (params: any) => {
console.log(params, filterParams) console.log(params, filterParams)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
//@ts-ignore
PublicApi.getProductCommodityGetCommodityList({ ...filterParams, ...params}).then(res => { PublicApi.getProductCommodityGetCommodityList({ ...filterParams, ...params}).then(res => {
console.log(res, 'res') console.log(res, 'res')
const { data } = res const { data } = res
...@@ -259,13 +286,13 @@ const Products: React.FC<{}> = () => { ...@@ -259,13 +286,13 @@ const Products: React.FC<{}> = () => {
history.push(`/memberCenter/commodityAbility/commodity/products/addProducts?id=${id}`) history.push(`/memberCenter/commodityAbility/commodity/products/addProducts?id=${id}`)
} }
const confirm = () => { // const confirm = () => {
console.log('confirm') // console.log('confirm')
} // }
const cancel = () => { // const cancel = () => {
console.log('cancel') // console.log('cancel')
} // }
const handleModify = (record: object) => { const handleModify = (record: object) => {
// 通过传入的params字符串判断是修改那种类型的数据 // 通过传入的params字符串判断是修改那种类型的数据
...@@ -497,6 +524,22 @@ const Products: React.FC<{}> = () => { ...@@ -497,6 +524,22 @@ const Products: React.FC<{}> = () => {
}) })
} }
const confirmDelete = (paramId: any) => {
confirm({
title: '确定要执行删除操作?',
icon: <ExclamationCircleOutlined />,
okText: '确定',
okType: 'danger',
cancelText: '取消',
onOk() {
handleBatchDelete([paramId])
},
onCancel() {
console.log('Cancel');
},
});
}
const handleReset = () => { const handleReset = () => {
let restObj = { name: '', code: '', max: null, min: null, priceType: null, brandId: 0, customerCategoryId: 0, status: null } let restObj = { name: '', code: '', max: null, min: null, priceType: null, brandId: 0, customerCategoryId: 0, status: null }
setFilterParams(restObj) setFilterParams(restObj)
......
src/pages/commodity/products/schema/channelSchema.tsx
View file @ 17fe950c
...@@ -2,6 +2,7 @@ import { ISchema } from '@formily/antd'; ...@@ -2,6 +2,7 @@ import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const'; import { FORM_FILTER_PATH } from '@/formSchema/const';
// 渠道商品列表高级搜索
export const channelSchema: ISchema = { export const channelSchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
...@@ -44,10 +45,10 @@ export const channelSchema: ISchema = { ...@@ -44,10 +45,10 @@ export const channelSchema: ISchema = {
}, },
}, },
properties: { properties: {
id: { memberName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: '商品ID' placeholder: '会员名称'
}, },
}, },
brandId: { brandId: {
...@@ -90,6 +91,22 @@ export const channelSchema: ISchema = { ...@@ -90,6 +91,22 @@ export const channelSchema: ISchema = {
{ {
label: '待审核', label: '待审核',
value: 2, value: 2,
},
{
label: '审核不通过',
value: 3,
},
{
label: '审核通过',
value: 4,
},
{
label: '上架',
value: 5,
},
{
label: '下架',
value: 6,
} }
], ],
'x-component-props': { 'x-component-props': {
...@@ -97,12 +114,27 @@ export const channelSchema: ISchema = { ...@@ -97,12 +114,27 @@ export const channelSchema: ISchema = {
style: { width: '174px' }, style: { width: '174px' },
}, },
}, },
// price: { priceType: {
// type: 'string', type: 'string',
// 'x-component-props': { enum: [
// placeholder: '商品价格' {
// }, label: '现货价格',
// }, value: 1,
},
{
label: '价格需要询价',
value: 2,
},
{
label: '积分兑换商品',
value: 3,
}
],
'x-component-props': {
placeholder: '产品定价',
style: { width: '174px' },
},
},
'NO_NAME_FIELD_$2': { 'NO_NAME_FIELD_$2': {
type: 'object', type: 'object',
'x-component': 'layout', 'x-component': 'layout',
...@@ -159,4 +191,101 @@ export const channelSchema: ISchema = { ...@@ -159,4 +191,101 @@ export const channelSchema: ISchema = {
}, },
}, },
}, },
}; };
\ No newline at end of file
// 添加渠道商品模态框高级筛选
export const addChannelSchema: ISchema = {
type: 'object',
properties: {
mageLayout: {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
},
properties: {
name: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '商品名称',
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start'
},
colStyle: {
marginLeft: 20,
},
},
properties: {
brandId: {
type: 'string',
'x-component': 'CustomInputSearch',
'x-component-props': {
placeholder: '商品品牌',
showSearch: true,
showArrow: true,
defaultActiveFirstOption: false,
filterOption: false,
notFoundContent: null,
searchValue: null,
dataOption: [],
},
},
customerCategoryId: {
type: 'string',
'x-component': 'CustomInputSearch',
'x-component-props': {
placeholder: '商品品类',
showSearch: true,
showArrow: true,
defaultActiveFirstOption: false,
filterOption: false,
notFoundContent: null,
searchValue: null,
dataOption: []
},
},
parentMemberId: {
type: 'string',
enum: [
{
label: '渠道1',
value: 1,
},
{
label: '渠道2',
value: 2,
},
],
'x-component-props': {
placeholder: '上级渠道',
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
},
},
},
},
},
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment