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-21 10:56:00 +08:00
parent 31a0a71e48
commit 772dc231fd
11 changed files with 620 additions and 229 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.111", "version": "4.5.121",
"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": {

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

@ -187,7 +187,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
return return
} }
const req: any = { const req: any = {
SaleBillChildId: currentRow?.SALEBILL_CHILD_ID, SaleBillChildId: currentRow?.SALEBILL_CHILD_ID || currentRow?.OrderChildId,
SaleBillId: currentRow?.SALEBILL_ID, SaleBillId: currentRow?.SALEBILL_ID,
TrackingInfo: str || "" TrackingInfo: str || ""
} }
@ -213,7 +213,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
// 订单删除 // 订单删除
const handleGetDeleteOrder = async () => { const handleGetDeleteOrder = async () => {
const req: any = { const req: any = {
SaleBillChildId: currentRow?.SALEBILL_CHILD_ID || "", SaleBillChildId: currentRow?.SALEBILL_CHILD_ID || currentRow?.OrderChildId || "",
SaleBillId: currentRow?.SALEBILL_ID, SaleBillId: currentRow?.SALEBILL_ID,
} }
handleConfirmLoading(true) handleConfirmLoading(true)
@ -277,7 +277,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
return return
} }
const req: any = { const req: any = {
SaleBillChildId: currentRow?.SALEBILL_CHILD_ID, SaleBillChildId: currentRow?.SALEBILL_CHILD_ID || currentRow?.OrderChildId,
SaleBillId: currentRow?.SALEBILL_ID, SaleBillId: currentRow?.SALEBILL_ID,
TrackingInfo: str || "" TrackingInfo: str || ""
} }
@ -385,21 +385,21 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
submitter={false} submitter={false}
request={async () => { request={async () => {
console.log('currentRow', currentRow); console.log('currentRow', currentRow);
if (currentRow?.SALEBILL_ID) { if (currentRow?.SALEBILL_ID || currentRow?.OrderId) {
const req: any = { const req: any = {
SALEBILLId: currentRow?.SALEBILL_ID SALEBILLId: currentRow?.SALEBILL_ID || currentRow?.OrderId
} }
const data = await handeGetSALEBILLDetail(req) const data = await handeGetSALEBILLDetail(req)
// 查地址信息 // 查地址信息
const addressData = await handeGetSALEADDRESSList({ const addressData = await handeGetSALEADDRESSList({
searchParameter: { searchParameter: {
SALEBILL_ID: currentRow?.SALEBILL_ID SALEBILL_ID: currentRow?.SALEBILL_ID || currentRow?.OrderId
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 10,
}) })
console.log('dasdas44444', addressData); console.log('dasdas44444', addressData);
let addressObj: any = addressData[0] let addressObj: any = addressData.List[0]
// 物流公司和快递单号的回显 // 物流公司和快递单号的回显
if (currentRow?.TABLE_NUMBER) { if (currentRow?.TABLE_NUMBER) {
@ -421,17 +421,29 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
} }
} }
return { console.log('32131', {
...data, ...data,
ORDER_PERSON: addressObj?.USER_NAME || "", ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : "",
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') : '',
CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || "",
});
return {
...data,
ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : "",
ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`,
CURRENT_POINT: currentRow?.CURRENT_POINT || "",
ORDER_DATE: currentRow?.ORDER_DATE ? moment(currentRow?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : '',
CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || "",
TAKE_TYPE: data.TAKE_TYPE === 1000 ? "自提" : data.TAKE_TYPE === 3000 ? '免发货' : '邮寄'
} }
} else { } else {
const req: any = { const req: any = {
searchParameter: { searchParameter: {
SALEBILL_CODE: currentRow?.TICKET_CODE SALEBILL_CODE: currentRow?.TICKET_CODE || currentRow?.OrderId
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 1, PageSize: 1,
@ -441,14 +453,14 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
if (data.List && data.List.length > 0) { if (data.List && data.List.length > 0) {
let obj: any = data.List[0] let obj: any = data.List[0]
const req: any = { const req: any = {
SALEBILLId: obj?.SALEBILL_ID SALEBILLId: obj?.SALEBILL_ID || currentRow?.OrderId
} }
const res = await handeGetSALEBILLDetail(req) const res = await handeGetSALEBILLDetail(req)
console.log('dasdas33333', res); console.log('dasdas33333', res);
// 查地址信息 // 查地址信息
const addressData = await handeGetSALEADDRESSList({ const addressData = await handeGetSALEADDRESSList({
searchParameter: { searchParameter: {
SALEBILL_ID: obj?.SALEBILL_ID SALEBILL_ID: obj?.SALEBILL_ID || currentRow?.OrderId
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 10,
@ -457,16 +469,19 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
let addressObj: any = addressData.List && addressData.List.length > 0 ? addressData.List[0] : {} let addressObj: any = addressData.List && addressData.List.length > 0 ? addressData.List[0] : {}
console.log('dmsakldmas', { console.log('dmsakldmas', {
...res, ...res,
ORDER_PERSON: addressObj?.USER_NAME || "", ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : "",
ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`, ORDER_ADDRESS: `${addressObj?.ADDRESS || ""}${addressObj?.DOORPLATE || ""}`,
CHANNEL_TYPE: currentRow?.CHANNEL_TYPE || "",
}); });
return { return {
...res, ...res,
ORDER_PERSON: addressObj?.USER_NAME || "", ORDER_PERSON: currentRow?.AddressInfo ? `${currentRow?.AddressInfo.USER_NAME}${currentRow?.AddressInfo?.MOBILEPHONE ? `【${currentRow?.AddressInfo?.MOBILEPHONE}】` : ""}` || "" : "",
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 || "",
TAKE_TYPE: res.TAKE_TYPE === 1000 ? "自提" : res.TAKE_TYPE === 3000 ? '免发货' : '邮寄'
} }
} else { } else {
message.error('当前订单数据异常，请联系管理员！') message.error('当前订单数据异常，请联系管理员！')
@ -660,8 +675,8 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
</Col> </Col>
<Col span={8} className="memberInfoDetailItem"> <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"PAY_METHOD"} // name={"PAY_METHOD"}
// name={"CHANNEL_TYPE"} name={"CHANNEL_TYPE"}
label={"支付方式"} label={"支付方式"}
readonly readonly
style={{ marginBottom: '16px' }} style={{ marginBottom: '16px' }}
@ -732,6 +747,15 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem">
<ProFormSelect
name={"TAKE_TYPE"}
label={"发货模式"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
{ {
showShipment ? showShipment ?
@ -829,7 +853,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
let SALEBILL_ID: string = '' let SALEBILL_ID: string = ''
console.log('currentRowcurrentRow', currentRow); console.log('currentRowcurrentRow', currentRow);
if (!currentRow?.SALEBILL_ID) { if (!currentRow?.SALEBILL_ID && !currentRow?.OrderId) {
const req: any = { const req: any = {
searchParameter: { searchParameter: {
SALEBILL_CODE: currentRow?.TICKET_CODE SALEBILL_CODE: currentRow?.TICKET_CODE
@ -840,7 +864,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
const data = await handeGetSALEBILLList(req) const data = await handeGetSALEBILLList(req)
console.log('dasdas', data); console.log('dasdas', data);
let obj: any = data.List && data.List.length > 0 ? data.List[0] : null let obj: any = data.List && data.List.length > 0 ? data.List[0] : null
SALEBILL_ID = obj.SALEBILL_ID SALEBILL_ID = obj.SALEBILL_ID || currentRow?.OrderId
setOrderDetail(obj) setOrderDetail(obj)
modalRef.current?.setFieldsValue({ modalRef.current?.setFieldsValue({
@ -865,7 +889,8 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
const req: any = { const req: any = {
searchParameter: { searchParameter: {
SALEBILL_ID: currentRow?.SALEBILL_ID || SALEBILL_ID SALEBILL_ID: currentRow?.SALEBILL_ID || currentRow?.OrderId || SALEBILL_ID,
SALEBILL_CHILD_ID: currentRow?.SALEBILL_CHILD_ID || currentRow?.OrderChildId
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 999999, PageSize: 999999,
@ -873,7 +898,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy
const data = await handeGetSALEDETAILList(req) const data = await handeGetSALEDETAILList(req)
console.log('datadatadata', data); console.log('datadatadata', data);
if (data.List && data.List.length > 0) { if (data.List && data.List.length > 0) {
if (currentRow?.SALEBILL_ID) { if (currentRow?.SALEBILL_ID || currentRow?.OrderId) {
let TOTAL_COUNTSUM: number = 0 let TOTAL_COUNTSUM: number = 0
let ORDER_AMOUNTSUM: number = 0 let ORDER_AMOUNTSUM: number = 0
data.List.forEach((item: any) => { data.List.forEach((item: any) => {

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

@ -29,6 +29,7 @@ import ModalFooter from '../scenicSpotConfig/component/modalFooter';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
import { highlightText } from '@/utils/highlightText'; import { highlightText } from '@/utils/highlightText';
import { handlecsyncWeChatGetMallGoodsInfo, handlesyncWeChatGetMallGoodsType } from '@/pages/operatingMerchants/service'; import { handlecsyncWeChatGetMallGoodsInfo, handlesyncWeChatGetMallGoodsType } from '@/pages/operatingMerchants/service';
import './style.less'
const beforeUpload = (file: any) => { const beforeUpload = (file: any) => {
@ -157,19 +158,19 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
// }, // },
// initialValue: "1" // initialValue: "1"
// }, // },
// { {
// dataIndex: 'SCANCODE_ORDER', dataIndex: 'SCANCODE_ORDER',
// title: '上架状态', title: '上架状态',
// align: 'center', align: 'center',
// width: 120, width: 120,
// ellipsis: true, ellipsis: true,
// valueType: "select", valueType: "select",
// valueEnum: { valueEnum: {
// "1": "上架", "1": "上架",
// "0": "下架" "0": "下架"
// }, },
// initialValue: "1" initialValue: "1"
// }, },
{ {
dataIndex: "PRESALE_TYPE", dataIndex: "PRESALE_TYPE",
title: "是否预售", title: "是否预售",
@ -183,6 +184,20 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
"1": "是" "1": "是"
} }
}, },
{
dataIndex: "SERVERPARTSHOP_ID",
title: "小程序是否显示",
align: 'center',
hideInSearch: true,
width: 120,
ellipsis: true,
valueType: "select",
valueEnum: {
"1": "精选商城",
"2": "工会商城",
"0": "不显示"
}
},
// { // {
// dataIndex: 'OWNERUNIT_NAME', // dataIndex: 'OWNERUNIT_NAME',
// title: '业主单位', // title: '业主单位',
@ -274,7 +289,7 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
req = { req = {
...currentRow, ...currentRow,
...res, ...res,
SCANCODE_ORDER: 1, // SCANCODE_ORDER: 1,
USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_STATE: 1,
GOODSTYPE: 4000, GOODSTYPE: 4000,
USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "",
@ -292,7 +307,7 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
req = { req = {
...res, ...res,
GOODSTYPE: 4000, GOODSTYPE: 4000,
SCANCODE_ORDER: 1, // SCANCODE_ORDER: 1,
USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_STATE: 1,
USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "",
PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "",
@ -338,19 +353,24 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
rowKey={(record) => { rowKey={(record) => {
return `${record?.USERDEFINEDTYPE_PID}-${record?.USERDEFINEDTYPE_ID}` return `${record?.USERDEFINEDTYPE_PID}-${record?.USERDEFINEDTYPE_ID}`
}} }}
className='USERDEFINEDTYPETable'
formRef={formRef} formRef={formRef}
headerTitle={<PageTitleBox props={props} />} // 列表表头 headerTitle={<PageTitleBox props={props} />} // 列表表头
actionRef={actionRef} actionRef={actionRef}
search={{ span: 6, labelWidth: 'auto' }} search={{ span: 6, labelWidth: 'auto' }}
bordered bordered
rowClassName={(record) => {
return record?.SCANCODE_ORDER !== 1 ? 'garyRow' : ''
}}
// 请求数据 // 请求数据
request={async (params, sorter) => { request={async (params, sorter) => {
const req = { const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId, OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "", PROVINCE_CODE: "",
GOODSTYPE: 4000, GOODSTYPE: 4000,
// USERDEFINEDTYPE_STATE: params?.SCANCODE_ORDER,
USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_STATE: 1,
SCANCODE_ORDER: params?.SCANCODE_ORDER,
// USERDEFINEDTYPE_STATE: 1,
SearchKey: params?.searchText || "" SearchKey: params?.searchText || ""
} }
const data = await handlGetUSERDEFINEDTYPEList(req); const data = await handlGetUSERDEFINEDTYPEList(req);
@ -579,13 +599,13 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
]} ]}
/> />
</Col> </Col>
{/* <Col span={12}> <Col span={12}>
<ProFormSelect <ProFormSelect
name="SCANCODE_ORDER" name="SCANCODE_ORDER"
label="上架状态" label="上架状态"
options={[{ label: "上架", value: 1 }, { label: "下架", value: 0 }]} options={[{ label: "上架", value: 1 }, { label: "下架", value: 0 }]}
/> />
</Col> */} </Col>
{/* <Col span={12}> {/* <Col span={12}>
<ProFormSelect <ProFormSelect
name="USERDEFINEDTYPE_STATE" name="USERDEFINEDTYPE_STATE"
@ -628,6 +648,37 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
</Col> </Col>
: "" : ""
} }
{
!currentRow?.USERDEFINEDTYPE_PID || currentRow?.USERDEFINEDTYPE_PID === -1 ?
<Col span={12}>
<ProFormSelect
name="SERVERPARTSHOP_ID"
label="商城首页显示"
options={[
{ label: '不显示', value: '0' },
{ label: '零售商城', value: '1' },
{ label: '工会商城', value: '2' }
]}
initialValue={0}
/>
</Col> : ""
}
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_DATE"
label="添加时间"
disabled
/>
</Col>
<Col span={12}>
<ProFormText
name="OWNERUNIT_NAME"
label="业主单位"
disabled
/>
</Col>
<Col span={12}> <Col span={12}>
<ProFormUploadButton <ProFormUploadButton
name="USERDEFINEDTYPE_ICO" name="USERDEFINEDTYPE_ICO"
@ -691,32 +742,6 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
}} }}
/> />
</Col> </Col>
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_DATE"
label="添加时间"
disabled
/>
</Col>
<Col span={12}>
<ProFormText
name="OWNERUNIT_NAME"
label="业主单位"
disabled
/>
</Col>
<Col span={12}>
<ProFormSelect
name="SERVERPARTSHOP_ID"
label="小程序显示"
options={[
{ label: '精选商城', value: '1' },
{ label: '工会商城', value: '2' },
{ label: '不显示', value: '0' },
]}
initialValue={0}
/>
</Col>
<Col span={24}> <Col span={24}>
<ProFormTextArea <ProFormTextArea
name="USERDEFINEDTYPE_DESC" name="USERDEFINEDTYPE_DESC"

20
src/pages/travelMember/MallClassificationManage/style.less Normal file
View File

@ -0,0 +1,20 @@
.USERDEFINEDTYPETable {
.garyRow {
td {
color: #ccc !important;
background-color: #f3f3f3;
span {
color: #ccc !important;
}
div {
color: #ccc !important;
a {
color: #ccc !important;
}
}
}
}
}

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

@ -8,7 +8,7 @@ import type { ActionType } from "@ant-design/pro-table";
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import moment from 'moment' import moment from 'moment'
import { handeGetMERCHANTSList, handeGetNestingAUTOTYPEList, handeGetSALEBILLList, handeGetSaleBillWholeList, handeGetSALEDETAILList } from "../service"; import { handeGetCOMPANYList, handeGetMEMBERSHIPVIPList, handeGetMERCHANTSList, handeGetNestingAUTOTYPEList, handeGetSALEBILLList, handeGetSaleBillWholeList, handeGetSALEDETAILList } from "../service";
import './style.less' import './style.less'
import Draggable from "react-draggable"; import Draggable from "react-draggable";
import ProForm, { ProFormSelect, ProFormText } from "@ant-design/pro-form"; import ProForm, { ProFormSelect, ProFormText } from "@ant-design/pro-form";
@ -49,6 +49,15 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
const [showExportTable, setShowExportTable] = useState<boolean>(false) const [showExportTable, setShowExportTable] = useState<boolean>(false)
const [printIndex, setPrintIndex] = useState<number>(new Date().getTime()) const [printIndex, setPrintIndex] = useState<number>(new Date().getTime())
// 会员列表
const [userList, setUserList] = useState<any>()
// 控制显示的字段
const [columnsState, setColumnsState] = useState<any>({
MEMBERSHIP_TARGET: { show: false },
MEMBERSHIP_POINT: { show: false },
MEMBERGROWTH_VALUE: { show: false },
})
const onDraggaleStart = (event, uiData) => { const onDraggaleStart = (event, uiData) => {
const { clientWidth, clientHeight } = window.document.documentElement; const { clientWidth, clientHeight } = window.document.documentElement;
@ -164,12 +173,15 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
} }
}, },
{ {
title: "收货人员", title: "会员姓名",
dataIndex: "ORDER_PERSON", dataIndex: "ORDERPERSON",
width: 150, width: 200,
hideInSearch: true, hideInSearch: true,
ellipsis: true, ellipsis: true,
align: "center", align: "center",
render: (_, record) => {
return `${record?.ORDER_PERSON || ""}${record?.ORDER_PERSONTEL ? `【${record?.ORDER_PERSONTEL}】` : ""}`
}
}, },
{ {
title: '会员标签', title: '会员标签',
@ -207,83 +219,26 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
} }
}, },
{ {
title: "联系电话", title: "收货人员",
dataIndex: "ORDER_PERSONTEL", dataIndex: "AddressInfoPerson",
width: 150, width: 150,
hideInSearch: true, hideInSearch: true,
ellipsis: true, ellipsis: true,
align: "center", align: "center",
},
{
dataIndex: 'SALEBILL_CODE',
title: '订单编号',
align: 'center',
hideInSearch: true,
width: 200,
ellipsis: true,
render: (_, record) => { render: (_, record) => {
return record?.SALEBILL_CODE ? <a onClick={() => { return record?.AddressInfo ? record?.AddressInfo.USER_NAME || "" : ""
console.log('recordrecordrecordrecord', record);
setCurrentRow(record);
handleModalVisible(true)
handleSetlogSave(`查询【${record?.ORDER_PERSON}】编号【${record?.SALEBILL_CODE}】的订单`)
}}>
{/* {record?.SALEBILL_CODE} */}
{highlightText(record?.SALEBILL_CODE, currentSearchText)}
</a> : "-"
} }
}, },
{ {
title: "订单时间", title: "联系电话",
dataIndex: "ORDER_DATE", dataIndex: "AddressInfoPersonMOBILEPHONE",
width: 180, width: 150,
hideInSearch: true, hideInSearch: true,
ellipsis: true, ellipsis: true,
align: "center", align: "center",
render: (_, record) => { render: (_, record) => {
return record?.ORDER_DATE ? moment(record?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : "-" return record?.AddressInfo ? record?.AddressInfo.MOBILEPHONE || "" : ""
}, }
sorter: (a, b) => new Date(a.ORDER_DATE).getTime() - new Date(b.ORDER_DATE).getTime(),
defaultSortOrder: 'descend',
},
{
title: "订单状态",
dataIndex: "SALEBILL_STATE",
width: 120,
hideInSearch: true,
ellipsis: true,
valueType: "select",
valueEnum: {
"0": "全部",
"1005": "订单待支付",
"1010": "订单待发货",
"2010": "订单已发货",
"3000": "订单已完成",
"8000": "退款申请中",
"8900": "订单已退款",
"9000": "订单已关闭",
"9999": "订单已撤销"
},
align: "center",
sorter: (a, b) => a.SALEBILL_STATE - b.SALEBILL_STATE
},
{
title: "获得积分",
dataIndex: "MEMBERSHIP_POINT",
width: 120,
hideInSearch: true,
ellipsis: true,
align: "center",
sorter: (a, b) => a.MEMBERSHIP_POINT - b.MEMBERSHIP_POINT
},
{
title: "获得成长值",
dataIndex: "MEMBERGROWTH_VALUE",
width: 120,
hideInSearch: true,
ellipsis: true,
align: "center",
sorter: (a, b) => a.MEMBERGROWTH_VALUE - b.MEMBERGROWTH_VALUE
}, },
{ {
title: "购买的商品", title: "购买的商品",
@ -293,7 +248,12 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
ellipsis: true, ellipsis: true,
align: "center", align: "center",
render: (_, record) => { render: (_, record) => {
return highlightText(record?.COMMODITY_NAME, currentSearchText) return <a onClick={() => {
console.log('recordrecordrecordrecord', record);
setCurrentRow(record);
handleModalVisible(true)
handleSetlogSave(`查询【${record?.ORDER_PERSON}】编号【${record?.SALEBILL_CODE}】的订单`)
}}>{highlightText(record?.COMMODITY_NAME, currentSearchText)} </a>
} }
}, },
{ {
@ -314,6 +274,33 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
align: "center", align: "center",
sorter: (a, b) => a.PAY_AMOUNT - b.PAY_AMOUNT sorter: (a, b) => a.PAY_AMOUNT - b.PAY_AMOUNT
}, },
{
title: "工会积分",
dataIndex: "BALANCE_PAYMENT",
width: 120,
hideInSearch: true,
ellipsis: true,
align: "center",
sorter: (a, b) => a.BALANCE_PAYMENT - b.BALANCE_PAYMENT
},
{
title: "获得积分",
dataIndex: "MEMBERSHIP_POINT",
width: 120,
hideInSearch: true,
ellipsis: true,
align: "center",
sorter: (a, b) => a.MEMBERSHIP_POINT - b.MEMBERSHIP_POINT
},
{
title: "获得成长值",
dataIndex: "MEMBERGROWTH_VALUE",
width: 120,
hideInSearch: true,
ellipsis: true,
align: "center",
sorter: (a, b) => a.MEMBERGROWTH_VALUE - b.MEMBERGROWTH_VALUE
},
{ {
title: "订单类型", title: "订单类型",
dataIndex: "SALEBILL_TYPE", dataIndex: "SALEBILL_TYPE",
@ -335,85 +322,194 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
}, },
{ {
title: "支付方式", title: "支付方式",
dataIndex: "PAY_METHOD", dataIndex: "CHANNEL_TYPE",
valueType: "select", // valueType: "select",
valueEnum: { // valueEnum: {
"0": "全部", // "0": "全部",
"支付宝": "支付宝", // "支付宝": "支付宝",
"微信": "微信", // "微信": "微信",
"积分兑换": "积分兑换", // "积分兑换": "积分兑换",
"余额支付": "余额支付", // "余额支付": "余额支付",
}, // },
width: 120, width: 120,
hideInSearch: true, // hideInSearch: true,
ellipsis: true, ellipsis: true,
align: "center", align: "center",
}, },
{ {
title: '会员标签', title: "订单时间",
dataIndex: "MEMBERSHIP_TARGET", dataIndex: "ORDER_DATE",
valueType: 'treeSelect', width: 180,
request: async () => { hideInSearch: true,
const req = { ellipsis: true,
AUTOTYPE_TYPEID: '2000', align: "center",
AUTOTYPE_PID: "", render: (_, record) => {
OWNERUNIT_ID: currentUser?.OwnerUnitId, return record?.ORDER_DATE ? moment(record?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
AUTOTYPE_VALID: 1,
SearchKey: ""
}
const data = await handeGetNestingAUTOTYPEList(req);
console.log('datadatadatadatadata', data);
return data
}, },
sorter: (a, b) => new Date(a.ORDER_DATE).getTime() - new Date(b.ORDER_DATE).getTime(),
defaultSortOrder: 'descend',
},
{
dataIndex: 'SALEBILL_CODE',
title: '订单编号',
align: 'center',
hideInSearch: true,
width: 200,
ellipsis: true,
render: (_, record) => {
return record?.SALEBILL_CODE ? <a onClick={() => {
console.log('recordrecordrecordrecord', record);
setCurrentRow(record);
handleModalVisible(true)
handleSetlogSave(`查询【${record?.ORDER_PERSON}】编号【${record?.SALEBILL_CODE}】的订单`)
}}>
{/* {record?.SALEBILL_CODE} */}
{highlightText(record?.SALEBILL_CODE, currentSearchText)}
</a> : "-"
}
},
{
title: "订单状态",
dataIndex: "SALEBILL_STATE",
width: 120,
hideInSearch: true,
ellipsis: true,
valueType: "select",
valueEnum: {
"0": "全部",
"1005": "订单待支付",
"1010": "订单待发货",
"2010": "订单已发货",
"3000": "订单已完成",
"8000": "退款申请中",
"8900": "订单已退款",
"9000": "订单已关闭",
"9999": "订单已撤销"
},
align: "center",
sorter: (a, b) => a.SALEBILL_STATE - b.SALEBILL_STATE
},
// {
// title: '会员标签',
// dataIndex: "MEMBERSHIP_TARGET",
// valueType: 'treeSelect',
// request: async () => {
// const req = {
// AUTOTYPE_TYPEID: '2000',
// AUTOTYPE_PID: "",
// OWNERUNIT_ID: currentUser?.OwnerUnitId,
// AUTOTYPE_VALID: 1,
// SearchKey: ""
// }
// const data = await handeGetNestingAUTOTYPEList(req);
// console.log('datadatadatadatadata', data);
// return data
// },
// hideInTable: true,
// fieldProps: {
// multiple: true,
// allowClear: true,
// showSearch: true,
// filterTreeNode: (input, node) => {
// // ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配
// return node?.AUTOTYPE_NAME?.toLowerCase()?.includes(input.toLowerCase());
// },
// treeDefaultExpandAll: true,
// fieldNames: {
// label: 'AUTOTYPE_NAME',
// value: 'AUTOTYPE_ID',
// }
// }
// },
// {
// title: '供应商',
// dataIndex: "MERCHANTS_IDS",
// valueType: 'select',
// request: async () => {
// const req = {
// searchParameter: {
// OWNERUNIT_ID: currentUser?.OwnerUnitId,
// PROVINCE_CODE: currentUser?.ProvinceCode,
// MERCHANTS_TYPE: ""
// },
// PageIndex: 1,
// PageSize: 999999,
// }
// const data = await handeGetMERCHANTSList(req);
// return data.List
// },
// hideInTable: true,
// fieldProps: {
// allowClear: true,
// showSearch: true,
// filterTreeNode: (input, node) => {
// // ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配
// return node?.MERCHANTS_NAME?.toLowerCase()?.includes(input.toLowerCase());
// },
// treeDefaultExpandAll: true,
// fieldNames: {
// label: 'MERCHANTS_NAME',
// value: 'MERCHANTS_ID',
// },
// disabled: currentUser?.UserPattern === 4000
// },
// initialValue: currentUser?.UserPattern === 4000 ? currentUser?.SupplierID : ""
// },
{
title: '单位名称',
dataIndex: "COMPANY_IDS",
valueType: 'select',
hideInTable: true, hideInTable: true,
hideInSearch: currentUser?.UserPattern === 4000,
request: async () => {
const req: any = {
SearchParameter: {
OWNERUNIT_ID: "911",
COMPANY_STATE: 1000
},
PageIndex: 1,
PageSize: 999999
}
const data = await handeGetCOMPANYList(req)
console.log('datadata', data);
let list: any = []
if (data && data.length > 0) {
data.forEach((item: any) => {
list.push({ label: item.COMPANY_NAME, value: item.COMPANY_ID })
})
}
return list
},
fieldProps: { fieldProps: {
multiple: true, onChange: (e: any) => {
console.log('eeeeee', e);
setUserList([])
formRef.current?.setFieldsValue({ INTERNALMEMBERSHIP_IDS: "" })
handleGetUserList(e)
},
allowClear: true, allowClear: true,
showSearch: true, showSearch: true,
filterTreeNode: (input, node) => { filterTreeNode: (input, node) => {
// ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配 // ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配
return node?.AUTOTYPE_NAME?.toLowerCase()?.includes(input.toLowerCase()); return node?.label?.toLowerCase()?.includes(input.toLowerCase());
},
treeDefaultExpandAll: true,
fieldNames: {
label: 'AUTOTYPE_NAME',
value: 'AUTOTYPE_ID',
} }
} }
}, },
{ {
title: '供应商', title: '会员姓名',
dataIndex: "MERCHANTS_IDS", dataIndex: "INTERNALMEMBERSHIP_IDS",
valueType: 'select', valueType: 'select',
request: async () => { hideInSearch: currentUser?.UserPattern === 4000,
const req = {
searchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: currentUser?.ProvinceCode,
MERCHANTS_TYPE: ""
},
PageIndex: 1,
PageSize: 999999,
}
const data = await handeGetMERCHANTSList(req);
return data.List
},
hideInTable: true, hideInTable: true,
fieldProps: { fieldProps: {
options: userList,
allowClear: true, allowClear: true,
showSearch: true, showSearch: true,
filterTreeNode: (input, node) => { filterTreeNode: (input, node) => {
// ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配 // ✅ 输入时根据 AUTOTYPE_NAME 模糊匹配
return node?.MERCHANTS_NAME?.toLowerCase()?.includes(input.toLowerCase()); return node?.label?.toLowerCase()?.includes(input.toLowerCase());
}, }
treeDefaultExpandAll: true, }
fieldNames: {
label: 'MERCHANTS_NAME',
value: 'MERCHANTS_ID',
},
disabled: currentUser?.UserPattern === 4000
},
initialValue: currentUser?.UserPattern === 4000 ? currentUser?.SupplierID : ""
}, },
// { // {
// title: "订单编号", // title: "订单编号",
@ -700,6 +796,27 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
tempTable.remove() // 防止重复打印一个内容 tempTable.remove() // 防止重复打印一个内容
} }
// 拿到会员列表
const handleGetUserList = async (e: any) => {
const req: any = {
SearchParameter: {
MEMBERSHIP_COMPANYS: e,
MEMBERSHIP_STATES: 1
},
PageIndex: 1,
PageSize: 999999
}
const data = await handeGetMEMBERSHIPVIPList(req)
console.log('会员', data);
let list: any = []
if (data && data.length > 0) {
data.forEach((item: any) => {
list.push({ label: item.MEMBERSHIP_NAME, value: item.MEMBERSHIP_ID })
})
}
setUserList(list)
}
return ( return (
<div> <div>
{ {
@ -782,7 +899,9 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
SearchKeyValue: params?.searchText || "", SearchKeyValue: params?.searchText || "",
MERCHANTS_IDS: params?.MERCHANTS_IDS || "", MERCHANTS_IDS: params?.MERCHANTS_IDS || "",
MEMBERSHIP_TARGET: params?.MEMBERSHIP_TARGET && params?.MEMBERSHIP_TARGET.length > 0 ? params?.MEMBERSHIP_TARGET.toString() : "", MEMBERSHIP_TARGET: params?.MEMBERSHIP_TARGET && params?.MEMBERSHIP_TARGET.length > 0 ? params?.MEMBERSHIP_TARGET.toString() : "",
PAYMETHOD: params?.PAYMETHOD || "" PAYMETHOD: params?.PAYMETHOD || "",
COMPANY_IDS: params?.COMPANY_IDS || "",
INTERNALMEMBERSHIP_IDS: params?.INTERNALMEMBERSHIP_IDS || "",
// MERCHANTS_IDS: currentUser?.SupplierID // MERCHANTS_IDS: currentUser?.SupplierID
}, },
PageIndex: 1, PageIndex: 1,
@ -859,6 +978,12 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
// }}>导出财务结算Excel</Button> // }}>导出财务结算Excel</Button>
] ]
}} }}
columnsState={{
value: columnsState,
onChange: (value) => {
setColumnsState(value)
}
}}
/> />
</div> </div>
</div> </div>

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

@ -8,7 +8,7 @@ import type { ActionType } from "@ant-design/pro-table";
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import moment from 'moment' import moment from 'moment'
import { handeGetSALEBILLList, handeGetSaleBillWholeList, handeGetSALEDETAILList, handeWeChatRefundApply, handeWeRevokeRefundApply } from "../service"; import { handeGetSALEBILLList, handeGetSaleBillWholeList, handeGetSALEDETAILList, handeRefundInternalBill, handeWeChatRefundApply, handeWeRevokeRefundApply } from "../service";
import Draggable from "react-draggable"; import Draggable from "react-draggable";
import ProForm, { ProFormSelect, ProFormText } from "@ant-design/pro-form"; import ProForm, { ProFormSelect, ProFormText } from "@ant-design/pro-form";
import orderIcon from '@/assets/detail/orderIcon.png' import orderIcon from '@/assets/detail/orderIcon.png'
@ -47,6 +47,13 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
}; };
// 当前查询的文字 // 当前查询的文字
const [currentSearchText, setCurrentSearchText] = useState<string>('') const [currentSearchText, setCurrentSearchText] = useState<string>('')
// 订单状态的枚举值
const SALEBILL_STATEOBJ: any = {
8000: "退款申请中",
8020: "退款审核中",
8900: "订单已退款",
9000: "订单已关闭",
}
const columns: any = [ const columns: any = [
@ -130,6 +137,8 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
align: "center", align: "center",
render: (_, record) => { render: (_, record) => {
return record?.SALEBILL_CODE ? <a onClick={() => { return record?.SALEBILL_CODE ? <a onClick={() => {
console.log('recordrecord', record);
setCurrentRow(record); setCurrentRow(record);
handleModalVisible(true) handleModalVisible(true)
handleSetlogSave(`查询【${record?.ORDER_PERSON}】编码为${record?.SALEBILL_CODE}的订单`) handleSetlogSave(`查询【${record?.ORDER_PERSON}】编码为${record?.SALEBILL_CODE}的订单`)
@ -164,6 +173,11 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
"9000": "订单已关闭", "9000": "订单已关闭",
}, },
align: "center", align: "center",
render: (_, record) => {
return <span style={{ color: record?.SALEBILL_STATE === 8900 ? "red" : "" }}>
{SALEBILL_STATEOBJ && record?.SALEBILL_STATE ? SALEBILL_STATEOBJ[record?.SALEBILL_STATE] : ""}
</span>
}
}, },
{ {
title: "退款金额", title: "退款金额",
@ -273,7 +287,15 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
// 同意退款 // 同意退款
const handleGetAgreeToRefund = async () => { const handleGetAgreeToRefund = async () => {
console.log('currentRowcurrentRowcurrentRow', currentRow); console.log('currentRowcurrentRowcurrentRow', currentRow);
const req: any = { let req: any = {}
let data: any = {}
if (currentRow?.OriSALEBILL_TYPE) {
req = {
saleBillId: currentRow?.SALEBILL_ID || "",
}
data = await handeRefundInternalBill(req)
} else {
req = {
mchid: "1672298991", mchid: "1672298991",
serial_no: "5BA7C0F427FC042DB5BF299E35B373D5EFCECD35", serial_no: "5BA7C0F427FC042DB5BF299E35B373D5EFCECD35",
mobileOrderCode: "", mobileOrderCode: "",
@ -285,7 +307,9 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
provinceCode: "530000" provinceCode: "530000"
} }
console.log('reqreq', req); console.log('reqreq', req);
const data = await handeWeChatRefundApply(req) data = await handeWeChatRefundApply(req)
}
if (data.Result_Code === 100) { if (data.Result_Code === 100) {
message.success('退款成功!') message.success('退款成功!')
handleConfirmLoading(false) handleConfirmLoading(false)
@ -473,6 +497,7 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
submitter={false} submitter={false}
initialValues={currentRow ? { initialValues={currentRow ? {
...currentRow, ...currentRow,
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') : ''
} : {}} } : {}}
> >
@ -610,6 +635,14 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
]} ]}
/> />
</Col> </Col>
<Col span={8} className="memberInfoDetailItem">
<ProFormText
name={"orderPerson"}
label={"收货人电话"}
readonly
style={{ marginBottom: '16px' }}
/>
</Col>
{/* <Col span={8} className="memberInfoDetailItem"> {/* <Col span={8} className="memberInfoDetailItem">
<ProFormSelect <ProFormSelect
name={"TAKE_TYPE"} name={"TAKE_TYPE"}

148
src/pages/travelMember/ProductListingManagement/index.tsx
View File

@ -288,6 +288,112 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
}, },
initialValue: "1" initialValue: "1"
}, },
{
dataIndex: "COMMODITY_NATURE",
title: "商品性质",
align: 'center',
hideInTable: true,
valueType: "select",
request: async () => {
if (COMMODITYNATUREList && COMMODITYNATUREList.length > 0) {
if (currentUser?.UserPattern === 4000) {
COMMODITYNATUREList.forEach((item: any) => {
if (item.label === '工会商城' || item.label === '实物商品') {
} else {
item.disabled = true
}
})
}
return COMMODITYNATUREList
} else {
const COMMODITYNATURE = await getFieldEnumTree({ FieldExplainField: 'COMMODITY_NATURE', FieldEnumStatus: true })
if (COMMODITYNATURE && COMMODITYNATURE.length > 0) {
const obj: any = {}
const list: any = []
COMMODITYNATURE.forEach((item: any) => {
list.push({ label: item.label, value: item.value })
obj[item.value] = item.label
})
session.set('COMMODITYNATUREList', list);
session.set('COMMODITYNATUREObj', obj);
session.set('COMMODITYNATURETree', COMMODITYNATURE);
if (currentUser?.UserPattern === 4000) {
list.forEach((item: any) => {
if (item.label === '工会商城' || item.label === '实物商品') {
} else {
item.disabled = true
}
})
}
return list
}
return []
}
}
},
{
dataIndex: "MERCHANTS_ID",
title: "供货商户",
align: 'center',
hideInTable: true,
hideInSearch: currentUser?.UserPattern === 4000,
valueType: "select",
request: async () => {
if (COMMODITYSUPPLIERLIST && COMMODITYSUPPLIERLIST.length > 0) {
return COMMODITYSUPPLIERLIST
} else {
const req = {
searchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: currentUser?.ProvinceCode,
MERCHANTS_TYPE: "",
MERCHANTS_STATE: 1
},
PageIndex: 1,
PageSize: 999999,
}
const data = await handeGetMERCHANTSList(req);
if (data.List && data.List.length > 0) {
let list: any = []
data.List.forEach((item: any) => {
list.push({ label: item.MERCHANTS_NAME, value: `${item.MERCHANTS_NAME}-${item.MERCHANTS_ID}` })
})
setCOMMODITYSUPPLIERLIST(list)
return list
}
setCOMMODITYSUPPLIERLIST([])
return []
}
}
},
{
dataIndex: "PAY_METHOD",
title: "消费模式",
align: 'center',
hideInTable: true,
valueType: "select",
request: async () => {
if (PAYMETHODList && PAYMETHODList.length > 0) {
return PAYMETHODList
} else {
const PAYMETHOD = await getFieldEnumTree({ FieldExplainField: 'PAY_METHOD' })
if (PAYMETHOD && PAYMETHOD.length > 0) {
const obj: any = {}
const list: any = []
PAYMETHOD.forEach((item: any) => {
list.push({ label: item.label, value: item.value })
obj[item.value] = item.label
})
session.set('PAYMETHODList', list);
session.set('PAYMETHODObj', obj);
session.set('PAYMETHODTree', PAYMETHOD);
return list
}
return []
}
}
},
{ {
dataIndex: 'MERCHANTS_NAME', dataIndex: 'MERCHANTS_NAME',
title: '商户名称', title: '商户名称',
@ -807,6 +913,9 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
} }
console.log('isComboisCombo', isCombo);
console.log('isClickAddisClickAdd', isClickAdd);
let req: any = {} let req: any = {}
if (currentRow?.USERDEFINEDTYPE_ID && type !== 'saveAs') { if (currentRow?.USERDEFINEDTYPE_ID && type !== 'saveAs') {
@ -1175,7 +1284,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
bordered bordered
headerTitle={<PageTitleBox props={props} />} // 列表表头 headerTitle={<PageTitleBox props={props} />} // 列表表头
actionRef={actionRef} actionRef={actionRef}
search={{ span: 6, labelWidth: 'auto' }} search={{ span: 6, labelWidth: 'auto', defaultCollapsed: false }}
// 请求数据 // 请求数据
request={async (params, sorter) => { request={async (params, sorter) => {
if (!selectedId) { if (!selectedId) {
@ -1190,7 +1299,9 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
DUTY_PARAGRAPH: params?.DUTY_PARAGRAPH === "-1" ? "" : params?.DUTY_PARAGRAPH, DUTY_PARAGRAPH: params?.DUTY_PARAGRAPH === "-1" ? "" : params?.DUTY_PARAGRAPH,
COMMODITY_TYPE: 4000, COMMODITY_TYPE: 4000,
COMMODITY_STATE: 1, COMMODITY_STATE: 1,
MERCHANTS_ID: currentUser?.SupplierID COMMODITY_NATURE: params?.COMMODITY_NATURE || "",
PAY_METHOD: params?.PAY_METHOD || "",
MERCHANTS_ID: currentUser?.UserPattern !== 4000 ? params?.MERCHANTS_ID ? params?.MERCHANTS_ID.split('-')[1] : "" : currentUser?.SupplierID
}, },
keyWord: { keyWord: {
@ -1379,7 +1490,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
setComboCommodityDetail([]) setComboCommodityDetail([])
// setBRAND_NAMEList([]) // setBRAND_NAMEList([])
}} }}
footer={<div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}> footer={currentUser?.UserPattern === 4000 && currentRow?.UPPER_STATE === 1 ? '' : <div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
<Button type={'primary'} onClick={() => { <Button type={'primary'} onClick={() => {
// setIsClickAdd(true) // setIsClickAdd(true)
@ -1580,16 +1691,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
setHeaderImgList(headerImgList) setHeaderImgList(headerImgList)
setDetailImgList(detailImgList) setDetailImgList(detailImgList)
console.log('dsadjmaskda', data.CouponIds ? data.CouponIds.split(',').map(Number) : []);
return { return {
...data, ...data,
USERDEFINEDTYPE_ID: data.UserDefinedTypeIds ? data.UserDefinedTypeIds.split(',').map(Number) : [], USERDEFINEDTYPE_ID: data.UserDefinedTypeIds ? data.UserDefinedTypeIds.split(',').map(Number) : [],
BRAND_ID: `${data?.BRAND_NAME}-${data?.BRAND_ID}`, BRAND_ID: `${data?.BRAND_NAME}-${data?.BRAND_ID}`,
MERCHANTS_ID: `${data?.MERCHANTS_NAME}-${data?.MERCHANTS_ID}`, MERCHANTS_ID: `${data?.MERCHANTS_NAME}-${data?.MERCHANTS_ID}`,
UPPER_DATE: data.UPPER_DATE && data.OFF_DATE ? [data.UPPER_DATE, data.OFF_DATE] : [], UPPER_DATE: data.UPPER_DATE && data.OFF_DATE ? [data.UPPER_DATE, data.OFF_DATE] : [],
relevanceCoupon: data.CouponIds ? data.CouponIds.split(',').map(Number) : [] relevanceCoupon: data.CouponIds ? data.CouponIds.split(',').map(Number) : [],
COMMODITY_NATURE: data.COMMODITY_NATURE ? Number(data.COMMODITY_NATURE) : '',
// mainImgList: mainImgList, // mainImgList: mainImgList,
// headerImgList: headerImgList, // headerImgList: headerImgList,
// detailImgList: detailImgList, // detailImgList: detailImgList,
@ -1644,6 +1753,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
// options={COMMODITYNATUREList} // options={COMMODITYNATUREList}
request={async () => { request={async () => {
if (COMMODITYNATUREList && COMMODITYNATUREList.length > 0) { if (COMMODITYNATUREList && COMMODITYNATUREList.length > 0) {
if (currentUser?.UserPattern === 4000) {
COMMODITYNATUREList.forEach((item: any) => {
if (item.label === '工会商城' || item.label === '实物商品') {
} else {
item.disabled = true
}
})
}
return COMMODITYNATUREList return COMMODITYNATUREList
} else { } else {
const COMMODITYNATURE = await getFieldEnumTree({ FieldExplainField: 'COMMODITY_NATURE', FieldEnumStatus: true }) const COMMODITYNATURE = await getFieldEnumTree({ FieldExplainField: 'COMMODITY_NATURE', FieldEnumStatus: true })
@ -1657,6 +1774,15 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
session.set('COMMODITYNATUREList', list); session.set('COMMODITYNATUREList', list);
session.set('COMMODITYNATUREObj', obj); session.set('COMMODITYNATUREObj', obj);
session.set('COMMODITYNATURETree', COMMODITYNATURE); session.set('COMMODITYNATURETree', COMMODITYNATURE);
if (currentUser?.UserPattern === 4000) {
list.forEach((item: any) => {
if (item.label === '工会商城' || item.label === '实物商品') {
} else {
item.disabled = true
}
})
}
return list return list
} }
return [] return []
@ -1668,6 +1794,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
message: "请选择商品性质！" message: "请选择商品性质！"
} }
]} ]}
// 解释一下 先判断 商品性质有没有值 如果没值 说明是新增 不做任何逻辑判断
// 第二判断 是不是供应商 不是供应商 不做判断 是供应商 进入第三层判断
// 若 初始的数据 是 实物商品或工会商城 那就不禁用 如果是其他的 那么供应商就不能修改 那么就是禁用 逻辑就是这样
// disabled={currentRow?.COMMODITY_NATURE ?
// currentUser?.UserPattern === 4000 ?
// Number(currentRow?.COMMODITY_NATURE) === 1000 || Number(currentRow?.COMMODITY_NATURE) === 5070 ? false : true
// : false
// : false}
/> />
</Col> </Col>
<Col span={6}> <Col span={6}>

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

@ -75,7 +75,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
title: '查询内容', title: '查询内容',
hideInTable: true, hideInTable: true,
fieldProps: { fieldProps: {
placeholder: "请输入供货商/购买的商品/订单编号" placeholder: "请输入供货商/购买的商品/订单编号/会员名称/电话号码"
} }
}, },
{ {
@ -135,21 +135,21 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
} }
}, },
{ {
dataIndex: "SupplierName", dataIndex: "CompanyName",
title: <div style={{ textAlign: 'center' }}>所属单位</div>, title: <div style={{ textAlign: 'center' }}>所属单位</div>,
hideInSearch: true, hideInSearch: true,
width: 250, width: 300,
ellipsis: true, ellipsis: true,
}, },
{ {
dataIndex: 'OrderPerson', dataIndex: 'OrderPerson',
title: <div style={{ textAlign: 'center' }}>会员名称</div>, title: <div style={{ textAlign: 'center' }}>会员名称</div>,
align: 'center', align: 'center',
width: 150, width: 200,
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
render: (_, record) => { render: (_, record) => {
return record?.OrderPerson ? `${record?.OrderPerson}${record?.ReceiverPhone ? `【${record?.ReceiverPhone}】` : ""}` : "" return record?.OrderPerson ? `${record?.OrderPerson}${record?.OrderPersonTel ? `【${record?.OrderPersonTel}】` : ""}` : ""
} }
}, },
{ {
@ -176,7 +176,14 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
render: (_, record) => { render: (_, record) => {
return highlightText(record?.CommodityName, currentSearchText) return <a onClick={() => {
setCurrentRow(record);
handleModalVisible(true)
handleSetlogSave(`查询收货人【${record?.ORDER_PERSON}】编码【${record.OrderCode}】订单`)
}}>
{highlightText(record?.CommodityName, currentSearchText)}
</a>
} }
}, },
{ {
@ -209,14 +216,14 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
{ {
title: "订单类型", title: "订单类型",
width: 150, width: 150,
dataIndex: "SaleBillType", dataIndex: "OrderType",
valueType: "select", valueType: "select",
align: 'center', align: 'center',
valueEnum: { valueEnum: {
"0": "全部", "0": "全部",
"3000": "零售商城", "3000": "零售商城",
"3001": "工会商城", "3001": "工会商城",
"3002": "品诺商城", // "3002": "品诺商城",
"3010": "积分商城" "3010": "积分商城"
}, },
initialValue: '0', initialValue: '0',
@ -570,7 +577,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
CompanyId: searchParams?.CompanyId || "", CompanyId: searchParams?.CompanyId || "",
MerchantId: "", MerchantId: "",
SaleBillState: searchParams?.OrderStatus === '0' ? '' : (searchParams?.OrderStatus || ""), SaleBillState: searchParams?.OrderStatus === '0' ? '' : (searchParams?.OrderStatus || ""),
SaleBillType: searchParams?.SaleBillType === '0' ? '' : (searchParams?.SaleBillType || ""), SaleBillType: searchParams?.OrderType === '0' ? '' : (searchParams?.OrderType || ""),
ChannelType: searchParams?.PaymentMethod || "", ChannelType: searchParams?.PaymentMethod || "",
StartDate: searchParams?.ORDER_DATE_Start || "", StartDate: searchParams?.ORDER_DATE_Start || "",
EndDate: searchParams?.ORDER_DATE_End || "", EndDate: searchParams?.ORDER_DATE_End || "",
@ -690,11 +697,11 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
CompanyId: params?.CompanyId || "", CompanyId: params?.CompanyId || "",
MerchantId: "", MerchantId: "",
SaleBillState: params?.OrderStatus === '0' ? '' : (params?.OrderStatus || ""), SaleBillState: params?.OrderStatus === '0' ? '' : (params?.OrderStatus || ""),
SaleBillType: params?.SaleBillType === '0' ? '' : (params?.SaleBillType || ""), SaleBillType: params?.OrderType === '0' ? '' : (params?.OrderType || ""),
ChannelType: params?.PaymentMethod || "", ChannelType: params?.PaymentMethod || "",
StartDate: params?.ORDER_DATE_Start || "", StartDate: params?.ORDER_DATE_Start || "",
EndDate: params?.ORDER_DATE_End || "", EndDate: params?.ORDER_DATE_End || "",
SearchKeyName: "SupplierName,CommodityName,OrderCode", SearchKeyName: "MERCHANTS_NAME,COMMODITY_NAME,SALEBILL_CHILD_CODE,ORDER_PERSON,ORDER_PERSONTEL",
SearchKeyValue: params?.searchText || "", SearchKeyValue: params?.searchText || "",
SortStr: "" SortStr: ""
} }

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

@ -848,7 +848,17 @@ export async function handeGetCOMPANYList(params: any) {
return data.Result_Data.List return data.Result_Data.List
} }
// 获取企业会员信息列表
export async function handeGetMEMBERSHIPVIPList(params: any) {
const data = await requestEncryption(`/Member/GetMEMBERSHIPVIPList`, {
method: 'POST',
data: { ...params, requestEncryption: true }
})
if (data.Result_Code !== 100) {
return []
}
return data.Result_Data.List
}
// 拿到埋点的配置数据 // 拿到埋点的配置数据
@ -1363,6 +1373,18 @@ export async function handeWeChatRefundApply(params: any) {
return data return data
} }
// 工会商城退款
export async function handeRefundInternalBill(params: any) {
const data = await requestEncryption(`/WeChatPay/RefundInternalBill`, {
method: 'POST',
data: { ...params, requestEncryption: true }
})
if (data.Result_Code !== 100) {
return data
}
return data
}
// 微信支付撤销退款申请 // 微信支付撤销退款申请
export async function handeWeRevokeRefundApply(params: any) { export async function handeWeRevokeRefundApply(params: any) {

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.111"; export const VERSION = "4.5.121";
export const GIT_HASH = "70a3b9e"; export const GIT_HASH = "31a0a71";
export const BUILD_TIME = "2026-01-08T08:04:25.225Z"; export const BUILD_TIME = "2026-01-21T02:40:21.103Z";