ylj/cloud-platform-YN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2026-01-28 19:00:29 +08:00
parent d1cd46087a
commit 71a6bc2c56
9 changed files with 236 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.133", "version": "4.5.139",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

123
src/pages/travelMember/BookingMealOrder/components/orderDetailModal.tsx
View File

@ -10,7 +10,7 @@ import orderIcon from '@/assets/detail/orderIcon.png'
import closeIcon from '@/assets/detail/closeIcon.png' import closeIcon from '@/assets/detail/closeIcon.png'
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
import { PlusOutlined, DeleteOutlined } from '@ant-design/icons'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons';
import { handeDeleteSaleBillInfo, handeGetSALEADDRESSList, handeGetSALEBILLDetail, handeGetSALEBILLList, handeGetSALEDETAILDetail, handeGetSALEDETAILList, handeModifyTrackingInfo, handeSendSaleBillGoods } from "../../service"; import { handeDeleteSaleBillInfo, handeGetSALEADDRESSList, handeGetSALEBILL_CHILDDetail, handeGetSALEBILLDetail, handeGetSALEBILLList, handeGetSALEDETAILDetail, handeGetSALEDETAILList, handeModifyTrackingInfo, handeSendSaleBillGoods } from "../../service";
import './style.less' import './style.less'
interface LogisticsInfo { interface LogisticsInfo {
@ -27,8 +27,9 @@ type DetailProps = {
showShipment?: boolean;// 判断 在待发货状态下 是否显示发货按钮 showShipment?: boolean;// 判断 在待发货状态下 是否显示发货按钮
currentUser?: any // 页面公参 currentUser?: any // 页面公参
actionRef?: any// 父级表格实例 actionRef?: any// 父级表格实例
comeType?: string // 是嵌套在哪个页面里面的 TradingLedger 台账页面 OrderAfterSalesManage 售后订单
} }
const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailType, showShipment, currentUser, actionRef }: DetailProps) => { const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailType, showShipment, currentUser, actionRef, comeType }: DetailProps) => {
const formRef = useRef<FormInstance>(); const formRef = useRef<FormInstance>();
const draggleRef = React.createRef<any>() const draggleRef = React.createRef<any>()
const modalRef = useRef<FormInstance>(); const modalRef = useRef<FormInstance>();
@ -423,9 +424,26 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
}) })
let addressObj: any = addressData.List[0] let addressObj: any = addressData.List[0]
console.log('订单详情', data);
// 判断一下 若 currentRow?.TABLE_NUMBER 没有这个 那就查查看子订单里面 有没有这个
// 子订单里面查询到的物流信息
let newLogistics = ''
if (!currentRow?.TABLE_NUMBER) {
if (currentRow?.OrderChildId) {
const data = await handeGetSALEBILL_CHILDDetail({
SALEBILL_CHILDId: currentRow?.OrderChildId
})
console.log('子订单详情', data);
if (data.TABLE_NUMBER) {
newLogistics = data.TABLE_NUMBER
}
}
}
// 物流公司和快递单号的回显 // 物流公司和快递单号的回显
if (currentRow?.TABLE_NUMBER) { if (currentRow?.TABLE_NUMBER || newLogistics) {
let list: any = currentRow?.TABLE_NUMBER.split(',') let list: any = currentRow?.TABLE_NUMBER ? currentRow?.TABLE_NUMBER.split(',') : newLogistics ? newLogistics.split(',') : ""
let res: any = [] let res: any = []
if (list && list.length > 0) { if (list && list.length > 0) {
list.forEach((item: any, index: number) => { list.forEach((item: any, index: number) => {
@ -444,14 +462,14 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
} }
return { return {
...data, ...data,
ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : "", ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : currentRow?.ReceiverName || "",
ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`, ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`,
CURRENT_POINT: currentRow?.CURRENT_POINT || "", CURRENT_POINT: currentRow?.CURRENT_POINT || "",
ORDER_DATE: currentRow?.ORDER_DATE ? moment(currentRow?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '', ORDER_DATE: currentRow?.ORDER_DATE ? moment(currentRow?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : currentRow?.PaymentTime || '',
CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || "", CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || currentRow?.PaymentMethod || "",
TAKE_TYPE: data.TAKE_TYPE === 1000 ? "自提" : data.TAKE_TYPE === 3000 ? '免发货' : '邮寄', TAKE_TYPE: data.TAKE_TYPE === 1000 ? "自提" : data.TAKE_TYPE === 3000 ? '免发货' : '邮寄',
SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE, SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE,
SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || '' SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || ''
} }
} else { } else {
const req: any = { const req: any = {
@ -483,10 +501,10 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`, ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`,
CURRENT_POINT: currentRow?.CURRENT_POINT || "", CURRENT_POINT: currentRow?.CURRENT_POINT || "",
ORDER_DATE: res?.ORDER_DATE ? moment(res?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '', ORDER_DATE: res?.ORDER_DATE ? moment(res?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '',
CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || "", CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || currentRow?.PaymentMethod || "",
TAKE_TYPE: res.TAKE_TYPE === 1000 ? "自提" : res.TAKE_TYPE === 3000 ? '免发货' : '邮寄', TAKE_TYPE: res.TAKE_TYPE === 1000 ? "自提" : res.TAKE_TYPE === 3000 ? '免发货' : '邮寄',
SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE, SALEBILL_STATE: currentRow?.SALEBILL_STATE || data?.SALEBILL_STATE,
SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || '' SALEBILL_CODELIST: currentRow?.SALEBILL_CODE || currentRow?.OrderCode || ''
} }
} else { } else {
message.error('当前订单数据异常，请联系管理员！') message.error('当前订单数据异常，请联系管理员！')
@ -568,15 +586,18 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col>
{
comeType === 'TradingLedger' ? '' :
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"TOTAL_COUNT"}
label={"商品件数"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
}
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"TOTAL_COUNT"}
label={"商品件数"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
// name={"PAY_METHOD"} // name={"PAY_METHOD"}
@ -642,18 +663,21 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
/> />
} }
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> {
<ProFormSelect comeType === 'TradingLedger' ? '' :
name={"COMMENT_STATE"} <Col span={8} className="memberInfoDetailItem">
label={"订单评价状态"} <ProFormSelect
readonly name={"COMMENT_STATE"}
style={{ marginBottom: '16px' }} label={"评价状态"}
options={[ readonly
{ label: "未评价", value: 0 }, style={{ marginBottom: '16px' }}
{ label: "已评价", value: 1 }, options={[
]} { label: "未评价", value: 0 },
/> { label: "已评价", value: 1 },
</Col> ]}
/>
</Col>
}
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"TAKE_TYPE"} name={"TAKE_TYPE"}
@ -663,24 +687,29 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
/> />
</Col> </Col>
{
comeType === 'TradingLedger' ? '' :
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"CURRENT_POINT"}
label={"获得积分"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
}
<Col span={8} className="memberInfoDetailItem"> {
<ProFormText comeType === 'TradingLedger' ? '' :
name={"CURRENT_POINT"} <Col span={8} className="memberInfoDetailItem">
label={"获得积分"} <ProFormText
readonly name={"CONSUME_SCORE"}
style={{ marginBottom: '16px' }} label={"获得成长值"}
/> readonly
</Col> style={{ marginBottom: '16px' }}
/>
<Col span={8} className="memberInfoDetailItem"> </Col>
<ProFormText }
name={"CONSUME_SCORE"}
label={"获得成长值"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>

56
src/pages/travelMember/MallClassificationManage/index.tsx
View File

@ -21,7 +21,7 @@ import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import type { FormInstance } from 'antd'; import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import { handeGetCOMMODITYList, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox'; import PageTitleBox from '@/components/PageTitleBox';
import { uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png' import defaultIcon from '../../../assets/brand/defaultIcon.png'
@ -165,11 +165,14 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
width: 120, width: 120,
ellipsis: true, ellipsis: true,
valueType: "select", valueType: "select",
valueEnum: { fieldProps: {
"1": "上架", options: [{ label: "上架", value: 1 }, { label: "下架", value: 0 }]
"0": "下架"
}, },
initialValue: "1" // valueEnum: {
// "0": "下架",
// "1": "上架"
// },
initialValue: 1
}, },
{ {
dataIndex: "PRESALE_TYPE", dataIndex: "PRESALE_TYPE",
@ -507,7 +510,8 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
preserve={false} preserve={false}
initialValues={currentRow ? { initialValues={currentRow ? {
...currentRow, ...currentRow,
PRESALE_TIME: currentRow?.PRESALE_TYPE ? [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME] : "" PRESALE_TIME: currentRow?.PRESALE_TYPE ? [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME] : "",
USERDEFINEDTYPE_DATE: moment(currentRow?.USERDEFINEDTYPE_DATE).format('YYYY-MM-DD HH:mm:ss'),
} : { } : {
USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_STATE: 1,
USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
@ -524,8 +528,44 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
console.log('fileListfileList', fileList); console.log('fileListfileList', fileList);
console.log('newValuenewValuenewValue', newValue); console.log('newValuenewValuenewValue', newValue);
// 如果有开关，要把开关的代码写进去 // 这里判断一下 如果是要将分类下架的话 需要提示一下 还有商品在里面 是否下架
await handleAddUpdate(newValue); if (newValue.SCANCODE_ORDER === 0) {
// 去请求一下 这个分类下面 还有没有商品
console.log('newvalue', newValue);
const req = {
searchParameter: {
USERDEFINEDTYPE_IDS: newValue?.USERDEFINEDTYPE_ID,
UPPER_STATE: 1,
COMMODITY_TYPE: 4000,
COMMODITY_STATE: 1,
},
PageIndex: 1,
PageSize: 999999,
SortStr: "OPERATE_DATE desc"
}
const data = await handeGetCOMMODITYList(req);
let list: any = data.List
// 判断 当前分类下的 全部上架了的商品 若有 就要提示 没有也就正常
if (list && list.length > 0) {
confirm({
title: '当前分类下还存在上架商品，确认下架？',
icon: <ExclamationCircleOutlined />,
async onOk() {
await handleAddUpdate(newValue);
},
onCancel() {
handleConfirmLoading(false)
setFormPRESALE_TYPE(false)
},
});
} else {
await handleAddUpdate(newValue);
}
return
} else {
// 如果有开关，要把开关的代码写进去
await handleAddUpdate(newValue);
}
handleConfirmLoading(false) handleConfirmLoading(false)
setFormPRESALE_TYPE(false) setFormPRESALE_TYPE(false)

14
src/pages/travelMember/MallOrderManage/index.tsx
View File

@ -2,7 +2,7 @@
import { connect } from "umi"; import { connect } from "umi";
import type { CurrentUser } from "umi"; import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect"; import type { ConnectState } from "@/models/connect";
import React, { useRef, useState } from "react"; import React, { useEffect, useRef, useState } from "react";
import { Button, Col, message, Modal, Row, Spin, type FormInstance } from "antd"; import { Button, Col, message, Modal, Row, Spin, type FormInstance } from "antd";
import type { ActionType } from "@ant-design/pro-table"; import type { ActionType } from "@ant-design/pro-table";
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
@ -473,7 +473,8 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
COMPANY_STATE: 1000 COMPANY_STATE: 1000
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 999999 PageSize: 999999,
SortStr: "COMPANY_CODE"
} }
const data = await handeGetCOMPANYList(req) const data = await handeGetCOMPANYList(req)
console.log('datadata', data); console.log('datadata', data);
@ -769,17 +770,16 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
} }
// 拿到会员列表 // 拿到会员列表
const handleGetUserList = async (e: any) => { const handleGetUserList = async (e?: any) => {
const req: any = { const req: any = {
SearchParameter: { SearchParameter: {
MEMBERSHIP_COMPANYS: e, MEMBERSHIP_COMPANYS: e || "",
MEMBERSHIP_STATES: 1 MEMBERSHIP_STATES: 1
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 999999 PageSize: 999999
} }
const data = await handeGetMEMBERSHIPVIPList(req) const data = await handeGetMEMBERSHIPVIPList(req)
console.log('会员', data);
let list: any = [] let list: any = []
if (data && data.length > 0) { if (data && data.length > 0) {
data.forEach((item: any) => { data.forEach((item: any) => {
@ -858,6 +858,10 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
} }
} }
useEffect(() => {
handleGetUserList()
}, [])
return ( return (
<div> <div>
{ {

83
src/pages/travelMember/OrderAfterSalesManage/index.tsx
View File

@ -148,6 +148,14 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
</a> : "" </a> : ""
} }
}, },
{
title: "原订单号",
dataIndex: "TABLE_NUMBER",
width: 200,
hideInSearch: true,
ellipsis: true,
align: "center",
},
{ {
title: "购买的商品", title: "购买的商品",
dataIndex: "COMMODITY_NAME", dataIndex: "COMMODITY_NAME",
@ -203,11 +211,11 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
}, },
{ {
title: "退款时间", title: "退款时间",
dataIndex: "RESERVATION_ENDDATE", dataIndex: "PAY_DATE",
width: 120, width: 150,
hideInSearch: true, hideInSearch: true,
ellipsis: true, ellipsis: true,
sorter: (a, b) => new Date(a.RESERVATION_ENDDATE).getTime() - new Date(b.RESERVATION_ENDDATE).getTime(), sorter: (a, b) => new Date(a.PAY_DATE).getTime() - new Date(b.PAY_DATE).getTime(),
align: "center", align: "center",
}, },
{ {
@ -434,7 +442,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
visible={modalVisible} visible={modalVisible}
confirmLoading={confirmLoading} confirmLoading={confirmLoading}
afterClose={() => { afterClose={() => {
formRef.current?.resetFields(); // formRef.current?.resetFields();
setCurrentRow(undefined); setCurrentRow(undefined);
}} }}
onCancel={() => { onCancel={() => {
@ -498,7 +506,9 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
initialValues={currentRow ? { initialValues={currentRow ? {
...currentRow, ...currentRow,
orderPerson: `${currentRow?.ORDER_PERSON || ""}${currentRow?.ORDER_PERSONTEL ? `【${currentRow?.ORDER_PERSONTEL}】` : ""}`, orderPerson: `${currentRow?.ORDER_PERSON || ""}${currentRow?.ORDER_PERSONTEL ? `【${currentRow?.ORDER_PERSONTEL}】` : ""}`,
ORDER_DATE: currentRow?.ORDER_DATE ? moment(currentRow?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '' ORDER_DATE: currentRow?.ORDER_DATE ? moment(currentRow?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '',
shippingStatus: "未发货",
PAY_DATE: currentRow?.PAY_DATE || ""
} : {}} } : {}}
> >
<div className="bookingOrderModalTop"> <div className="bookingOrderModalTop">
@ -514,13 +524,29 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
</div> </div>
<div className="bookingOrderModalCenter"> <div className="bookingOrderModalCenter">
<div className="smallTitle">订单信息</div> {/* <div className="smallTitle">订单信息</div> */}
<Row gutter={8}> <Row gutter={8}>
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"orderPerson"}
label={"收货人员"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"ORDER_DATE"}
label={"申请时间"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"SALEBILL_CODE"} name={"SALEBILL_CODE"}
label={"订单编码"} label={"售后单号"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
@ -535,13 +561,22 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"ORDER_DATE"} name={"PAY_DATE"}
label={"下单时间"} label={"退款时间"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"TABLE_NUMBER"}
label={"原订单号"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
{/* <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"RECORD_COUNT"} name={"RECORD_COUNT"}
label={"商品种类"} label={"商品种类"}
@ -556,7 +591,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col> */}
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"ORDER_AMOUNT"} name={"ORDER_AMOUNT"}
@ -565,7 +600,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> {/* <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"COUPON_AMOUNT"} name={"COUPON_AMOUNT"}
label={"优惠金额"} label={"优惠金额"}
@ -580,7 +615,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col> */}
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"CONSUME_SCORE"} name={"CONSUME_SCORE"}
@ -592,19 +627,19 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"PAY_AMOUNT"} name={"PAY_AMOUNT"}
label={"实付金额"} label={"退款金额"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> {/* <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"COST_AMOUNT"} name={"COST_AMOUNT"}
label={"成本金额"} label={"成本金额"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col> */}
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"SALEBILL_STATE"} name={"SALEBILL_STATE"}
@ -623,7 +658,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
]} ]}
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> {/* <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"COMMENT_STATE"} name={"COMMENT_STATE"}
label={"订单评价状态"} label={"订单评价状态"}
@ -634,15 +669,25 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
{ label: "已评价", value: 1 }, { label: "已评价", value: 1 },
]} ]}
/> />
</Col> </Col> */}
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormText <ProFormText
name={"orderPerson"} name={"shippingStatus"}
label={"收货人电话"} label={"发货状态"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
/> />
</Col> </Col>
<Col span={24} className="memberInfoDetailItem">
<ProFormText
name={"SALEBILL_DESC"}
label={"用户备注"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
{/* <Col span={8} className="memberInfoDetailItem"> {/* <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"TAKE_TYPE"} name={"TAKE_TYPE"}

38
src/pages/travelMember/TradingLedger/index.tsx
View File

@ -208,7 +208,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'SupplierName', dataIndex: 'SupplierName',
title: <div style={{ textAlign: 'center' }}>供应商名称</div>, title: <div style={{ textAlign: 'center' }}>供应商名称</div>,
align: 'left', align: 'left',
width: 250, width: 200,
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
render: (_, record) => { render: (_, record) => {
@ -219,7 +219,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: "CompanyName", dataIndex: "CompanyName",
title: <div style={{ textAlign: 'center' }}>所属单位</div>, title: <div style={{ textAlign: 'center' }}>所属单位</div>,
hideInSearch: true, hideInSearch: true,
width: 300, width: 250,
ellipsis: true, ellipsis: true,
}, },
{ {
@ -237,7 +237,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'ReceiverName', dataIndex: 'ReceiverName',
title: <div style={{ textAlign: 'center' }}>收货人员</div>, title: <div style={{ textAlign: 'center' }}>收货人员</div>,
align: 'center', align: 'center',
width: 150, width: 120,
ellipsis: true, ellipsis: true,
hideInSearch: true hideInSearch: true
}, },
@ -245,7 +245,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'ReceiverPhone', dataIndex: 'ReceiverPhone',
title: <div style={{ textAlign: 'center' }}>联系电话</div>, title: <div style={{ textAlign: 'center' }}>联系电话</div>,
align: 'center', align: 'center',
width: 150, width: 120,
ellipsis: true, ellipsis: true,
hideInSearch: true hideInSearch: true
}, },
@ -258,10 +258,19 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInSearch: true, hideInSearch: true,
render: (_, record) => { render: (_, record) => {
return <a onClick={() => { return <a onClick={() => {
setCurrentRow(record); console.log('recordrecord', record);
setCurrentRow({
...record,
SALEBILL_STATE: Number(record?.OrderStatus),
AddressInfo: {
USER_NAME: record?.ReceiverName,// 收货人
MOBILEPHONE: record?.ReceiverPhone // 收货电话
},
ORDER_DATE: record?.OrderDate,// 下单时间
SALEBILL_CODE: record?.OrderCode// 订单编码
});
handleModalVisible(true) handleModalVisible(true)
handleSetlogSave(`查询收货人【${record?.ORDER_PERSON}】编码【${record.OrderCode}】订单`) handleSetlogSave(`查询收货人【${record?.ORDER_PERSON}】编码【${record.OrderCode}】订单`)
}}> }}>
{highlightText(record?.CommodityName, currentSearchText)} {highlightText(record?.CommodityName, currentSearchText)}
</a> </a>
@ -271,7 +280,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'SaleTotalTaxAmount', dataIndex: 'SaleTotalTaxAmount',
title: '订单金额', title: '订单金额',
align: 'right', align: 'right',
width: 150, width: 100,
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
sorter: (a, b) => a.ORDER_AMOUNT - b.ORDER_AMOUNT, sorter: (a, b) => a.ORDER_AMOUNT - b.ORDER_AMOUNT,
@ -280,7 +289,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'PayAmount', dataIndex: 'PayAmount',
title: '实付金额', title: '实付金额',
align: 'right', align: 'right',
width: 150, width: 100,
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
sorter: (a, b) => a.PayAmount - b.PayAmount, sorter: (a, b) => a.PayAmount - b.PayAmount,
@ -290,13 +299,13 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
title: <div style={{ textAlign: 'center' }}>工会积分</div>, title: <div style={{ textAlign: 'center' }}>工会积分</div>,
align: 'right', align: 'right',
valueType: 'digit', valueType: 'digit',
width: 150, width: 100,
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
}, },
{ {
title: "订单类型", title: "订单类型",
width: 150, width: 120,
dataIndex: "OrderType", dataIndex: "OrderType",
valueType: "select", valueType: "select",
align: 'center', align: 'center',
@ -652,6 +661,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
// 获取导出数据 // 获取导出数据
const handleGetExportData = async (type: number) => { const handleGetExportData = async (type: number) => {
// type ：1商品明细，2财务结算表 // type ：1商品明细，2财务结算表
setGetExportDataLoading(true) setGetExportDataLoading(true)
const req: any = { const req: any = {
@ -659,8 +669,8 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
OwnerUnitId: "911", OwnerUnitId: "911",
CompanyId: searchParams?.CompanyId || "", CompanyId: searchParams?.CompanyId || "",
MerchantId: currentUser?.UserPattern === 4000 ? currentUser?.SupplierID : searchParams?.MERCHANTS_IDS || "", MerchantId: currentUser?.UserPattern === 4000 ? currentUser?.SupplierID : searchParams?.MERCHANTS_IDS || "",
SaleBillState: searchParams?.orderStatus === '0' ? '' : (searchParams?.orderStatus || ""), SaleBillState: searchParams?.OrderStatus === '0' ? '' : (searchParams?.OrderStatus || ""),
SaleBillType: searchParams?.orderType === '0' ? '' : (searchParams?.orderType || ""), SaleBillType: searchParams?.OrderType === '0' ? '' : (searchParams?.OrderType || ""),
ChannelType: searchParams?.CHANNEL_TYPE === '0' ? '' : searchParams?.CHANNEL_TYPE || "", ChannelType: searchParams?.CHANNEL_TYPE === '0' ? '' : searchParams?.CHANNEL_TYPE || "",
StartDate: searchParams?.ORDER_DATE_Start || "", StartDate: searchParams?.ORDER_DATE_Start || "",
EndDate: searchParams?.ORDER_DATE_End || "", EndDate: searchParams?.ORDER_DATE_End || "",
@ -784,7 +794,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
ChannelType: params?.CHANNEL_TYPE === '0' ? '' : params?.CHANNEL_TYPE || "", ChannelType: params?.CHANNEL_TYPE === '0' ? '' : params?.CHANNEL_TYPE || "",
StartDate: params?.ORDER_DATE_Start || "", StartDate: params?.ORDER_DATE_Start || "",
EndDate: params?.ORDER_DATE_End || "", EndDate: params?.ORDER_DATE_End || "",
SearchKeyName: "MERCHANTS_NAME,COMMODITY_NAME,SALEBILL_CHILD_CODE,ORDER_PERSON,ORDER_PERSONTEL", SearchKeyName: "MERCHANTS_NAME,COMMODITY_NAME,SALEBILL_CHILD_CODE,ORDER_PERSON,ORDER_PERSONTEL,USER_NAME,MOBILEPHONE",
SearchKeyValue: params?.searchText || "", SearchKeyValue: params?.searchText || "",
SortStr: "" SortStr: ""
} }
@ -829,7 +839,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
</div> </div>
</div> </div>
<OrderDetailModal modalVisible={modalVisible} handleCloseModal={handleCloseModal} currentRow={currentRow} /> <OrderDetailModal modalVisible={modalVisible} handleCloseModal={handleCloseModal} currentRow={currentRow} showShipment={true} comeType={"TradingLedger"} />
</div> </div>
) )

11
src/pages/travelMember/service.ts
View File

@ -550,6 +550,17 @@ export async function handeGetSALEBILLDetail(params: any) {
return data.Result_Data return data.Result_Data
} }
// 查询线上订单的子订单详情
export async function handeGetSALEBILL_CHILDDetail(params: any) {
const data = await requestEncryption(`/OnlineOrder/GetSALEBILL_CHILDDetail`, {
method: 'POST',
data: { ...params, requestEncryption: true }
})
if (data.Result_Code !== 100) {
return []
}
return data.Result_Data
}
// 获取评价表列表 // 获取评价表列表
export async function handeGetCOMMENTList(params: any) { export async function handeGetCOMMENTList(params: any) {

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.133"; export const VERSION = "4.5.139";
export const GIT_HASH = "63f1b3d"; export const GIT_HASH = "d1cd460";
export const BUILD_TIME = "2026-01-26T10:46:55.942Z"; export const BUILD_TIME = "2026-01-28T08:14:40.893Z";