xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块

Browse Source
This commit is contained in:
Haiyi 2022-09-21 10:17:38 +08:00
commit 45de2e92c0
25 changed files with 815 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/api/delivery/index.ts Normal file
View File

@ -0,0 +1,51 @@
import { useRequest } from '@/use/useHttp'
//列表
export const DeliverNoticeOrderList = () => {
return useRequest({
url: `/v1/mp/deliveryNoticeOrder/list`,
method: 'get',
})
}
//发货详情
export const DeliverNoticeOrder = () => {
return useRequest({
url: `/v1/mp/deliveryNoticeOrder`,
method: 'get',
})
}
//发货附件上传
export const DeliveryNoticeOrderUpload = () => {
return useRequest({
url: `/v1/mp/deliveryNoticeOrder/upload`,
method: 'put',
})
}
//审核发货单
export const DeliveryNoticeOrderAudit = () => {
return useRequest({
url: `/v1/mp/deliveryNoticeOrder/audit`,
method: 'put',
})
}
//采购退货的拒收接口
export const DeliveryNoticeOrderRejection = () => {
return useRequest({
url: `/v1/mp/deliveryNoticeOrder/rejection`,
method: 'put',
})
}
//类型枚举
export const EnumDeliveryNoticeTypeList = () => {
return useRequest({
url: `/v1/mp/enum/deliveryNoticeType/list`,
method: 'get',
})
}
//tabs枚举
export const EnumSaleorderStatus = () => {
return useRequest({
url: `/v1/mp/enum/sale/order/status`,
method: 'get',
})
}

10
src/api/index.ts
View File

@ -11,6 +11,16 @@ export {
export { ShoppingCartUpdateApi, ShoppingCartDeleteApi, ShoppingCartListApi } from './shopping/index'
export {
DeliverNoticeOrderList,
DeliverNoticeOrder,
DeliveryNoticeOrderUpload,
DeliveryNoticeOrderAudit,
DeliveryNoticeOrderRejection,
EnumDeliveryNoticeTypeList,
EnumSaleorderStatus,
} from './delivery/index'
import { useRequest } from '@/use/useHttp'
/**
* 系列列表

4
src/app.config.ts
View File

@ -40,6 +40,10 @@ export default defineAppConfig({
root: 'pages/delivery',
pages: ['index'],
},
{
root: 'pages/deliveryDetail',
pages: ['index'],
},
{
root: 'pages/colorRelated',
pages: ['sampleComparison/index', 'takeColor/index', 'findColor/index'],

3
src/common/util.ts
View File

@ -111,6 +111,7 @@ export const dataLoadingStatus = ({ list = [], total = 0, status = false }: { li
function delay(delayTime = 25): Promise<null> {
return new Promise(resolve => {
setTimeout(() => {
// @ts-ignore
resolve()
}, delayTime)
})
@ -171,4 +172,4 @@ export const shareShop = () => {
}
export {
delayQuerySelector
}
}

39
src/components/SegmentedControl/index.module.scss
View File

@ -1,19 +1,22 @@
.status_list{
background-color: #fff;
font-size: $font_size;
color: #000;
// margin-top: 20px;
.status_item{
padding: 20px;
box-sizing: border-box;
}
.selected{
font-weight: 700;
color: #337FFF;
border-bottom: 4px solid #337FFF;
}
.list_scroll{
white-space: nowrap;
display: flex;
}
.status_list {
display: flex;
flex-flow: row nowrap;
background-color: #fff;
font-size: $font_size;
color: #000;
// margin-top: 20px;
.status_item {
padding: 20px;
box-sizing: border-box;
}
.list_scroll {
display: flex;
justify-content: space-around;
white-space: nowrap;
}
}
.selected {
font-weight: 700;
color: #337fff;
border-bottom: 4px solid #337fff;
}

20
src/components/SegmentedControl/index.tsx
View File

@ -3,10 +3,15 @@ import classnames from 'classnames'
import { FC, useEffect, useState } from 'react'
import styles from './index.module.scss'
type Segment = {
id: number
name: string
}
type PropsType = {
list: { id: number; name: string }[]
defaultId?: number | null
onSelect?: (val: number) => void
list: Segment[]
defaultId?: number
onSelect?: (data: {id: number, name:string}) => void
}
const segmentedControl: FC<PropsType> = (props) => {
@ -14,9 +19,10 @@ const segmentedControl: FC<PropsType> = (props) => {
selected: -1, //当前选中的id
tabId: '', //需要滚动到的id
})
const { list, defaultId, onSelect } = props
const { list, defaultId = -1, onSelect } = props
useEffect(() => {
console.log('defaultId', defaultId)
if (typeof defaultId === 'number' && defaultId >= 0) {
console.log('defaultId:::', defaultId)
const index = list?.findIndex((item) => {
@ -28,12 +34,13 @@ const segmentedControl: FC<PropsType> = (props) => {
}
}
setSelectInfo((e) => ({ ...e, selected: defaultId || -1 }))
console.log('selectInfo', selectInfo)
}, [defaultId])
const clickEvent = ({ item, index }: { item: any; index: number }) => {
const num = index > 0 ? index - 1 : 0
setSelectInfo((e) => ({ ...e, tabId: list[num].id.toString(), selected: item.id }))
onSelect?.(item.id)
onSelect?.(item)
}
return (
@ -41,12 +48,13 @@ const segmentedControl: FC<PropsType> = (props) => {
<ScrollView scrollX scrollIntoView={`tabs_${selectInfo.tabId}`} scrollWithAnimation={true}>
<View className={styles.list_scroll}>
{list.map((item, index) => {
console.log('selected=+>', selectInfo.selected)
return (
<View
key={item.id}
id={`tabs_${item.id}`}
onClick={() => clickEvent({ item, index })}
className={classnames(styles.status_item, selectInfo.selected == item.id && styles.selected)}>
className={classnames(styles.status_item, selectInfo.selected === item.id ? styles.selected : '')}>
{item.name}
</View>
)

3
src/components/normalButton/index.module.scss
View File

@ -57,6 +57,9 @@
}
}
&--text {
display: flex;
flex-flow: row nowrap;
align-items: center;
color: currentColor;
}
// active 伪类

4
src/components/normalButton/index.tsx
View File

@ -17,6 +17,7 @@ interface PropsType {
onClick?: Function
customClassName?: string
customStyles?: React.CSSProperties
customTextClassName?: string
}
const NormalButton: FC<PropsType> = (props) => {
@ -31,6 +32,7 @@ const NormalButton: FC<PropsType> = (props) => {
circle = false,
customStyles = {},
customClassName = '',
customTextClassName = ''
} = props
const getClassName = () => {
const classObject = {
@ -54,7 +56,7 @@ const NormalButton: FC<PropsType> = (props) => {
return (
<View className={classnames(styles['button'], getClassName(), customClassName)} style={customStyles} onClick={handleClick}>
<Text className={styles['button--text']}>{children}</Text>
<View className={classnames(styles['button--text'], customTextClassName)}>{children}</View>
</View>
)
}

131
src/components/search/index.module.scss
View File

@ -1,69 +1,76 @@
.search_main{
.search_main {
display: flex;
align-items: center;
position: relative;
width: 100%;
z-index: 0;
.icon_a_sousuo1_self {
color: $color_font_two;
}
.search_con {
position: relative;
display: flex;
align-items: center;
position: relative;
width: 100%;
z-index: 0;
.icon_a_sousuo1_self{
font-size: 37px;
color: $color_font_two;
flex: 1 1 auto;
justify-content: space-between;
.input_bar {
border-radius: 50px;
width: 100%;
height: 60px;
flex: 1 1 auto;
padding-left: 60px;
padding-right: 30px;
background: #eee;
box-sizing: border-box;
display: flex;
align-items: center;
}
.search_con{
position: relative;
display: flex;
align-items: center;
flex: 1 1 auto;
input{
font-size: 27px;
background: #eee;
width: 100%;
height: 60px;
border-radius: 50px;
padding: 0 60px;
box-sizing: border-box;
z-index:0;
&::-webkit-input-placeholder { /* WebKit browsers */
color: #999;
font-size: 16px;
}
&::-moz-placeholder { /* Mozilla Firefox 19+ */
color: #999;
font-size: 16px;
}
&::-ms-input-placeholder { /* Internet Explorer 10+ */
color: #999;
font-size: 16px;
}
}
.search_closeBtn{
position: absolute;
right: 10px;
}
}
.btn{
width: 100px;
font-size: $font_size_medium;
color: $color_font_two;
display: flex;
justify-content: center;
align-items: center;
input {
flex: 1 1 auto;
font-size: 27px;
z-index: 0;
&::-webkit-input-placeholder {
/* WebKit browsers */
color: #999;
font-size: 16px;
}
&::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #999;
font-size: 16px;
}
&::-ms-input-placeholder {
/* Internet Explorer 10+ */
color: #999;
font-size: 16px;
}
}
.icon_inner{
margin-right: 20px;
position: absolute;
left: 10px;
margin-right: 0;
z-index: 10;
.search_closeBtn {
margin: 0 15px;
flex: none;
}
.icon_out{
margin-right: 10px;
}
.input_out{
padding-left: 20px !important;
}
}
.btn {
width: 100px;
font-size: $font_size_medium;
color: $color_font_two;
display: flex;
justify-content: center;
align-items: center;
}
.icon_inner {
margin-right: 20px;
position: absolute;
left: 10px;
margin-right: 0;
z-index: 10;
}
.icon_out {
margin-right: 10px;
}
.input_out {
padding-left: 20px !important;
}
}

180
src/components/search/index.tsx
View File

@ -1,110 +1,116 @@
import { Input, View } from "@tarojs/components";
import styles from "./index.module.scss"
import CloseBtn from "@/components/closeBtn"
import classnames from "classnames";
import { debounce } from "@/common/util";
import { Children, forwardRef, memo, ReactElement, ReactNode, useEffect, useImperativeHandle, useRef, useState } from "react";
import { Input, View } from '@tarojs/components'
import styles from './index.module.scss'
import CloseBtn from '@/components/closeBtn'
import classnames from 'classnames'
import { debounce } from '@/common/util'
import { Children, forwardRef, memo, ReactElement, ReactNode, useEffect, useImperativeHandle, useRef, useState } from 'react'
import IconFont from '../iconfont/iconfont'
type Params = {
clickOnSearch?: (val: string) => void
disabled?: false | true,
placeholder?: string,
changeOnSearch?: (any) => void,
showIcon?: false | true,
placeIcon?: 'out' | 'inner',
style?: Object,
showBtn?: false | true,
btnStyle?: Object,
btnTitle?: string,
debounceTime?: number //防抖时间，不设默认为零
defaultValue?: string,
children?: ReactNode,
customRightSlot?: ReactNode
clickOnSearch?: (val: string) => void
disabled?: false | true
placeholder?: string
changeOnSearch?: (value: string) => void
showIcon?: false | true
placeIcon?: 'out' | 'inner'
style?: Object
showBtn?: false | true
btnStyle?: Object
btnTitle?: string
debounceTime?: number //防抖时间，不设默认为零
defaultValue?: string
children?: ReactNode
customRightSlot?: ReactNode
}
export default memo(forwardRef(({
clickOnSearch, //点击筛选按钮触发
changeOnSearch, //输入文字触发
disabled = false, //是否禁用
placeholder = '输入搜索内容',
showIcon = true, //是否显示关闭图标
showBtn = false, //是否显示搜索按钮
btnStyle = {},
placeIcon = 'inner', //搜索图标位置：inner在里面，out在外面
btnTitle = '搜索', //搜索文字
debounceTime = 0, //防抖时间，不设默认为零
defaultValue = '',//默认值
children,
customRightSlot
}: Params, ref) => {
const [inputCon, setInputCon] = useState('')
const debounceTimeRef = useRef(0)
useEffect(() => {
export default memo(
forwardRef(
(
{
clickOnSearch, //点击筛选按钮触发
changeOnSearch, //输入文字触发
disabled = false, //是否禁用
placeholder = '输入搜索内容',
showIcon = true, //是否显示关闭图标
showBtn = false, //是否显示搜索按钮
btnStyle = {},
placeIcon = 'inner', //搜索图标位置：inner在里面，out在外面
btnTitle = '搜索', //搜索文字
debounceTime = 0, //防抖时间，不设默认为零
defaultValue = '', //默认值
children,
customRightSlot,
}: Params,
ref,
) => {
const [inputCon, setInputCon] = useState('')
const debounceTimeRef = useRef(0)
useEffect(() => {
setInputCon(defaultValue)
}, [defaultValue])
}, [defaultValue])
useEffect(() => {
useEffect(() => {
debounceTimeRef.current = debounceTime
}, [debounceTime])
}, [debounceTime])
const onInputEven = (e) => {
const onInputEven = (e) => {
const value = e.detail.value
changeData(value)
}
}
useImperativeHandle(ref, () => ({
clearInput
}))
useImperativeHandle(ref, () => ({
clearInput,
}))
const clearInput = () => {
const clearInput = () => {
setInputCon('')
changeOnSearch?.('')
}
}
const changeData = debounce((value) => {
const changeData = debounce((value) => {
setInputCon(value)
changeOnSearch?.(value)
}, debounceTimeRef.current)
}, debounceTimeRef.current)
const onSearch = () => {
const onSearch = () => {
clickOnSearch?.(inputCon)
}
}
return (
<>
<View className={styles.search_main}>
<View className={styles.search_con}>
{showIcon && (
<View
className={classnames(
'iconfont',
'icon-sousuo',
styles.icon_a_sousuo1_self,
placeIcon == 'inner' ? styles.icon_inner : styles.icon_out,
)}></View>
)}
<Input
placeholderStyle='color:#ABABAB; font-size:26rpx'
onConfirm={onSearch}
className={classnames(placeIcon == 'out' && styles.input_out)}
disabled={disabled}
value={inputCon}
placeholder={placeholder}
onInput={(e) => onInputEven(e)}></Input>
{!!inputCon && (
<View className={styles.search_closeBtn}>
<CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />
return (
<>
<View className={styles.search_main}>
<View className={styles.search_con}>
{showIcon && (
<IconFont
name='icon-sousuo'
size={37}
customClassName={classnames(styles.icon_a_sousuo1_self, placeIcon == 'inner' ? styles.icon_inner : styles.icon_out)}></IconFont>
)}
<View className={styles.input_bar}>
<Input
placeholderStyle='color:#ABABAB; font-size:26rpx'
onConfirm={onSearch}
className={classnames(placeIcon == 'out' && styles.input_out)}
disabled={disabled}
value={inputCon}
placeholder={placeholder}
onInput={(e) => onInputEven(e)}
/>
<View className={styles.search_closeBtn}>
{!!inputCon && <CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />}
</View>
<View>{customRightSlot}</View>
</View>
</View>
{showBtn && (
<View style={btnStyle} className={styles.btn} onClick={onSearch}>
{btnTitle}
</View>
)}
{customRightSlot}
{children}
</View>
{showBtn && (
<View style={btnStyle} className={styles.btn} onClick={onSearch}>
{btnTitle}
</View>
)}
{children}
</View>
</>
)
}))
</>
)
},
),
)

15
src/components/tag/index.tsx
View File

@ -15,10 +15,21 @@ interface PropsType {
onClick?: Function
circle?: boolean
customStyle?: React.CSSProperties
customClassName?: string
}
const Tag: FC<PropsType> = (props) => {
const { type = 'primary', size = 'normal', disabled = false, children, onClick, circle = false, customStyle = {}, plain = false } = props
const {
type = 'primary',
size = 'normal',
disabled = false,
children,
onClick,
circle = false,
customStyle = {},
plain = false,
customClassName = '',
} = props
const handleClick = (event) => {
if (disabled) {
return
@ -37,7 +48,7 @@ const Tag: FC<PropsType> = (props) => {
return classObject
}
return (
<View className={classnames(styles.tag, getClassName())} style={customStyle} onClick={handleClick}>
<View className={classnames(styles.tag, getClassName(), customClassName)} style={customStyle} onClick={handleClick}>
<Text className={styles['tag--text']}>{children}</Text>
</View>
)

0
src/pages/delivery/components/DeliveryStatusList/index.module.scss Normal file
View File

42
src/pages/delivery/components/DeliveryStatusList/index.tsx Normal file
View File

@ -0,0 +1,42 @@
import SegmentedControl from '@/components/segmentedControl'
import { FC, memo, useCallback, useEffect, useState } from 'react'
import { EnumSaleorderStatus } from '@/api/index'
type PropsType = {
onChangeStatus?: (data: {id: number, name: string}) => void
}
const DeliveryStatusList = memo<PropsType>((props) => {
const { onChangeStatus } = props
const { fetchData } = EnumSaleorderStatus()
const [statusList, setStatusList] = useState([
{
id: -1,
name: '全部',
},
])
// 请求
const getDeliveryStatusList = async () => {
const res = await fetchData()
console.log(res.data.list);
setStatusList(
res.data.list.filter((item) => {
return item.id === 3 || item.id === 4 // 待发货 已完成
}),
)
}
useEffect(() => {
getDeliveryStatusList()
}, [])
// //状态改变
const changeStatus = useCallback(
(data: {id:number, name: string}) => {
onChangeStatus && onChangeStatus({ id: data.id, name: data.name })
},
[onChangeStatus],
)
return <SegmentedControl list={statusList} onSelect={changeStatus} defaultId={statusList[0].id} />
})
export default DeliveryStatusList

41
src/pages/delivery/components/Filter/index.module.scss Normal file
View File

@ -0,0 +1,41 @@
.filterItem {
margin: 24px 48px;
&--title {
font-size: 28px;
font-weight: 550;
line-height: 1.5;
}
&--wrapper {
margin-top: 24px;
display: grid;
grid-gap: 16px 16px;
}
}
.filter {
&--time {
grid-template-columns: 1fr 1fr 1fr 1fr;
}
&--inputBar {
}
&--type {
grid-template-columns: 1fr 1fr;
}
}
.filterTypeButton{
padding: 0 24px;
font-size: 28px;
}
.filterTypeText{
color: #6e6e6e !important;
}
.filterTimeButton{
padding: 0 24px;
font-size: 28px;
grid-column-start: span 2;
}
.selected{
background-color: #eaf2ff;
}

152
src/pages/delivery/components/Filter/index.tsx Normal file
View File

@ -0,0 +1,152 @@
import NormalButton from "@/components/normalButton"
import Popup from "@/components/popup"
import { View } from "@tarojs/components"
import classnames from "classnames"
import styles from './index.module.scss'
import { FC, memo, useEffect, useState } from 'react'
import Search from "@/components/search"
import IconFont from "@/components/iconfont/iconfont"
import {EnumDeliveryNoticeTypeList} from '@/api/index'
type SearchFilter = {
type?: number
}
const scanIcon = () => {
// 扫描
const handleScan = () => {}
return (
<View onClick={handleScan} className={styles.scanHandler}>
<IconFont name='icon-saomiao' size={40}></IconFont>
</View>
)
}
const DeliveryFilter: FC = memo(() => {
const {fetchData} = EnumDeliveryNoticeTypeList()
const [searchFilter, useSearchFilter] = useState<SearchFilter>({
})
const handleSelectedType = (type: string | number) => {
if (typeof type === 'string' && type === 'default') {
// setSearch((e) => ({ ...e }))
} else {
// setSearch((e) => ({ ...e, type: type as number }))
}
}
const handleSearchBarChange = () => {}
useEffect(() => {
getEnumData()
}, [])
const [typeList, setTypeList] = useState<{id: number, name: string}[]>()
const getEnumData = async () => {
const res = await fetchData()
setTypeList(res.data.list)
}
return (
<>
<View className={styles.filterItem}>
<View className={styles['filterItem--title']}>发货类型</View>
<View className={classnames(styles['filterItem--wrapper'], styles['filter--type'])}>
<NormalButton
type={searchFilter.type == null ? 'primary' : 'info'}
plain={searchFilter.type === null}
circle
customClassName={classnames(styles.filterTypeButton)}
customTextClassName={searchFilter.type === null && styles.filterTypeText}
onClick={() => handleSelectedType('default')}>
不限
</NormalButton>
{!!typeList?.length && typeList?.map(item => {
return (
<NormalButton
type={searchFilter.type === item?.id ? 'primary' : 'info'}
plain={searchFilter.type !== item?.id}
circle
customClassName={styles.filterTypeButton}
customTextClassName={searchFilter.type === item?.id && styles.filterTypeText}
onClick={() => handleSelectedType(item?.id)}>
{item.name}
</NormalButton>
)
})}
{/* <NormalButton
type={searchFilter.type === 0 ? 'primary' : 'info'}
plain={searchFilter.type !== 0}
circle
customClassName={styles.filterTypeButton}
customTextClassName={searchFilter.type === 0 && styles.filterTypeText}
onClick={() => handleSelectedType(1)}>
销售发货单
</NormalButton>
<NormalButton
type={searchFilter.type === 0 ? 'primary' : 'info'}
plain={searchFilter.type !== 0}
circle
customClassName={styles.filterTypeButton}
customTextClassName={searchFilter.type === 1 && styles.filterTypeText}
onClick={() => handleSelectedType(2)}>
调拨发货单
</NormalButton>
<NormalButton
type={searchFilter.type === 0 ? 'primary' : 'info'}
plain={searchFilter.type !== 0}
circle
customClassName={styles.filterTypeButton}
customTextClassName={searchFilter.type === 2 && styles.filterTypeText}
onClick={() => handleSelectedType(3)}>
采购退货单
</NormalButton> */}
</View>
</View>
<View className={styles.filterItem}>
<View className={styles['filterItem--title']}>发货单号</View>
<View className={classnames(styles['filterItem--wrapper'], styles['filter--inputBar'])}>
<Search
placeholder='请输入或扫描条形码'
showBtn={false}
changeOnSearch={handleSearchBarChange}
debounceTime={300}
customRightSlot={scanIcon()}></Search>
</View>
</View>
<View className={styles.filterItem}>
<View className={styles['filterItem--title']}>查询日期</View>
<View className={classnames(styles['filterItem--wrapper'], styles['filter--time'])}>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
不限
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
今天
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
昨日
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
近7日
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
近30日
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTypeButton}>
近90日
</NormalButton>
<NormalButton type='primary' circle customClassName={styles.filterTimeButton}>
自定义起始时间{<IconFont name='icon-chakanquanbukehu' size={60}></IconFont>}
</NormalButton>
</View>
</View>
</>
)
})
export default DeliveryFilter

18
src/pages/delivery/components/ItemList/index.module.scss
View File

@ -2,19 +2,25 @@
margin: 24px;
}
.topBar {
font-size: 28px;
&__orderNo {
display: flex;
flex-flow: row nowrap;
justify-content: space-between;
color: $color_font_one;
font-size: 28px;
}
&__orderType {
color: rgba($color: #000000, $alpha: 0.6);
font-weight: 550;
}
&__orderStatus {
color: #e42945;
font-weight: 550;
&--toBeAudited{
color: #e42945;
}
&--finish{
color: $color_main;
}
}
}
.content {
@ -26,8 +32,10 @@
font-size: 28px;
color: rgba($color: #000000, $alpha: 0.4);
&__left {
min-width: 140px;
}
&__right {
@include common_ellipsis(2);
}
}
}
@ -36,10 +44,11 @@
flex-flow: row nowrap;
justify-content: flex-end;
align-items: center;
padding: 0 24px;
margin-top: 10px;
&__button {
margin: 0 24px;
font-size: 28px;
padding: 0 26px;
}
&__button:last-child {
margin: 0;
@ -48,3 +57,6 @@
.bord {
color: $color_font_one;
}
.tag{
margin: 0 16px;
}

86
src/pages/delivery/components/ItemList/index.tsx
View File

@ -5,58 +5,104 @@ import { View, Text } from '@tarojs/components'
import { FC } from 'react'
import NormalButton from '@/components/normalButton'
import styles from './index.module.scss'
import classnames from 'classnames'
import { EnumSaleMode } from '@/common/Enumerate'
import { formatDateTime } from '@/common/format'
import { goLink } from '@/common/common'
import { DeliveryNoticeOrderAudit } from '@/api/index'
import Taro from '@tarojs/taro'
type PropsType = {
itemData?: Record<string, any>
onSuccess?: Function
}
const ItemList:FC<PropsType> = (props) => {
const { itemData } = props
const { itemData, onSuccess } = props
// 查看详情
const handleDetail = () => {
const handleDetail = (id: number) => {
goLink('/pages/deliveryDetail/index', {
id
})
}
// 确认审核
const handleAudit = () => {
const {fetchData, state} = DeliveryNoticeOrderAudit()
// 确认审核
const handleAudit = (id: number) => {
Taro.showModal({
content: '确认要审核吗？',
confirmColor: '#337FFF',
success: async (res) => {
if (res.confirm) {
const res = await fetchData({ id })
if (res.success) {
Taro.showToast({ title: '审核成功', icon: 'success' })
onSuccess?.()
}else{
Taro.showToast({ title: '审核失败', icon: 'error' })
}
}
},
})
}
return (
<LayoutBlock circle customClassName={styles.layoutBlock}>
<View className={styles.topBar}>
<View className={styles.topBar__orderNo}>
<View>单号：XS-LY-2208220092</View>
<View className={styles.topBar__orderStatus}>待审核</View>
<View>单号：{itemData?.order_no}</View>
{itemData?.status === 1 && <View className={classnames(styles.topBar__orderStatus, styles['topBar__orderStatus--finish'])}>已审核</View>}
{itemData?.status === 0 && <View className={classnames(styles.topBar__orderStatus, styles['topBar__orderStatus--toBeAudited'])}>待审核</View>}
</View>
<Text className={styles.topBar__orderType}>销售发货单</Text>
<Text className={styles.topBar__orderType}>{itemData?.type_name}</Text>
</View>
<Divider direction='horizontal'></Divider>
<Divider direction='horizontal' customStyles={{ margin: '30rpx 0' }}></Divider>
<View className={styles.content}>
<View className={styles.content__row}>
<View className={classnames(styles.content__row, styles.bord)}>
<View className={styles.content__row__left}>货品信息：</View>
<View className={styles.content__row__right}>
<Tag type='primary' circle plain>
大货
</Tag>
2种面料，4种颜色，共5米
{itemData?.sale_mode === EnumSaleMode.Bulk && (
<Tag type='primary' circle plain size='small' customClassName={styles.tag}>
大货
</Tag>
)}
{itemData?.sale_mode === EnumSaleMode.Plate && (
<Tag type='danger' circle plain size='small' customClassName={styles.tag}>
剪板
</Tag>
)}
{itemData?.sale_mode === EnumSaleMode.BulkCut && (
<Tag type='warning' circle plain size='small' customClassName={styles.tag}>
散剪
</Tag>
)}
2种面料，4种颜色，共{itemData?.sale_mode === EnumSaleMode.Bulk ? `${itemData?.delivery_roll}条` : `${itemData?.delivery_length}米`}
</View>
</View>
<View className={styles.content__row}>
<View className={styles.content__row__left}>发货地址：</View>
<View className={styles.content__row__right}>永川纺织有限公司</View>
<View className={styles.content__row__right}>{itemData?.delivery_address || '空'}</View>
</View>
<View className={styles.content__row}>
<View className={styles.content__row__left}>创建时间：</View>
<View className={styles.content__row__right}>2022-09-01 18:32:32</View>
<View className={styles.content__row__right}>{formatDateTime(itemData?.create_time) || '空'}</View>
</View>
</View>
<View className={styles.bottomBar}>
<NormalButton customClassName={styles.bottomBar__button} type='info' round onClick={handleDetail}>
<NormalButton
customClassName={styles.bottomBar__button}
type='info'
customStyles={{ color: '#8e8e8e', borderColor: '#8e8e8e' }}
round
onClick={() => handleDetail(itemData?.id)}>
查看详情
</NormalButton>
<NormalButton customClassName={styles.bottomBar__button} type='primary' round onClick={handleAudit}>
确认审核
</NormalButton>
{itemData?.status === 0 && (
<NormalButton customClassName={styles.bottomBar__button} type='primary' round onClick={() => handleAudit(itemData?.id)}>
确认审核
</NormalButton>
)}
</View>
</LayoutBlock>
)

107
src/pages/delivery/index.module.scss
View File

@ -1,113 +1,42 @@
page {
background: #f7f7f7;
height: 100%;
display: flex;
flex-flow: column nowrap;
}
.delivery {
display: flex;
flex-flow: column nowrap;
overflow: hidden;
padding-bottom: env(safe-area-inset-bottom);
.searchBox {
display: flex;
align-items: center;
background: #ffffff;
padding: 8px 24px;
flex: none;
}
.listBox {
flex: 1 1 auto;
background-color: #f7f7f7;
}
.itemBox {
margin-left: 24px;
background: #ffffff;
border-radius: 16px;
display: flex;
align-items: center;
margin-top: 24px;
box-sizing: border-box;
.cussName {
margin-left: 48px;
width: 168px;
height: 34px;
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.phone {
margin-left: 88px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.woker {
margin-left: 88px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
}
.acticveitemBox {
margin-left: 24px;
width: 702px;
height: 104px;
background: #ffffff;
border-radius: 16px;
display: flex;
align-items: center;
margin-top: 24px;
box-sizing: border-box;
border: 1px solid #337fff;
.cussName {
margin-left: 48px;
width: 168px;
height: 34px;
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #000000;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.phone {
margin-left: 88px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
}
.woker {
margin-left: 88px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
overflow: scroll;
&--total {
display: block;
margin-top: 24px;
padding: 0 24px;
font-size: 24px;
color: #9d9d9d;
}
}
}
.scanHandler{
.scanHandler {
width: 40px;
height: 40px;
position: absolute;
right: 40px;
}
.icon__filter{
padding: 0 20px;
padding-right: 10px;
.icon__filter {
padding: 0 20px;
padding-right: 10px;
}

265
src/pages/delivery/index.tsx
View File

@ -1,64 +1,89 @@
import { View, Text } from '@tarojs/components'
import { useCallback, useEffect, useMemo, useRef, useState, FC } from 'react'
import { useCallback, useEffect, useMemo, useRef, useState, FC, memo } from 'react'
import styles from './index.module.scss'
import classnames from 'classnames'
import Search from '@/components/search'
import { ClientListApi } from '@/api/order'
import { DeliverNoticeOrderList, EnumSaleorderStatus } from '@/api/index'
import Taro from '@tarojs/taro'
import { useRouter } from '@tarojs/taro'
import InfiniteScroll from '@/components/infiniteScroll'
import { dataLoadingStatus, getFilterData } from '@/common/util'
import IconText from '@/components/iconText'
import SegmentedControl from '@/components/SegmentedControl'
import IconFont from '@/components/iconfont/iconfont'
import ItemList from './components/ItemList'
import DeliveryStatusList from './components/DeliveryStatusList'
import Popup from '@/components/popup'
import DeliveryFilter from './components/Filter'
type SearchData = {
delivery_notice_order_no?: string // 发货单号
delivery_notice_order_status?: number | string // 发货状态
date_min?: string // 开始时间
date_max?: string // 结束时间
type?: number // 发货类型
page: number
size: number
}
const scanIcon = () => {
// 扫描
const handleScan = () => {}
return (
<View onClick={handleScan} className={styles.scanHandler}>
<IconFont name='icon-saomiao' size={40}></IconFont>
</View>
)
}
// 发货列表
const Delivery: FC = () => {
const [search, setSearch] = useState({
name: null,
const [search, setSearch] = useState<SearchData>({
delivery_notice_order_status: 0, // 待发货
page: 1,
size: 10,
})
const [clentList, setClientlist] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
const [deliveryOrderList, setDeliveryOrderList] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
const { fetchData: clitentFetch, state: orderState } = ClientListApi()
const { fetchData: FetchDeliveryOrderList, state: orderState } = DeliverNoticeOrderList()
//数据加载状态
const statusMore = useMemo(() => {
return dataLoadingStatus({ list: clentList.list, total: clentList.total, status: orderState.loading })
}, [clentList, orderState])
return dataLoadingStatus({ list: deliveryOrderList.list, total: deliveryOrderList.total, status: orderState.loading })
}, [deliveryOrderList, orderState])
const [clientObj, setclientObj] = useState({
clientId: null,
clientName: '',
})
// const [clientObj, setclientObj] = useState({
// clientId: null,
// clientName: '',
// })
//输入了搜索关键字
const getSearchData = useCallback((eq) => {
pageNum.current.page = 1
setClientlist(() => ({ list: [], total: 0 }))
setSearch((e) => ({ ...e, name: eq, size: 10 }))
//输入搜索关键字
const getSearchData = useCallback((searchValue: string) => {
console.log('searchValue==>', searchValue)
// pageNum.current.page = 1
// setClientlist(() => ({ list: [], total: 0 }))
// setSearch((e) => ({ ...e, name: eq, size: 10 }))
}, [])
const router = useRouter()
// const router = useRouter()
useEffect(() => {
if (search.name === '') {
setSearch((e) => ({ ...e, name: null }))
console.log('useEffect ===> search', search)
if (search.delivery_notice_order_no === '') {
setSearch((e) => ({ ...e, delivery_notice_order_no: undefined }))
}
if (search.name !== '') getCuss()
if (search.delivery_notice_order_no !== '') getData()
}, [search])
//上拉加载数据
const pageNum = useRef({ size: search.size, page: search.page })
const getScrolltolower = useCallback(() => {
if (clentList.list.length < clentList.total) {
const getScrollToLower = useCallback(() => {
if (deliveryOrderList.list.length < deliveryOrderList.total) {
pageNum.current.page++
const size = pageNum.current.size * pageNum.current.page
setSearch((e) => ({ ...e, size }))
console.log(search, 11111)
}
}, [clentList])
}, [deliveryOrderList])
//列表下拉刷新
const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
@ -67,92 +92,88 @@ const Delivery: FC = () => {
setRefresherTriggeredStatus(true)
setSearch((val) => ({ ...val, size: 10 }))
}
const getCuss = async () => {
let res = await clitentFetch({ name: search.name === null ? '' : search.name, page: search.page, size: search.size })
if (router?.params.clientId) {
res.data.list.map((item) => {
if (item.id == router?.params.clientId) {
item.checked = true
} else {
item.checked = false
}
return item
})
}
setClientlist((e) => ({ ...e, list: res.data?.list, total: res.data?.total }))
const getData = async () => {
const res = await FetchDeliveryOrderList(getFilterData(search))
// if (router?.params.clientId) {
// res.data.list.map((item) => {
// if (item.id == router?.params.clientId) {
// item.checked = true
// } else {
// item.checked = false
// }
// return item
// })
// }
setDeliveryOrderList((e) => ({ ...e, list: res.data?.list, total: res.data?.total }))
setRefresherTriggeredStatus(() => false)
}
//选择客户
const selectClient = (item) => {
clentList.list.map((it) => {
if (item.id === it.id) {
it.checked = true
} else {
it.checked = false
}
return it
})
setclientObj(item)
let pages = Taro.getCurrentPages() // 获取当前的页面栈
let prevPage = pages[pages.length - 2]
prevPage.setData({
//设置上一个页面的值
clientId: item.id,
clientName: item.name,
})
setClientlist((e) => ({ ...e, list: clentList?.list, total: clentList?.total }))
Taro.navigateBack({
delta: 1,
})
}
useEffect(() => {
if (clientObj?.clientId !== null) {
setclientObj(clientObj)
} else {
let pages = Taro.getCurrentPages() // 获取当前的页面栈
let prevPage = pages[pages.length - 2]
prevPage.setData({
//设置上一个页面的值
clientId: '',
clientName: '',
})
// //选择客户
// const selectClient = (item) => {
// clentList.list.map((it) => {
// if (item.id === it.id) {
// it.checked = true
// } else {
// it.checked = false
// }
// return it
// })
// setclientObj(item)
// let pages = Taro.getCurrentPages() // 获取当前的页面栈
// let prevPage = pages[pages.length - 2]
// prevPage.setData({
// //设置上一个页面的值
// clientId: item.id,
// clientName: item.name,
// })
// setClientlist((e) => ({ ...e, list: clentList?.list, total: clentList?.total }))
// Taro.navigateBack({
// delta: 1,
// })
// }
// useEffect(() => {
// if (clientObj?.clientId !== null) {
// setclientObj(clientObj)
// } else {
// let pages = Taro.getCurrentPages() // 获取当前的页面栈
// let prevPage = pages[pages.length - 2]
// prevPage.setData({
// //设置上一个页面的值
// clientId: '',
// clientName: '',
// })
// }
// }, [clientObj])
const handleChangeFilterData = () => {}
const [currentStatus, setCurrentStatus] = useState('待发货')
const handleChangeStatus = ({ id: statusId, name: statusName }) => {
let fuckingBadCodeId: string | number = 0
if (statusId === 3) {
fuckingBadCodeId = 0
} else if (statusId === 4) {
fuckingBadCodeId = '1,2'
}
}, [clientObj])
// 筛选列表
const onShowFilter = () => {}
const [statusList, setStatusList] = useState([
{
id: 1,
name: '待发货',
},
{
id: 2,
name: '已完成',
},
])
// //状态改变
const changeStatus = useCallback((e) => {
pageNum.current.page = 1
// setSearchField((value) => ({ ...value, status: e, size: 10 }))
console.log(e, '123123')
// setOrderData(() => ({ list: [], total: 0 }))
}, [])
// 扫描
const handleScan = () => {}
const scanIcon = () => {
return (
<View onClick={handleScan} className={styles.scanHandler}>
<IconFont name='icon-saomiao' size={40}></IconFont>
</View>
)
setCurrentStatus(statusName)
setSearch((e) => ({ ...e, delivery_notice_order_status: fuckingBadCodeId }))
getData()
}
const handleAuditSuccess = () => {
getData()
}
const [showFilter, setShowFilter] = useState(false)
// 筛选列表
const onShowFilter = () => {
setShowFilter(true)
}
return (
<View className={styles.delivery}>
<View className={styles.searchBox}>
@ -163,36 +184,28 @@ const Delivery: FC = () => {
</Search>
</View>
{/* 状态栏 */}
<SegmentedControl list={statusList} onSelect={changeStatus} defaultId={0} />
<DeliveryStatusList onChangeStatus={handleChangeStatus}></DeliveryStatusList>
<View className={styles.listBox}>
{/* <InfiniteScroll
<InfiniteScroll
statusMore={statusMore}
selfonScrollToLower={getScrolltolower}
selfonScrollToLower={getScrollToLower}
refresherEnabled={true}
refresherTriggered={refresherTriggeredStatus}
selfOnRefresherRefresh={getRefresherRefresh}>
{clentList.list.map((item, index) => {
return (
<View
className={classnames(item.checked ? styles.acticveitemBox : styles.itemBox)}
key={index}
onClick={() => {
selectClient(item)
}}>
<View className={styles.cussName}>{item.name}</View>
<View className={styles.phone}>{item.phone}</View>
<View className={styles.woker}>{item.sale_user_name}</View>
</View>
)
<Text className={styles['listBox--total']}>
{currentStatus}共 {deliveryOrderList.total} 单
</Text>
{deliveryOrderList.list.map((item, index) => {
return <ItemList itemData={item} key={item.id} onSuccess={handleAuditSuccess}></ItemList>
})}
</InfiniteScroll> */}
<ItemList ></ItemList>
<ItemList ></ItemList>
<ItemList ></ItemList>
<ItemList ></ItemList>
</InfiniteScroll>
</View>
<Popup show={showFilter} title='筛选列表'>
<DeliveryFilter />
</Popup>
</View>
)
}
export default Delivery

3
src/pages/deliveryDetail/index.config.ts Normal file
View File

@ -0,0 +1,3 @@
export default {
navigationBarTitleText: '发货详情',
}

3
src/pages/deliveryDetail/index.module.scss Normal file
View File

@ -0,0 +1,3 @@
.deliveryDetail{
}

8
src/pages/deliveryDetail/index.tsx Normal file
View File

@ -0,0 +1,8 @@
import { View } from "@tarojs/components"
import { FC } from "react"
import styles from './index.module.scss'
const DeliveryDetail: FC = () => {
return <View className={styles.deliveryDetail}>发货详情</View>
}
export default DeliveryDetail

82
src/pages/shopping/components/shoppingCartItem/index.tsx
View File

@ -12,7 +12,7 @@ import NormalButton from '@/components/normalButton'
import ColorKindItem from '../colorKindItem'
import { EnumSaleMode } from '@/common/Enumerate'
import { useNeedMemoCallback } from '@/use/useCommon'
import {selectList} from '../../config'
import { selectList } from '../../config'
import { ShoppingContext } from '../../index'
type PropsType = {
@ -138,48 +138,50 @@ export default memo<PropsType>((props) => {
<DrawerButton isOpen={openDetail} />
</View>
</MCheckbox>
<View className={classnames(styles.detailBox, openDetail ? styles.drawerOpen : styles.drawerClose)}>
<View className={styles.orderType}>
<Divider customClassName={styles.line}></Divider>
<View className={styles.orderTitle}>订单类型</View>
<View className={styles.orderTypeDetail}>
<NormalButton
type={selected === EnumSaleMode.Bulk ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.Bulk}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.Bulk)}>
大货
</NormalButton>
<NormalButton
type={selected === EnumSaleMode.Plate ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.Plate}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.Plate)}>
剪板
</NormalButton>
<NormalButton
type={selected === EnumSaleMode.BulkCut ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.BulkCut}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.BulkCut)}>
散剪
</NormalButton>
{openDetail && (
<View className={classnames(styles.detailBox, openDetail ? styles.drawerOpen : styles.drawerClose)}>
<View className={styles.orderType}>
<Divider customClassName={styles.line}></Divider>
<View className={styles.orderTitle}>订单类型</View>
<View className={styles.orderTypeDetail}>
<NormalButton
type={selected === EnumSaleMode.Bulk ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.Bulk}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.Bulk)}>
大货
</NormalButton>
<NormalButton
type={selected === EnumSaleMode.Plate ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.Plate}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.Plate)}>
剪板
</NormalButton>
<NormalButton
type={selected === EnumSaleMode.BulkCut ? 'primary' : 'info'}
plain={selected !== EnumSaleMode.BulkCut}
customStyles={{ padding: '0 50rpx' }}
circle
onClick={() => onSelectOrderType(EnumSaleMode.BulkCut)}>
散剪
</NormalButton>
</View>
</View>
</View>
<View className={styles.orderColor}>
<Divider customClassName={styles.line}></Divider>
<View className={classnames(styles.orderTitle, 'justify-between')}>
<Text>布料颜色</Text>
<Tag type='danger' size='normal' circle plain={false}>
{selectList[selected].title}单位：{selectList[selected].unit}
</Tag>
<View className={styles.orderColor}>
<Divider customClassName={styles.line}></Divider>
<View className={classnames(styles.orderTitle, 'justify-between')}>
<Text>布料颜色</Text>
<Tag type='danger' size='normal' circle plain={false}>
{selectList[selected].title}单位：{selectList[selected].unit}
</Tag>
</View>
</View>
<View className={styles.orderContainer}>{memoList}</View>
</View>
<View className={styles.orderContainer}>{memoList}</View>
</View>
)}
</LayoutBlock>
)
}, useNeedMemoCallback())

4
src/pages/user/index.tsx
View File

@ -32,7 +32,7 @@ const feature: IconCardType[] = [
{
iconName: 'icon-fahuoliebiao',
name: '发货列表',
path: '',
path: '/pages/delivery/index',
},
{
iconName: 'icon-yaoqingma',
@ -169,7 +169,7 @@ const UserInfo: FC = () => {
<View className={styles.layoutTitle}>统计分析</View>
<View className={styles['grid-container']}>
{statisticAnalysis.map((item) => {
return <IconCard iconName={item.iconName} title={item.name}></IconCard>
return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
})}
</View>
</LayoutBlock>

2
src/styles/iconfont.scss
View File

@ -3,7 +3,7 @@
/* Project id 3619513 */
// url('/src/styles/iconfont.ttf') format('truetype');
src:
url('iconfont.ttf?t=1663556335905') format('truetype');
url('/src/styles/iconfont.ttf?t=1663556335905') format('truetype');
}
.iconfont {