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

🐞 fix(码单和#号移除):修复码单字段和#号移除

Browse Source
This commit is contained in:
Haiyi 2022-12-13 10:24:16 +08:00
parent 9e4a6e6bcd
commit 30b2930a3a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/SaleCodeList/index.tsx
View File

@ -9,7 +9,7 @@ import Popup from '@/components/popup'
import useCheckAuthorize from '@/use/useCheckAuthorize' import useCheckAuthorize from '@/use/useCheckAuthorize'
import { alert } from '@/common/common' import { alert } from '@/common/common'
import { GetPayCode } from '@/api/order' import { GetPayCode } from '@/api/order'
import { formatDateTime, formatWeightDiv } from '@/common/format' import { formatDateTime, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
import { PAY_H5_CODE_URL } from '@/common/constant' import { PAY_H5_CODE_URL } from '@/common/constant'
interface Props { interface Props {
@ -34,8 +34,8 @@ const CodeList = (props: Props) => {
list.push({ list.push({
product_code: item.code, product_code: item.code,
product_name: item.name, product_name: item.name,
product_color_code: it.product_color_code, product_color_code: formatRemoveHashTag(it.code),
product_color_name: it.product_color_name, product_color_name: it.name,
num: it.roll.toString(), num: it.roll.toString(),
weight: formatWeightDiv(it.actual_weight).toString(), weight: formatWeightDiv(it.actual_weight).toString(),
sale_price: (it.sale_price / 100).toString(), sale_price: (it.sale_price / 100).toString(),
@ -51,8 +51,8 @@ const CodeList = (props: Props) => {
const query = { const query = {
list, list,
title: '面料销售电子确认单', title: '面料销售电子确认单',
show_qrcode: true, // show_qrcode: true,
show_barcode: true, // show_barcode: true,
order_type: props?.obj.sale_mode_name, order_type: props?.obj.sale_mode_name,
shipment_mode: props?.obj.shipment_mode_name, shipment_mode: props?.obj.shipment_mode_name,
company: props?.obj.title_purchaser_name, company: props?.obj.title_purchaser_name,

6
src/pages/order/index.tsx
View File

@ -21,7 +21,7 @@ import Search from '@/components/search'
import { dataLoadingStatus, getFilterData } from '@/common/util' import { dataLoadingStatus, getFilterData } from '@/common/util'
import Popup from '@/components/popup' import Popup from '@/components/popup'
import InfiniteScroll from '@/components/infiniteScroll' import InfiniteScroll from '@/components/infiniteScroll'
import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format' import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
import IconFont from '@/components/iconfont/iconfont' import IconFont from '@/components/iconfont/iconfont'
import { PAY_H5_CODE_URL } from '@/common/constant' import { PAY_H5_CODE_URL } from '@/common/constant'
@ -374,8 +374,8 @@ const Order = () => {
list.push({ list.push({
product_code: item.code, product_code: item.code,
product_name: item.name, product_name: item.name,
product_color_code: it.product_color_code, product_color_code: formatRemoveHashTag(it.code),
product_color_name: it.product_color_name, product_color_name: it.name,
num: it.roll.toString(), num: it.roll.toString(),
weight: formatWeightDiv(it.actual_weight).toString(), weight: formatWeightDiv(it.actual_weight).toString(),
sale_price: (it.sale_price / 100).toString(), sale_price: (it.sale_price / 100).toString(),

8
src/pages/orderDetails/index.tsx
View File

@ -29,7 +29,7 @@ import {
OrderPaymentPreCollectOrderOrderPaymentSubmission, OrderPaymentPreCollectOrderOrderPaymentSubmission,
} from '@/api/order' } from '@/api/order'
import { alert, goLink } from '@/common/common' import { alert, goLink } from '@/common/common'
import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format' import { formatDateTime, formatHashTag, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
import IconFont from '@/components/iconfont/iconfont' import IconFont from '@/components/iconfont/iconfont'
import { PAY_H5_CODE_URL } from '@/common/constant' import { PAY_H5_CODE_URL } from '@/common/constant'
import SaleCodeList from '@/components/SaleCodeList' import SaleCodeList from '@/components/SaleCodeList'
@ -100,7 +100,7 @@ const GoodsItem = (porps: PropGoods) => {
{/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */} {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
<View className={styles.itemRight}> <View className={styles.itemRight}>
<View className={styles.item_right_top}> <View className={styles.item_right_top}>
<View className={styles.itemName}>{it.code}# {it.name}</View> <View className={styles.itemName}>{formatHashTag(it.code, it.name)}</View>
<View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
</View> </View>
<View className={styles.item_right_Bottom}> <View className={styles.item_right_Bottom}>
@ -483,8 +483,8 @@ const OrderDetails = () => {
list.push({ list.push({
product_code: item.code, product_code: item.code,
product_name: item.name, product_name: item.name,
product_color_code: it.product_color_code, product_color_code: formatRemoveHashTag(it.code),
product_color_name: it.product_color_name, product_color_name: it.name,
num: it.roll.toString(), num: it.roll.toString(),
weight: formatWeightDiv(it.actual_weight).toString(), weight: formatWeightDiv(it.actual_weight).toString(),
sale_price: (it.sale_price / 100).toString(), sale_price: (it.sale_price / 100).toString(),