diff --git a/dist.zip b/dist.zip index cafe539..48e63f8 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index a1039ed..63de6f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.85", + "version": "4.5.88", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/CardInformation/CardCouponApplicRule/index.tsx b/src/pages/CardInformation/CardCouponApplicRule/index.tsx index 1fabf42..f0401c6 100644 --- a/src/pages/CardInformation/CardCouponApplicRule/index.tsx +++ b/src/pages/CardInformation/CardCouponApplicRule/index.tsx @@ -240,10 +240,12 @@ const CardCouponApplicRules: React.FC<{ currentUser: CurrentUser }> = (props) => // 删除规则记录 const handleDeleteShopRule = async (id: any) => { + setModalLoading(true) const req: any = { COOPSHOP_RULEId: id } const data = await handleDeleteCOOPSHOP_RULE(req) + setModalLoading(false) if (data.Result_Code === 100) { handleSetlogSave(`删除【${currentRow?.COOPSHOP_RULE_NAME}】卡券规则`) message.success(data.Result_Desc) @@ -378,6 +380,7 @@ const CardCouponApplicRules: React.FC<{ currentUser: CurrentUser }> = (props) => }) }} footer={ { await handleDeleteShopRule(currentRow?.COOPSHOP_RULE_ID) diff --git a/src/pages/CardInformation/CardHaveCollection/index.tsx b/src/pages/CardInformation/CardHaveCollection/index.tsx index db48f8c..07e9580 100644 --- a/src/pages/CardInformation/CardHaveCollection/index.tsx +++ b/src/pages/CardInformation/CardHaveCollection/index.tsx @@ -251,7 +251,7 @@ const CardHaveCollection: React.FC<{ currentUser: CurrentUser }> = (props) => { setShowDetail(false) }} > - + {/* 卡券的编辑 还是 新增 组件 */} diff --git a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx index fc18722..db30855 100644 --- a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx +++ b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx @@ -138,6 +138,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai ModalFormRef?.current?.resetFields() setCurrentRow(undefined) setShowDetail(false) + setFileList([]) if (parentRef) { parentRef.current?.reload() } @@ -176,7 +177,9 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai confirmLoading={modalLoading} hideDelete={!currentRow?.COUPON_ID} handleDelete={async () => { + setModalLoading(true) await handleDeleteShopRule(currentRow?.COUPON_ID) + setModalLoading(false) }} handleCancel={() => { ModalFormRef?.current?.resetFields() @@ -207,6 +210,14 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai setCouponDetail(data) setCOUPON_TYPE(currentRow?.COUPON_TYPE) setVALID_TYPE(currentRow?.VALID_TYPE) + if (data.COUPON_IMAGEURL) { + let list: any = [ + { url: data.COUPON_IMAGEURL, name: "" } + ] + setFileList(list) + } + + return data } else { setCOUPON_TYPE(1000) diff --git a/src/pages/CardInformation/CardVoucherSearch/index.tsx b/src/pages/CardInformation/CardVoucherSearch/index.tsx index 80f4edc..c6ff5b3 100644 --- a/src/pages/CardInformation/CardVoucherSearch/index.tsx +++ b/src/pages/CardInformation/CardVoucherSearch/index.tsx @@ -22,8 +22,8 @@ import MemberDetail from "@/pages/travelMember/memberInfor/component/memberDetai import CardInfo from "../CardInformationManager/components/CardInfo"; -const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, parentRow?: any }> = (props) => { - const { currentUser, isComponent, parentRow } = props +const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, parentRow?: any, parentSearchParams?: any }> = (props) => { + const { currentUser, isComponent, parentRow, parentSearchParams } = props const downloadBtnRef = useRef() const actionRef = useRef(); const formRef = useRef(); @@ -112,7 +112,7 @@ const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: bool { title: "优惠券名称", dataIndex: "COUPON_NAME", - width: 150, + width: 250, hideInSearch: true, ellipsis: true, align: "center", @@ -152,7 +152,7 @@ const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: bool { title: "优惠券状态", dataIndex: "COUPON_STATE", - width: 150, + width: 110, hideInSearch: true, ellipsis: true, align: "center", @@ -241,6 +241,8 @@ const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: bool search={isComponent ? false : { span: 6, defaultCollapsed: false }} request={async (params) => { console.log('selectedIdselectedIdselectedIdselectedId', selectedId); + console.log('parentRowparentRowparentRow', parentRow); + console.log('parentSearchParamsparentSearchParamsparentSearchParams', parentSearchParams); if (!selectedId && !isComponent) { return } @@ -251,6 +253,9 @@ const CardVoucherSearch: React.FC<{ currentUser: CurrentUser, isComponent?: bool SearchParameter: { COUPON_IDS: parentRow?.COUPON_ID, WECHATAPP_APPID: "wxee018fb96955552a", + // 领取时间 + CREATE_DATE_Start: parentSearchParams?.STARTDATE || '', + CREATE_DATE_End: parentSearchParams?.ENDDATE || '', }, PageIndex: 1, PageSize: 999999, diff --git a/src/pages/operatingMerchants/MerchantInformation/index.tsx b/src/pages/operatingMerchants/MerchantInformation/index.tsx index 0edb69c..e7f8e60 100644 --- a/src/pages/operatingMerchants/MerchantInformation/index.tsx +++ b/src/pages/operatingMerchants/MerchantInformation/index.tsx @@ -1225,6 +1225,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = setDoorImageList([]) setInteriorImageList([]) setCurrentShopData([]) + setSelectTab("1") }} // onOk={async () => { // 提交框内的数据 // formRef?.current?.validateFields().then(() => { @@ -1293,6 +1294,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = handleModalVisible(false) setCurrentRowDetail(null) setCurrentRow(null) + setSelectTab("1") }}>取消 + : "" } @@ -342,7 +350,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy await handleUpdateLogisticsInformation() }} > - + : currentRow?.SALEBILL_STATE === 1010 ? @@ -352,7 +360,7 @@ const OrderDetailModal = ({ modalVisible, handleCloseModal, currentRow, detailTy await handleProductDelivery() }} > - + : '' } diff --git a/src/pages/travelMember/BuriedPointConfig/index.tsx b/src/pages/travelMember/BuriedPointConfig/index.tsx index ccee4a4..aef70bd 100644 --- a/src/pages/travelMember/BuriedPointConfig/index.tsx +++ b/src/pages/travelMember/BuriedPointConfig/index.tsx @@ -241,7 +241,8 @@ const BuriedPointConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (p UPDATE_STAFF_ID: currentUser?.ID, UPDATE_STAFF_NAME: currentUser?.Name, UPDATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), - ISSHOW: 1 + ISSHOW: 1, + WECHATAPPBURYPOINT_STATE: 1 } } else { req = { @@ -252,7 +253,8 @@ const BuriedPointConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (p UPDATE_STAFF_ID: currentUser?.ID, UPDATE_STAFF_NAME: currentUser?.Name, UPDATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), - ISSHOW: 1 + ISSHOW: 1, + WECHATAPPBURYPOINT_STATE: 1 } } console.log('reqreq', req); @@ -391,8 +393,10 @@ const BuriedPointConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (p handleModalVisible(false) }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.WECHATAPPBURYPOINT_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/ConsumptionTypeConfig/index.tsx b/src/pages/travelMember/ConsumptionTypeConfig/index.tsx index 025c189..104aa45 100644 --- a/src/pages/travelMember/ConsumptionTypeConfig/index.tsx +++ b/src/pages/travelMember/ConsumptionTypeConfig/index.tsx @@ -355,8 +355,10 @@ const ConsumptionTypeConfig: React.FC<{ currentUser: CurrentUser | undefined }> setCurrentRow(undefined); }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx b/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx index f720f7f..d424d1f 100644 --- a/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx +++ b/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx @@ -8,11 +8,12 @@ import Draggable from "react-draggable"; import ProForm, { ProFormCheckbox, ProFormDatePicker, ProFormDigit, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import session from "@/utils/session"; import moment from 'moment' -import { handleGetACTIVITYDETAILList, handleGetSynchroACTIVITY } from "../../SharedRestStationManagement/service"; +import { handleDeleteACTIVITY, handleGetACTIVITYDETAILList, handleGetSynchroACTIVITY } from "../../SharedRestStationManagement/service"; import { deleteAHYDPicture, uploadAHYDPicture } from "../service"; import { compressImage } from "@/utils/imageCompress"; import ProTable, { ActionType } from "@ant-design/pro-table"; import './style.less' +import ModalFooter from "../../scenicSpotConfig/component/modalFooter"; type DetailProps = { parentRow: any;// 传入的当前行数据 @@ -97,7 +98,7 @@ const EventRegistrationDetail = ({ parentRow, setparentRow, onShow, setOnShow, c { title:
报名状态
, width: 180, - dataIndex: "ACTIVITYDETAIL_STATE", + dataIndex: "ACTIVITYDETAIL_STATE", ellipsis: true, hideInSearch: true, valueType: "select", @@ -107,6 +108,27 @@ const EventRegistrationDetail = ({ parentRow, setparentRow, onShow, setOnShow, c }, ] + + // 删除活动的方法 + const handleGetDeleteActivity = async (activityId: string) => { + const req: any = { + ACTIVITYId: activityId + } + const data = await handleDeleteACTIVITY(req) + if (data.Result_Code === 100) { + message.success(data.Result_Desc) + + handleConfirmLoading(false) + setOnShow(false) + setparentRow(undefined); + setFileList([]) + modalFromRef.current?.resetFields(); + actionRef.current?.reload() + } else { + message.error(data.Result_Desc) + } + } + return (
- - -
- } + footer={readonly ? false : { + handleConfirmLoading(true) + await handleGetDeleteActivity(parentRow?.ACTIVITY_ID) + handleConfirmLoading(false) + }} + handleCancel={() => { + handleConfirmLoading(false) + setOnShow(false) + setparentRow(undefined); + setFileList([]) + modalFromRef.current?.resetFields(); + }} + handleOK={() => { + modalFromRef.current?.validateFields().then((values) => { + modalFromRef.current?.submit(); + }) + }} + + />} + + // footer={readonly ? '' : + //
+ // + // + //
+ // } open={onShow} confirmLoading={confirmLoading} afterClose={() => { diff --git a/src/pages/travelMember/EventRegistration/index.tsx b/src/pages/travelMember/EventRegistration/index.tsx index fed7d2e..6d1888a 100644 --- a/src/pages/travelMember/EventRegistration/index.tsx +++ b/src/pages/travelMember/EventRegistration/index.tsx @@ -1,3 +1,4 @@ +// 活动信息填报 import { connect } from "umi"; import type { CurrentUser } from "umi"; import type { ConnectState } from "@/models/connect"; @@ -85,6 +86,27 @@ const EventRegistration: React.FC<{ currentUser: CurrentUser }> = (props) => { dataIndex: "ACTIVITY_NAME", ellipsis: true, hideInSearch: true, + render: (_, record) => { + return record?.ACTIVITY_NAME ? { + let imgList: any = [] + if (record?.ImageList && record?.ImageList.length > 0) { + record?.ImageList.forEach((item: any) => { + let obj = JSON.parse(JSON.stringify(item)) + obj.url = obj.ImageUrl + obj.name = obj.ImageName + obj.uid = item.ImageId + obj.status = 'done' + imgList.push(obj) + }) + } + setCurrentRow({ + ...record, + ACTIVITY_IMG: imgList + }) + setFileList(imgList); + handleModalVisible(true) + }}>{record?.ACTIVITY_NAME} : "" + } }, { title:
活动范围
, @@ -141,44 +163,44 @@ const EventRegistration: React.FC<{ currentUser: CurrentUser }> = (props) => { 9: { text: '已下架', status: 'error' }, } }, - { - title: "操作", - dataIndex: "option", - width: 120, - align: 'center', - hideInSearch: true, - render: (_, record) => { - return - { - let imgList: any = [] - if (record?.ImageList && record?.ImageList.length > 0) { - record?.ImageList.forEach((item: any) => { - let obj = JSON.parse(JSON.stringify(item)) - obj.url = obj.ImageUrl - obj.name = obj.ImageName - obj.uid = item.ImageId - obj.status = 'done' - imgList.push(obj) - }) - } - setCurrentRow({ - ...record, - ACTIVITY_IMG: imgList - }) - setFileList(imgList); - handleModalVisible(true) - }}>编辑 - { - await handleGetDeleteActivity(record.ACTIVITY_ID) - }} - > - 删除 - - - } - } + // { + // title: "操作", + // dataIndex: "option", + // width: 120, + // align: 'center', + // hideInSearch: true, + // render: (_, record) => { + // return + // { + // let imgList: any = [] + // if (record?.ImageList && record?.ImageList.length > 0) { + // record?.ImageList.forEach((item: any) => { + // let obj = JSON.parse(JSON.stringify(item)) + // obj.url = obj.ImageUrl + // obj.name = obj.ImageName + // obj.uid = item.ImageId + // obj.status = 'done' + // imgList.push(obj) + // }) + // } + // setCurrentRow({ + // ...record, + // ACTIVITY_IMG: imgList + // }) + // setFileList(imgList); + // handleModalVisible(true) + // }}>编辑 + // { + // await handleGetDeleteActivity(record.ACTIVITY_ID) + // }} + // > + // 删除 + // + // + // } + // } ] // 删除活动的方法 diff --git a/src/pages/travelMember/GrowthValueRuleConfig/components/MEMBERSHIPTYPEConfig.tsx b/src/pages/travelMember/GrowthValueRuleConfig/components/MEMBERSHIPTYPEConfig.tsx index 8eeffb4..b2cbc8f 100644 --- a/src/pages/travelMember/GrowthValueRuleConfig/components/MEMBERSHIPTYPEConfig.tsx +++ b/src/pages/travelMember/GrowthValueRuleConfig/components/MEMBERSHIPTYPEConfig.tsx @@ -367,7 +367,9 @@ const MEMBERSHIPTYPEConfig: React.FC<{ currentUser: CurrentUser | undefined }> = }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx b/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx index e525f48..6e49483 100644 --- a/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx +++ b/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx @@ -364,8 +364,10 @@ const GrowthConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (props) setCurrentRow(undefined); }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/GrowthValueRuleConfig/index.tsx b/src/pages/travelMember/GrowthValueRuleConfig/index.tsx index 8550a80..f5c2b18 100644 --- a/src/pages/travelMember/GrowthValueRuleConfig/index.tsx +++ b/src/pages/travelMember/GrowthValueRuleConfig/index.tsx @@ -564,12 +564,14 @@ const GrowthValueRuleConfig: React.FC<{ currentUser: CurrentUser | undefined }> footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.GROWTHSETTING_ID) }} handleCancel={() => { handleConfirmLoading(false) handleModalVisible(false) }} + confirmLoading={confirmLoading} handleOK={() => { formRef?.current?.validateFields().then(() => { handleConfirmLoading(true) diff --git a/src/pages/travelMember/InvestmentInformation/index.tsx b/src/pages/travelMember/InvestmentInformation/index.tsx index 446f366..5c55a22 100644 --- a/src/pages/travelMember/InvestmentInformation/index.tsx +++ b/src/pages/travelMember/InvestmentInformation/index.tsx @@ -19,6 +19,7 @@ import { handleGetPictureList, handleGetRTNOTICEINFOList } from "../SharedRestSt import { handleGetServerpartTree } from "@/pages/basicManage/serverpartAssets/service"; import { bool } from "aws-sdk/clients/signer"; import InvestmentInformationDetail from "./components/InvestmentInformationDetail"; +import ModalFooter from "../scenicSpotConfig/component/modalFooter"; const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -124,6 +125,13 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => hideInSearch: true, width: 250, ellipsis: true, + render: (_, record) => { + return record?.NOTICEINFO_TITLE ? + { + setCurrentRow(record) + setShowAddModal(true) + }}>{record?.NOTICEINFO_TITLE || ""} : "" + } }, { title:
内容
, @@ -183,33 +191,33 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => align: 'center', ellipsis: true }, - { - title: '操作', - dataIndex: "options", - hideInSearch: true, - width: 120, - align: 'center', - ellipsis: true, - render: (_, record) => { - return
- { - setCurrentRow(record) - setShowAddModal(true) - }}> - 编辑 - - { - handleDeleteLine(record?.NOTICEINFO_ID) - }} - > - 删除 - + // { + // title: '操作', + // dataIndex: "options", + // hideInSearch: true, + // width: 120, + // align: 'center', + // ellipsis: true, + // render: (_, record) => { + // return
+ // { + // setCurrentRow(record) + // setShowAddModal(true) + // }}> + // 编辑 + // + // { + // handleDeleteLine(record?.NOTICEINFO_ID) + // }} + // > + // 删除 + // -
- } - } + //
+ // } + // } ] @@ -285,6 +293,7 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => const data = await handleDeleteNOTICEINFO({ NOTICEINFOId: id }) if (data.Result_Code === 100) { message.success(data.Result_Desc) + handleModalClose() actionRef.current?.reload() } else { message.error(data.Result_Desc) @@ -403,6 +412,22 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => setConfirmLoading(false) }) }} + footer={ { + await handleDeleteLine(currentRow?.NOTICEINFO_ID) + }} + handleCancel={() => { + handleModalClose() + }} + handleOK={() => { + modalRef.current?.validateFields().then(async (res: any) => { + setConfirmLoading(true) + await handleAddHeadlines(res) + setConfirmLoading(false) + }) + }} />} > = (props // 同步图片信息 const handleSynchroImage = async (obj: any) => { + setModalLoading(true) let req: any = {} if (currentRow?.PICTURE_ID) { req = { @@ -172,11 +173,12 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props } const data = await hanleSynchroPICTURE(req) console.log('datadatadatadatadata', data); + setModalLoading(false) if (data.Result_Code === 100) { message.success('同步成功！') - setCurrentRow(null) setShowDetail(false) - + setCurrentRow(null) + setFileList([]) actionRef.current?.reload() } else { message.error(data.Result_Desc) @@ -185,11 +187,13 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props // 删除图片信息 const handleDeleteImg = async (id: any) => { + setModalLoading(true) const req: any = { PICTUREId: id, requestEncryption: true } const data = await hanleDeletePICTURE(req) + setModalLoading(false) if (data.Result_Code === 100) { message.success('同步成功！') setCurrentRow(null) @@ -268,6 +272,7 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props }, PageIndex: 1, PageSize: 999999, + SortStr: "OPERATE_DATE desc", requestEncryption: true } @@ -281,6 +286,7 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props toolbar={{ actions: [ ] @@ -328,6 +334,7 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props }} footer={ { // await handleDeleteShopRule(currentRow?.PICTURE_ID) await handleDeleteImg(currentRow?.PICTURE_ID) @@ -385,9 +392,9 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props formData.append('TableType', "1203"); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { + message.info('图片上传中...') const success = await hanleSaveImgFile(formData) - - console.log('successsuccesssuccess', success); + message.success('图片上传成功!') if (success) { const list = [{ diff --git a/src/pages/travelMember/MallClassificationManage/index.tsx b/src/pages/travelMember/MallClassificationManage/index.tsx index 4cfde17..04bdc98 100644 --- a/src/pages/travelMember/MallClassificationManage/index.tsx +++ b/src/pages/travelMember/MallClassificationManage/index.tsx @@ -157,19 +157,19 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined // }, // initialValue: "1" // }, - { - dataIndex: 'SCANCODE_ORDER', - title: '上架状态', - align: 'center', - width: 120, - ellipsis: true, - valueType: "select", - valueEnum: { - "1": "上架", - "0": "下架" - }, - initialValue: "1" - }, + // { + // dataIndex: 'SCANCODE_ORDER', + // title: '上架状态', + // align: 'center', + // width: 120, + // ellipsis: true, + // valueType: "select", + // valueEnum: { + // "1": "上架", + // "0": "下架" + // }, + // initialValue: "1" + // }, { dataIndex: "PRESALE_TYPE", title: "是否预售", @@ -262,6 +262,8 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined handleModalVisible(false) setFormPRESALE_TYPE(false) setFileList([]) + + handlesyncWeChatGetMallGoodsType({ appId: 'wxee018fb96955552a' }) } } @@ -272,6 +274,8 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined req = { ...currentRow, ...res, + SCANCODE_ORDER: 1, + USERDEFINEDTYPE_STATE: 1, GOODSTYPE: 4000, USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", @@ -285,6 +289,8 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined req = { ...res, GOODSTYPE: 4000, + SCANCODE_ORDER: 1, + USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "", @@ -335,7 +341,8 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined OWNERUNIT_ID: currentUser?.OwnerUnitId, PROVINCE_CODE: "", GOODSTYPE: 4000, - USERDEFINEDTYPE_STATE: params?.SCANCODE_ORDER, + // USERDEFINEDTYPE_STATE: params?.SCANCODE_ORDER, + USERDEFINEDTYPE_STATE: 1, SearchKey: params?.searchText || "" } const data = await handlGetUSERDEFINEDTYPEList(req); @@ -425,8 +432,10 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined setFileList([]) }} footer={ { + handleConfirmLoading(true) handelDelete(currentRow.USERDEFINEDTYPE_ID) }} handleCancel={() => { @@ -562,14 +571,14 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined ]} /> - + {/* - - + */} + {/* - + */} { + console.log('parentDetailparentDetailparentDetail', parentDetail); + const req: any = isComponent ? { searchParameter: { OWNERUNIT_ID: currentUser?.OwnerUnitId, @@ -295,6 +297,7 @@ const MallEvaluationManage: React.FC<{ currentUser: CurrentUser | undefined, isC ISVALID: 1, CREATE_DATE_Start: params?.CREATE_DATE_Start || "", CREATE_DATE_End: params?.CREATE_DATE_End || "", + MEMBERSHIP_ID: parentDetail?.MEMBERSHIP_ID || "", }, PageIndex: 1, PageSize: 999999, diff --git a/src/pages/travelMember/MemberAddress/components/addressDetail.tsx b/src/pages/travelMember/MemberAddress/components/addressDetail.tsx index 375e0ad..1033617 100644 --- a/src/pages/travelMember/MemberAddress/components/addressDetail.tsx +++ b/src/pages/travelMember/MemberAddress/components/addressDetail.tsx @@ -380,8 +380,10 @@ const AddressDetail = ({ currentBigRow, currentUser, isComponent }: DetailProps) setCounty("") }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.MEMBERADDRESS_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/MemberTagManage/index.tsx b/src/pages/travelMember/MemberTagManage/index.tsx index dc92525..d616b85 100644 --- a/src/pages/travelMember/MemberTagManage/index.tsx +++ b/src/pages/travelMember/MemberTagManage/index.tsx @@ -354,7 +354,9 @@ const MemberTagManage: React.FC<{ currentUser: CurrentUser | undefined }> = (pro }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.AUTOTYPE_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/MembershipLevelManage/index.tsx b/src/pages/travelMember/MembershipLevelManage/index.tsx index ab72cce..593ee57 100644 --- a/src/pages/travelMember/MembershipLevelManage/index.tsx +++ b/src/pages/travelMember/MembershipLevelManage/index.tsx @@ -358,8 +358,10 @@ const MembershipLevelManage: React.FC<{ currentUser: CurrentUser | undefined }> footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} + confirmLoading={confirmLoading} handleCancel={() => { handleConfirmLoading(false) handleModalVisible(false) diff --git a/src/pages/travelMember/MerchantEvaluationManage/index.tsx b/src/pages/travelMember/MerchantEvaluationManage/index.tsx index e929005..94a218a 100644 --- a/src/pages/travelMember/MerchantEvaluationManage/index.tsx +++ b/src/pages/travelMember/MerchantEvaluationManage/index.tsx @@ -285,7 +285,7 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent expandRowByClick: true }} options={false} - scroll={{ x: "100%", y: isComponent ? '300px' : "calc(100vh - 410px)" }} + scroll={{ x: "100%", y: isComponent ? come === 'MerchantSalesRanking' ? 'calc(100vh )' : '300px' : "calc(100vh - 410px)" }} headerTitle={isComponent ? '' : } // 列表表头 search={isComponent ? false : { span: 8 }} request={async (params) => { diff --git a/src/pages/travelMember/MerchantSalesRanking/index.tsx b/src/pages/travelMember/MerchantSalesRanking/index.tsx index dcf6d5f..449a57b 100644 --- a/src/pages/travelMember/MerchantSalesRanking/index.tsx +++ b/src/pages/travelMember/MerchantSalesRanking/index.tsx @@ -111,6 +111,7 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> = align: 'right', width: 120, hideInSearch: true, + valueType: 'digit', sorter: true }, { @@ -121,6 +122,7 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> = hideInSearch: true, sorter: true, defaultSortOrder: 'descend', + valueType: 'digit', }, { dataIndex: 'PERCAPITA', @@ -128,7 +130,8 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> = align: 'right', width: 120, hideInSearch: true, - sorter: true + sorter: true, + valueType: 'digit', } ] diff --git a/src/pages/travelMember/OperationTypeConfig/index.tsx b/src/pages/travelMember/OperationTypeConfig/index.tsx index 74d5320..7c08c8a 100644 --- a/src/pages/travelMember/OperationTypeConfig/index.tsx +++ b/src/pages/travelMember/OperationTypeConfig/index.tsx @@ -392,6 +392,7 @@ const OperationTypeConfig: React.FC<{ currentUser: CurrentUser | undefined }> = footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} handleCancel={() => { @@ -406,7 +407,7 @@ const OperationTypeConfig: React.FC<{ currentUser: CurrentUser | undefined }> = formRef?.current?.submit() }) }} - + confirmLoading={confirmLoading} />} onCancel={() => { handleConfirmLoading(false) diff --git a/src/pages/travelMember/OrderCategoryManage/index.tsx b/src/pages/travelMember/OrderCategoryManage/index.tsx index d9decb9..36bcf13 100644 --- a/src/pages/travelMember/OrderCategoryManage/index.tsx +++ b/src/pages/travelMember/OrderCategoryManage/index.tsx @@ -131,19 +131,19 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = ellipsis: true, hideInSearch: true, }, - { - dataIndex: 'USERDEFINEDTYPE_STATE', - title: '有效状态', - align: 'center', - width: 120, - ellipsis: true, - valueType: "select", - valueEnum: { - "1": "有效", - "0": "无效" - }, - initialValue: "1" - }, + // { + // dataIndex: 'USERDEFINEDTYPE_STATE', + // title: '有效状态', + // align: 'center', + // width: 120, + // ellipsis: true, + // valueType: "select", + // valueEnum: { + // "1": "有效", + // "0": "无效" + // }, + // initialValue: "1" + // }, { dataIndex: 'SCANCODE_ORDER', title: '上架状态', @@ -261,6 +261,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = ...currentRow, ...res, GOODSTYPE: 3000, + USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "", @@ -273,6 +274,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = req = { ...res, GOODSTYPE: 3000, + USERDEFINEDTYPE_STATE: 1, USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "", PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "", @@ -299,6 +301,20 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = } } + const markDisabled = (nodes: any, disabledIds: any) => { + return nodes.map((node: any) => { + const copy = { ...node }; + + if (disabledIds.includes(copy.USERDEFINEDTYPE_ID)) { + copy.disabled = true; + } + + if (copy.children && Array.isArray(copy.children)) { + copy.children = markDisabled(copy.children, disabledIds); + } + return copy; + }); + }; return ( = OWNERUNIT_ID: currentUser?.OwnerUnitId, PROVINCE_CODE: "", GOODSTYPE: 3000, - USERDEFINEDTYPE_STATE: params?.USERDEFINEDTYPE_STATE + // USERDEFINEDTYPE_STATE: params?.USERDEFINEDTYPE_STATE + USERDEFINEDTYPE_STATE: 1 // SearchKey: "" } const data = await handlGetUSERDEFINEDTYPEList(req); @@ -410,8 +427,10 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.USERDEFINEDTYPE_ID) }} handleCancel={() => { @@ -487,7 +506,8 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = request={async () => { if (typeTreeData && typeTreeData.length > 0) { let list: any = [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }, ...typeTreeData] - return list + let res = markDisabled(list, currentRow?.USERDEFINEDTYPE_ID ? [currentRow.USERDEFINEDTYPE_ID] : []) + return res } else { const req = { OWNERUNIT_ID: currentUser?.OwnerUnitId, @@ -499,7 +519,9 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = if (data.List && data.List.length > 0) { data.List.unshirft({ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }) setTypeTreeData(data.List) - return data.List + let res = markDisabled(data.List, currentRow?.USERDEFINEDTYPE_ID ? [currentRow.USERDEFINEDTYPE_ID] : []) + + return res } else { return [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }] } @@ -554,7 +576,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = options={[{ label: "上架", value: 1 }, { label: "下架", value: 0 }]} /> - + {/* = } ]} /> - + */} = ( preserve={false} request={async () => { if (currentRow) { - if (currentRow?.ImageInfo && currentRow?.ImageInfo.length > 0) { + if (currentRow?.ImageInfo) { let list: any = [] - currentRow?.ImageInfo.forEach((item: any) => { - let obj = JSON.parse(JSON.stringify(item)) - obj.url = obj.ImageUrl - obj.name = obj.ImageName - obj.uid = item.ImageId - obj.status = 'done' - list.push(obj) - }) + // currentRow?.ImageInfo.forEach((item: any) => { + let obj = JSON.parse(JSON.stringify(currentRow?.ImageInfo)) + obj.url = obj.ImageUrl + obj.name = obj.ImageName + obj.uid = obj.ImageId + obj.status = 'done' + list.push(obj) + // }) + console.log('listlistlist', list); + setFileList(list) } diff --git a/src/pages/travelMember/PointsRecordSearch/index.tsx b/src/pages/travelMember/PointsRecordSearch/index.tsx index ac9791e..2d0a853 100644 --- a/src/pages/travelMember/PointsRecordSearch/index.tsx +++ b/src/pages/travelMember/PointsRecordSearch/index.tsx @@ -143,7 +143,7 @@ const PointsRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?: Boo AUTOTYPE_TYPEID: '2000', AUTOTYPE_PID: "", OWNERUNIT_ID: currentUser?.OwnerUnitId, - AUTOTYPE_VALID: "", + AUTOTYPE_VALID: 1, SearchKey: "" } const data = await handeGetNestingAUTOTYPEList(req); @@ -335,7 +335,7 @@ const PointsRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?: Boo SearchParameter: { OWNERUNIT_ID: 911, MEMBERSHIP_IDS: parentDetail?.MEMBERSHIP_ID, - MEMBERSHIP_TARGETS: 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() : "" }, PageIndex: params?.current, PageSize: 20, @@ -349,7 +349,7 @@ const PointsRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?: Boo OWNERUNIT_ID: 911, POINT_TYPE: params?.POINT_TYPE === '0' ? '' : params?.POINT_TYPE, POINT_SOURCE: params?.POINT_SOURCE === '0' ? '' : params?.POINT_SOURCE, - MEMBERSHIP_TARGETS: 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() : "" }, PageIndex: params?.current, PageSize: 20, diff --git a/src/pages/travelMember/PointsRuleConfig/PointConfig.tsx b/src/pages/travelMember/PointsRuleConfig/PointConfig.tsx index 11a0598..d1ee3c6 100644 --- a/src/pages/travelMember/PointsRuleConfig/PointConfig.tsx +++ b/src/pages/travelMember/PointsRuleConfig/PointConfig.tsx @@ -386,8 +386,10 @@ const PointConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (props) setCurrentRow(undefined); }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.FIELDENUM_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/PointsRuleConfig/index.tsx b/src/pages/travelMember/PointsRuleConfig/index.tsx index 13a910d..1299a91 100644 --- a/src/pages/travelMember/PointsRuleConfig/index.tsx +++ b/src/pages/travelMember/PointsRuleConfig/index.tsx @@ -590,8 +590,10 @@ const PointsRuleConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr handleModalVisible(false) }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.SCORESETTING_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/ProductWarningRuleSetting/index.tsx b/src/pages/travelMember/ProductWarningRuleSetting/index.tsx index 281deaf..36539f5 100644 --- a/src/pages/travelMember/ProductWarningRuleSetting/index.tsx +++ b/src/pages/travelMember/ProductWarningRuleSetting/index.tsx @@ -288,8 +288,10 @@ const ProductWarningRuleSetting: React.FC<{ currentUser: CurrentUser }> = (props setCurrentRow(undefined); }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.COMMODITYWARNING_ID) }} handleCancel={() => { diff --git a/src/pages/travelMember/SharedRestStationManagement/components/SharedRestStationDetail.tsx b/src/pages/travelMember/SharedRestStationManagement/components/SharedRestStationDetail.tsx index 1b05b7a..7c394bb 100644 --- a/src/pages/travelMember/SharedRestStationManagement/components/SharedRestStationDetail.tsx +++ b/src/pages/travelMember/SharedRestStationManagement/components/SharedRestStationDetail.tsx @@ -10,10 +10,11 @@ import { handleGetServerpartInfo } from "@/pages/newDataAnalysis/service"; import { compressImage } from "@/utils/imageCompress"; import { ExclamationCircleOutlined } from "@ant-design/icons"; import { deleteAHYDPicture, uploadAHYDPicture } from "@/services/picture"; -import { handleGetRESTSTATIONBILLList, handleGetSynchroRESTSTATION } from "../service"; +import { handleDeleteRESTSTATION, handleGetRESTSTATIONBILLList, handleGetSynchroRESTSTATION } from "../service"; import moment from 'moment' import ProTable, { ActionType } from "@ant-design/pro-table"; import SharedRestStationOrderDetail from "./SharedRestStationOrderDetail"; +import ModalFooter from "../../scenicSpotConfig/component/modalFooter"; type DetailProps = { parentRow: any; // 当前行数据 @@ -211,6 +212,7 @@ const SharedRestStationDetail = ({ parentRow, setParentRow, onShow, setOnShow, r req = { ...parentRow, ...obj, + RESTSTATION_STATE: 1, STAFF_ID: currentUser.ID, STAFF_NAME: currentUser.Name, OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), @@ -218,6 +220,7 @@ const SharedRestStationDetail = ({ parentRow, setParentRow, onShow, setOnShow, r } else { req = { ...obj, + RESTSTATION_STATE: 1, PROVINCE_CODE: "530000", SERVERPART_NAME: serverpartObj[obj.SERVERPART_ID], STAFF_ID: currentUser.ID, @@ -261,6 +264,26 @@ const SharedRestStationDetail = ({ parentRow, setParentRow, onShow, setOnShow, r } } + // 删除共享休息站 + const handleGetDeleteActivity = async (id: any) => { + const req: any = { + RESTSTATIONId: id + } + const data = await handleDeleteRESTSTATION(req) + if (data.Result_Code === 100) { + message.success(data.Result_Desc) + handleConfirmLoading(false) + setOnShow(false) + setParentRow(undefined); + setREGIONList([]) + setFileList([]) + actionRef.current?.reload() + } else { + message.error(data.Result_Desc) + } + } + + return (
- - -
+ }} + + /> + + // readonly ? '' : + //
+ // + // + //
} modalRender={(modal) => { return - + {/* - + */} = (pro dataIndex: "RESTSTATION_NAME", ellipsis: true, hideInSearch: true, + render: (_, record) => { + return record?.RESTSTATION_NAME ? { + let imgList: any = [] + if (record?.ImageList && record?.ImageList.length > 0) { + record?.ImageList.forEach((item: any) => { + let obj = JSON.parse(JSON.stringify(item)) + obj.url = obj.ImageUrl + obj.name = obj.ImageName + obj.uid = item.ImageId + obj.status = 'done' + imgList.push(obj) + }) + } + setCurrentRow({ + ...record, + ACTIVITY_IMG: imgList + }) + setFileList(imgList); + handleModalVisible(true) + }}>{record?.RESTSTATION_NAME} : "" + } }, { title:
服务区名称
, @@ -82,56 +103,56 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro 2: { text: '使用中', status: 'error' }, } }, - { - title:
有效状态
, - width: 120, - dataIndex: "LOCK_STATUS", - ellipsis: true, - hideInSearch: true, - align: 'center', - valueType: "select", - fieldProps: { - options: [{ label: "有效", value: 1 }, { label: "无效", value: 0 }] - } - }, - { - title: "操作", - dataIndex: "option", - width: 120, - align: 'center', - hideInSearch: true, - render: (_, record) => { - return - { - let imgList: any = [] - if (record?.ImageList && record?.ImageList.length > 0) { - record?.ImageList.forEach((item: any) => { - let obj = JSON.parse(JSON.stringify(item)) - obj.url = obj.ImageUrl - obj.name = obj.ImageName - obj.uid = item.ImageId - obj.status = 'done' - imgList.push(obj) - }) - } - setCurrentRow({ - ...record, - ACTIVITY_IMG: imgList - }) - setFileList(imgList); - handleModalVisible(true) - }}>编辑 - { - await handleGetDeleteActivity(record.RESTSTATION_ID) - }} - > - 删除 - - - } - } + // { + // title:
有效状态
, + // width: 120, + // dataIndex: "RESTSTATION_STATE", + // ellipsis: true, + // hideInSearch: true, + // align: 'center', + // valueType: "select", + // fieldProps: { + // options: [{ label: "有效", value: 1 }, { label: "无效", value: 0 }] + // } + // }, + // { + // title: "操作", + // dataIndex: "option", + // width: 120, + // align: 'center', + // hideInSearch: true, + // render: (_, record) => { + // return + // { + // let imgList: any = [] + // if (record?.ImageList && record?.ImageList.length > 0) { + // record?.ImageList.forEach((item: any) => { + // let obj = JSON.parse(JSON.stringify(item)) + // obj.url = obj.ImageUrl + // obj.name = obj.ImageName + // obj.uid = item.ImageId + // obj.status = 'done' + // imgList.push(obj) + // }) + // } + // setCurrentRow({ + // ...record, + // ACTIVITY_IMG: imgList + // }) + // setFileList(imgList); + // handleModalVisible(true) + // }}>编辑 + // { + // await handleGetDeleteActivity(record.RESTSTATION_ID) + // }} + // > + // 删除 + // + // + // } + // } ] // 删除共享休息站 diff --git a/src/pages/travelMember/SummaryOfReservation/index.tsx b/src/pages/travelMember/SummaryOfReservation/index.tsx index 1427b0b..701390b 100644 --- a/src/pages/travelMember/SummaryOfReservation/index.tsx +++ b/src/pages/travelMember/SummaryOfReservation/index.tsx @@ -663,10 +663,10 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> = OWNERUNIT_ID: currentUser?.OwnerUnitId, ORDER_DATE_Start: searchParams?.StartDate || "", ORDER_DATE_End: searchParams?.EndDate || "", - SALEBILL_STATES: selectTab == 1 ? '1010,2000,3000,8000' : - selectTab == 2 ? '1010,2000,3000,8000,8900' : - selectTab == 3 ? '1010,2000,3000,8000,8900' : - selectTab == 4 ? '1010,2000,3000,8000,8900' : + SALEBILL_STATES: selectTab == 1 ? '1010,2010,3000,8000' : + selectTab == 2 ? '1010,2010,3000,8000,8900' : + selectTab == 3 ? '1010,2010,3000,8000,8900' : + selectTab == 4 ? '1010,2010,3000,8000,8900' : selectTab == 5 ? '9000,9999' : selectTab == 6 ? '8900' : selectTab == 7 ? '8900' : diff --git a/src/pages/travelMember/SupplierClassification/index.tsx b/src/pages/travelMember/SupplierClassification/index.tsx index 34cb094..916077a 100644 --- a/src/pages/travelMember/SupplierClassification/index.tsx +++ b/src/pages/travelMember/SupplierClassification/index.tsx @@ -114,25 +114,25 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> ellipsis: true, hideInSearch: true, }, - { - dataIndex: 'AUTOTYPE_VALID', - title: '有效状态', - align: 'center', - width: 120, - ellipsis: true, - valueType: "select", - // valueEnum: { - // "1": "有效", - // "0": "无效" - // }, - fieldProps: { - options: [ - { label: '有效', value: "1" }, - { label: '无效', value: "0" } - ] - }, - initialValue: "1" - }, + // { + // dataIndex: 'AUTOTYPE_VALID', + // title: '有效状态', + // align: 'center', + // width: 120, + // ellipsis: true, + // valueType: "select", + // // valueEnum: { + // // "1": "有效", + // // "0": "无效" + // // }, + // fieldProps: { + // options: [ + // { label: '有效', value: "1" }, + // { label: '无效', value: "0" } + // ] + // }, + // initialValue: "1" + // }, { dataIndex: 'OWNERUNIT_NAME', title: '业主单位', @@ -225,6 +225,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> // PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", // PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "", // PROVINCE_CODE: currentUser?.ProvinceCode, + AUTOTYPE_VALID: 1, STAFF_ID: currentUser?.ID, STAFF_NAME: currentUser?.Name, OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), @@ -235,6 +236,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> AUTOTYPE_TYPEID: 4000, // PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "", // PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "", + AUTOTYPE_VALID: 1, PROVINCE_CODE: currentUser?.ProvinceCode, STAFF_ID: currentUser?.ID, STAFF_NAME: currentUser?.Name, @@ -304,7 +306,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> OWNERUNIT_ID: currentUser?.OwnerUnitId, PROVINCE_CODE: "", AUTOTYPE_TYPEID: 4000, - AUTOTYPE_VALID: params?.AUTOTYPE_VALID + AUTOTYPE_VALID: 1 // SearchKey: "" } console.log('reqreq', req); @@ -401,8 +403,10 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> }) }} footer={ { + handleConfirmLoading(true) await handelDelete(currentRow?.AUTOTYPE_ID) }} handleCancel={() => { @@ -543,7 +547,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }> ]} /> - + {/* } ]} /> - + */} width: 150, ellipsis: true, }, - { - dataIndex: 'MERCHANTS_STATE', - title: '有效状态', - align: 'center', - width: 120, - ellipsis: true, - valueType: "select", - fieldProps: { - options: [ - { label: '有效', value: "1" }, - { label: '无效', value: "0" } - ] - }, - initialValue: "1" - }, + // { + // dataIndex: 'MERCHANTS_STATE', + // title: '有效状态', + // align: 'center', + // width: 120, + // ellipsis: true, + // valueType: "select", + // fieldProps: { + // options: [ + // { label: '有效', value: "1" }, + // { label: '无效', value: "0" } + // ] + // }, + // initialValue: "1" + // }, { dataIndex: 'searchText', title: '查询内容', @@ -223,6 +223,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> req = { ...currentRow, ...res, + MERCHANTS_STATE: 1, OWNERUNIT_ID: currentUser?.OwnerUnitId, OWNERUNIT_NAME: currentUser?.OwnerUnitName, PROVINCE_CODE: currentUser?.ProvinceCode, @@ -286,7 +287,8 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> PROVINCE_CODE: currentUser?.ProvinceCode, MERCHANTS_TYPE: params?.MERCHANTS_TYPE === '0' ? '' : params?.MERCHANTS_TYPE, MERCHANTS_AUTOTYPE: selectedId, - MERCHANTS_STATE: params?.MERCHANTS_STATE === '-1' ? '' : params?.MERCHANTS_STATE + // MERCHANTS_STATE: params?.MERCHANTS_STATE === '-1' ? '' : params?.MERCHANTS_STATE + MERCHANTS_STATE: 1 }, keyWord: { key: "MERCHANTS_NAME,MERCHANTS_EN", @@ -294,6 +296,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> }, PageIndex: 1, PageSize: 999999, + sortStr: "OPERATE_DATE desc" } setCurrentSearchText(params?.searchText || "") const data = await handeGetMERCHANTSList(req); @@ -366,8 +369,10 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> handleModalVisible(false) }} footer={ { + handleConfirmLoading(true) handelDelete(currentRow?.MERCHANTS_ID) }} handleCancel={() => { @@ -514,13 +519,13 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> label="手机号码" /> - + {/* - + */} { +const pushTemplate = ({ onRef, parentRow, currentUser }: DetailProps) => { const actionRef = useRef(); const formRef = useRef(); const [collapsible, setCollapsible] = useState(false) @@ -110,6 +111,11 @@ const pushTemplate = ({ parentRow, currentUser }: DetailProps) => { ] useEffect(async () => { + await handleGetLeftTreeData() + }, []) + + // 获取左侧的数据 + const handleGetLeftTreeData = async () => { const req: any = { SearchParameter: { WECHATPUBLICSIGN_ID: parentRow?.WECHATPUBLICSIGN_ID, @@ -131,7 +137,7 @@ const pushTemplate = ({ parentRow, currentUser }: DetailProps) => { } setPushCodeList(list) setPushCodeObj(obj) - }, []) + } // 生成左侧菜单 const getMenuDom = (data: any[], callback: (item: any) => void) => { @@ -214,6 +220,12 @@ const pushTemplate = ({ parentRow, currentUser }: DetailProps) => { actionRef?.current?.reload() } + + useImperativeHandle(onRef, () => ({ + handleGetLeftTreeData + })); + + return (
{ +const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser, handleUpdateLeftData }: DetailProps) => { const actionRef = useRef(); const ModalFormRef = useRef(); const formRef = useRef(); @@ -21,6 +23,8 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail const [updateModal, setUpdateModal] = useState(false) // 当前行数据 const [currentRow, setCurrentRow] = useState() + // 悬浮框的loading效果 + const [modalLoading, setModalLoading] = useState(false) const columns: any = [ { @@ -61,18 +65,18 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail ellipsis: true, hideInSearch: true, }, - { - dataIndex: 'PUSHMODULE_STATE', - title: '模板状态', - width: 100, - align: 'center', - ellipsis: true, - hideInSearch: true, - valueType: 'select', - fieldProps: { - options: [{ label: "有效", value: 1 }, { label: "无效", value: 0 }] - } - }, + // { + // dataIndex: 'PUSHMODULE_STATE', + // title: '模板状态', + // width: 100, + // align: 'center', + // ellipsis: true, + // hideInSearch: true, + // valueType: 'select', + // fieldProps: { + // options: [{ label: "有效", value: 1 }, { label: "无效", value: 0 }] + // } + // }, { dataIndex: 'STAFF_NAME', title: '操作员名称', @@ -105,11 +109,13 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail // 同步推送模板信息 const handleUpdatePushModal = async (res: any) => { let req: any = {} + setModalLoading(true) if (currentRow?.PUSHMODULE_ID) { req = { WECHATPUBLICSIGN_ID: parentRow?.WECHATPUBLICSIGN_ID, ...currentRow, ...res, + PUSHMODULE_STATE: 1, STAFF_ID: currentUser?.ID, STAFF_NAME: currentUser?.Name, OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss') @@ -117,6 +123,7 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail } else { req = { ...res, + PUSHMODULE_STATE: 1, WECHATPUBLICSIGN_ID: parentRow?.WECHATPUBLICSIGN_ID, STAFF_ID: currentUser?.ID, STAFF_NAME: currentUser?.Name, @@ -125,6 +132,7 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail } } const data = await handleSynchroPUSHMODULE(req) + setModalLoading(false) console.log('datadatadatadata', data); if (data.Result_Code === 100) { @@ -132,6 +140,28 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail setCurrentRow(null) setUpdateModal(false) actionRef.current?.reload() + if (handleUpdateLeftData) { + handleUpdateLeftData() + } + } else { + message.error(data.Result_Desc) + } + } + + // 删除推送模板 + const handleDeletePushModal = async (id: any) => { + const req: any = { + PUSHMODULEId: id + } + const data = await handleDeletePUSHMODULE(req) + if (data.Result_Code === 100) { + message.success(data.Result_Desc) + setCurrentRow(null) + setUpdateModal(false) + actionRef.current?.reload() + if (handleUpdateLeftData) { + handleUpdateLeftData() + } } else { message.error(data.Result_Desc) } @@ -173,7 +203,7 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail }, PageIndex: 1, PageSize: 999999, - SortStr: "ADDTIME desc", + SortStr: "PUSHMODULE_INDEX,ADDTIME desc", requestEncryption: true } const data = await handleGetPUSHMODULEList(req) @@ -212,6 +242,23 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail handleUpdatePushModal(res) }) }} + footer={ { + await handleDeletePushModal(currentRow?.PUSHMODULE_ID) + }} + handleCancel={() => { + setCurrentRow(null) + setUpdateModal(false) + }} + handleOK={() => { + ModalFormRef?.current?.validateFields().then(async (res) => { + handleUpdatePushModal(res) + }) + }} + + />} > - + {/* - + */} = (props) => { const { currentUser } = props const actionRef = useRef(); + const PushTemplateRef = useRef(); const formRef = useRef(); const ModalFormRef = useRef(); @@ -54,6 +55,11 @@ const WeChatAccountManagement: React.FC<{ currentUser: CurrentUser }> = (props) } ] + // 更新子集里面的方法 + const handleUpdateLeftData = async () => { + PushTemplateRef.current?.handleGetLeftTreeData() + } + return (
@@ -123,12 +129,12 @@ const WeChatAccountManagement: React.FC<{ currentUser: CurrentUser }> = (props) }}>设置推送模板
} > - + {/* 设置推送模板的悬浮框 */} - +
) diff --git a/src/pages/travelMember/WeChatAccountManagement/service.ts b/src/pages/travelMember/WeChatAccountManagement/service.ts index c6a8697..400d796 100644 --- a/src/pages/travelMember/WeChatAccountManagement/service.ts +++ b/src/pages/travelMember/WeChatAccountManagement/service.ts @@ -48,6 +48,20 @@ export async function handleSynchroPUSHMODULE(params: any) { return data } +// 删除推送模板 +export async function handleDeletePUSHMODULE(params: any) { + const data = await request(`/WeChat/DeletePUSHMODULE`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }) + if (data.Result_Code !== 100) { + return data + } + return data +} + + + // 获取人员推送权限表列表 export async function handleGetRTWECAHTPUSHDTAILList(params: any) { const data = await request(`/WeChat/GetRTWECAHTPUSHDTAILList`, { diff --git a/src/pages/travelMember/memberInfor/index.tsx b/src/pages/travelMember/memberInfor/index.tsx index 3251e61..20fc6e7 100644 --- a/src/pages/travelMember/memberInfor/index.tsx +++ b/src/pages/travelMember/memberInfor/index.tsx @@ -787,7 +787,7 @@ const memberInfor: React.FC<{ currentUser: CurrentUser, searchType?: any, valueT MEMBERSHIP_STATES: 1000, ACTIVE_DATE_Start: come === 'ActiveMemberStatistics' ? comeParams?.start || '' : '', ACTIVE_DATE_End: come === 'ActiveMemberStatistics' ? comeParams?.end || '' : '', - MEMBERSHIP_TARGETS: 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() : "", ExcludeTest: ExcludeTest || '' }, keyWord: { @@ -808,7 +808,7 @@ const memberInfor: React.FC<{ currentUser: CurrentUser, searchType?: any, valueT MEMBERSHIP_TYPES: params?.MEMBERSHIP_TYPE === "1" ? "" : params?.MEMBERSHIP_TYPE, MEMBERSHIP_LEVELS: params?.MEMBERSHIP_LEVEL === "1" ? "" : params?.MEMBERSHIP_LEVEL, MEMBERSHIP_STATES: params?.MEMBERSHIP_STATE, - MEMBERSHIP_TARGETS: 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() : "" // PLATE_NUMBER: params?.MEMBERSHIP_NAME || "" }, keyWord: { diff --git a/src/pages/travelMember/scenicSpotConfig/component/modalFooter.tsx b/src/pages/travelMember/scenicSpotConfig/component/modalFooter.tsx index 25fc71c..52321dd 100644 --- a/src/pages/travelMember/scenicSpotConfig/component/modalFooter.tsx +++ b/src/pages/travelMember/scenicSpotConfig/component/modalFooter.tsx @@ -27,7 +27,7 @@ const ModalFooter = ({ hideDelete, handleDelete, hideCancel, handleCancel, hideO } }} > - + } diff --git a/src/versionEnv.ts b/src/versionEnv.ts index bcbc381..5c2b7b1 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.85"; -export const GIT_HASH = "f1ba03a"; -export const BUILD_TIME = "2025-12-09T06:03:09.173Z"; +export const VERSION = "4.5.88"; +export const GIT_HASH = "5275f79"; +export const BUILD_TIME = "2025-12-11T07:57:34.516Z";