This commit is contained in:
ylj20011123 2026-02-13 15:08:39 +08:00
parent adb62e8ca4
commit ba6805b619
7 changed files with 472 additions and 31 deletions

BIN
dist.zip Normal file

Binary file not shown.

View File

@ -25,6 +25,7 @@ import { render } from 'react-dom';
import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import { handleSetlogSave } from '@/utils/format';
import ModalFooter from '../scenicSpotConfig/component/modalFooter';
import { handleGetACTIVITYList } from '../SharedRestStationManagement/service';
const beforeUpload = (file: any) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
@ -56,6 +57,8 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
// tab选择框 判断是查看 首页大图的内容 还是小图的内容
const tabList: any = [{ label: "首页大图", key: "1" }, { label: "轮播图", key: "2" }]
const [selectTab, setSelectTab] = useState<string>("1")
// 海报类型
const [posterType, setPosterType] = useState<number>(0)
const onDraggaleStart = (event, uiData) => {
const { clientWidth, clientHeight } = window.document.documentElement;
@ -88,6 +91,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
return record?.USERDEFINEDTYPE_NAME ?
<a onClick={() => {
setFileList(record?.USERDEFINEDTYPE_ICO ? [{ url: record?.USERDEFINEDTYPE_ICO }] : [])
setPosterType(record?.BUSINESSTYPE)
setCurrentRow({ ...record });
handleModalVisible(true);
}}>{record?.USERDEFINEDTYPE_NAME}</a> : "-"
@ -237,6 +241,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
handleModalVisible(false)
actionRef.current?.reload()
setFileList([])
setPosterType(0)
} else {
message.error(data.Result_Desc)
}
@ -295,9 +300,10 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
toolbar={{
actions: [
<Button type={'primary'} onClick={() => {
setPosterType(1000)
handleModalVisible(true)
}}>
</Button>
]
}}
@ -336,6 +342,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
toolbar={{
actions: [
<Button type={'primary'} onClick={() => {
setPosterType(1000)
handleModalVisible(true)
}}>
@ -399,6 +406,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
handleConfirmLoading(false)
handleModalVisible(false)
setFileList([])
setPosterType(0)
}}
onOk={async () => { // 提交框内的数据
formRef?.current?.validateFields().then(() => {
@ -447,7 +455,8 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
preserve={false}
initialValues={currentRow ? {
...currentRow,
PRESALE_TIME: [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME,]
PRESALE_TIME: [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME],
SERVERPARTSHOP_ID: currentRow?.SERVERPARTSHOP_ID ? Number(currentRow?.SERVERPARTSHOP_ID) : ""
} : {
USERDEFINEDTYPE_NAME: selectTab === "1" ? "小程序海报" : "小程序轮播图",
USERDEFINEDTYPE_STATE: 1
@ -495,34 +504,73 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
{ label: "每周特惠", value: 1000 },
{ label: "营销活动", value: 2000 },
]}
fieldProps={{
onChange: (e: any) => {
setPosterType(e)
}
}}
initialValue={1000}
/>
</Col>
{/* 这个字段暂时用来 判断跳转小程序分类页面的 哪个分类 */}
<Col span={12}>
<ProFormTreeSelect
label={'跳转路径'}
name={'SERVERPARTSHOP_ID'}
request={async () => {
const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "",
GOODSTYPE: 4000,
USERDEFINEDTYPE_STATE: 1,
SCANCODE_ORDER: 1
}
const data = await handlGetUSERDEFINEDTYPEList(req);
return data
}}
fieldProps={{
fieldNames: {
label: "USERDEFINEDTYPE_NAME",
value: "USERDEFINEDTYPE_ID"
},
showSearch: true,
treeDefaultExpandAll: true,
}}
/>
{
posterType === 1000 ?
<ProFormTreeSelect
label={'跳转路径'}
name={'SERVERPARTSHOP_ID'}
request={async () => {
const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "",
GOODSTYPE: 4000,
USERDEFINEDTYPE_STATE: 1,
SCANCODE_ORDER: 1
}
const data = await handlGetUSERDEFINEDTYPEList(req);
return data
}}
fieldProps={{
fieldNames: {
label: "USERDEFINEDTYPE_NAME",
value: "USERDEFINEDTYPE_ID"
},
showSearch: true,
treeDefaultExpandAll: true,
}}
/> : posterType === 2000 ?
<ProFormSelect
label={'跳转路径'}
name={'SERVERPARTSHOP_ID'}
request={async () => {
const req: any = {
SearchParameter: {
PROVINCE_CODE: "530000",
ACTIVITY_STATES: '1,2'
},
PageIndex: 1,
PageSize: 999999,
}
const data = await handleGetACTIVITYList(req)
console.log('datadatadata', data);
let list = data.List
if (list && list.length > 0) {
return list
}
return []
}}
fieldProps={{
fieldNames: {
label: "ACTIVITY_NAME",
value: "ACTIVITY_ID"
},
showSearch: true,
}}
/>
: ""
}
</Col>
<Col span={24}>
<ProFormUploadButton

View File

@ -4,20 +4,25 @@ import type { ConnectState } from "@/models/connect";
import type { CurrentUser } from "umi";
import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table";
import { Tag, message, Modal, Space } from "antd";
import { handleGetMEMBERSHIPList, handeGetSynchroMEMBERSHIP } from "../service";
import { handleGetMEMBERSHIPList, handeGetSynchroMEMBERSHIP, handleGetServerpartTree } from "../service";
import session from "@/utils/session";
import PageTitleBox from "@/components/PageTitleBox";
import type { FormInstance } from "antd";
import ProForm, { ProFormSelect, ProFormTreeSelect } from '@ant-design/pro-form';
const OwnWaterManager: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, searchReq?: any }> = (props) => {
const { currentUser } = props;
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const modalFormRef = useRef<FormInstance>();
const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
const [selectedRows, setSelectedRows] = useState<any[]>([]);
const [stationModalVisible, setStationModalVisible] = useState<boolean>(false);
const [currentRow, setCurrentRow] = useState<any>(null);
const MEMBERSHIPLEVELYNObj = session.get('MEMBERSHIPLEVELYNObj') || {};
const [treeData, setTreeData] = useState<any[]>([]);
// 表单加载效果
const [confirmLoading, setConfirmLoading] = useState<boolean>(false);
// 辅助函数:处理标签字符串 (Logic B)
const updateTargetTags = (currentTags: string | undefined, targetTag: string, action: 'add' | 'remove') => {
let tagList = (currentTags || '').split(',').filter(Boolean);
@ -138,8 +143,69 @@ const OwnWaterManager: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
);
},
},
{
title: '操作',
dataIndex: 'option',
valueType: 'option',
width: 120,
align: 'center',
render: (_, record) => {
const isAuth = record.MEMBERSHIP_TARGET === '2803' || record.MEMBERSHIP_TARGET?.toString().includes('2803');
if (!isAuth) return null;
return (
<Space>
<a
onClick={() => {
console.log('recordrecord', record);
setCurrentRow(record);
setStationModalVisible(true);
}}
>
</a>
</Space>
);
},
},
];
// 拿到站点信息
const handleGetStationList = async (stationType: any) => {
const params = {
ProvinceCode: '530000',
ShowWholePower: true,
ShowRoyalty: false,
ShowCompactCount: false,
StatisticsType: '1000',
ServerpartType: stationType || '1010',
};
const res = await handleGetServerpartTree(params);
console.log('dasdasdas', res);
setTreeData(res);
return res;
}
// 更新用户权限
const handleUpdateStationList = async (res: any) => {
let req: any = {
...currentRow,
SERVERPART_AUTHORITY: res.stationIds && res.stationIds.length > 0 ? res.stationIds.toString() : "#"
}
setConfirmLoading(true);
const data = await handeGetSynchroMEMBERSHIP(req);
console.log('dashdlasjdaslk', data);
setConfirmLoading(false);
if (data.Result_Code = 100) {
message.success(data.Result_Desc)
setStationModalVisible(false);
actionRef.current?.reload();
} else {
message.error(data.Result_Desc)
}
}
return (
<div style={{ background: '#fff', padding: '16px' }}>
<ProTable
@ -197,6 +263,91 @@ const OwnWaterManager: React.FC<{ currentUser: CurrentUser, isComponent?: boolea
</Space>
)}
/>
<Modal
title={`${currentRow?.MEMBERSHIP_NAME}站点权限`}
width={"800px"}
open={stationModalVisible}
destroyOnClose
confirmLoading={confirmLoading}
onOk={async () => {
modalFormRef.current?.validateFields().then((res) => {
console.log('dsakdasldjaslkdjaslkdj', res);
modalFormRef.current?.submit()
})
}}
onCancel={() => {
setCurrentRow(undefined);
setStationModalVisible(false);
}}
>
<ProForm
formRef={modalFormRef}
submitter={false}
request={async () => {
await handleGetStationList(1010)
if (currentRow) {
let res: any = {}
if (currentRow?.SERVERPART_AUTHORITY) {
res = {
...res,
stationIds: currentRow?.SERVERPART_AUTHORITY.split(',').map((item: any) => Number(item))
}
}
return res;
}
return {};
}}
onFinish={async (value) => {
await handleUpdateStationList(value)
}}
>
<ProFormSelect
name="stationType"
label="选择范围"
options={[
{ label: '全部', value: '1010,1000' },
{ label: '片区', value: '1010' },
{ label: '服务区', value: '1000' },
]}
fieldProps={{
onChange: async (e: any) => {
setTreeData([]);
await handleGetStationList(e)
modalFormRef.current?.setFieldsValue({
stationIds: []
})
}
}}
initialValue={'1010'}
/>
{
treeData && treeData.length > 0 ?
<ProFormTreeSelect
name="stationIds"
label="站名列表"
rules={[{
required: true, message: "请选择站点!"
}]}
placeholder="请选择站点"
fieldProps={{
options: treeData,
allowClear: true,
multiple: true,
treeDefaultExpandAll: true,
showSearch: true,
fieldNames: {
key: "value",
title: 'label',
}
}}
/> : ""
}
</ProForm>
</Modal>
</div>
)
}

View File

@ -19,15 +19,15 @@ export async function handleGetACTIVITYList(params?: any) {
// 同步活动
export async function handleGetSynchroACTIVITY(params?: any) {
console.log('231231');
const data = await requestEncryption(`/Member/SynchroACTIVITY`, {
method: 'POST',
data: { ...params, requestEncryption: true }
});
if (data.Result_Code !== 100) {
return {
List: []
}
return data
}
return data;
}

View File

@ -1,6 +1,7 @@
import request from '@/utils/request';
import { wrapTreeNode } from '@/utils/format';
import requestEncryption from '@/utils/requestEncryption';
import requestSamanage from '@/utils/requestSamanage';
@ -16,6 +17,18 @@ export async function handleGetMEMBERSHIPList(params: any) {
return data.Result_Data
}
// 获取站点树形数据
export async function handleGetServerpartTree(params: any) {
const data = await requestSamanage(`/BaseInfo/GetServerpartTree`, {
method: 'GET',
params: params,
})
if (data.Result_Code !== 100) {
return []
}
return data.Result_Data.List
}
// 消费记录列表
export async function handleGetCONSUMPTIONRECORDList(params: any) {

View File

@ -67,9 +67,15 @@ requestEncryption.interceptors.request.use((url, opt: any) => {
const options = { ...opt }
const currentUser: CurrentUser = session.get('currentUser');
console.log('currentUsercurrentUsercurrentUser', currentUser);
console.log('optionsoptionsoptions', options);
console.log('urlurlurlurl', url);
if (currentUser) {
if (options.headers) {
if (url.indexOf('SynchroSERVERPART') > -1) {
console.log('1');
options.headers = {
...options.headers,
PROVINCE_CODE: opt?.data?.PROVINCE_CODE,
@ -82,6 +88,7 @@ requestEncryption.interceptors.request.use((url, opt: any) => {
}
} else {
console.log('2');
options.headers = {
...options.headers,
token: currentUser.UserToken || '',
@ -94,6 +101,7 @@ requestEncryption.interceptors.request.use((url, opt: any) => {
}
if (url.indexOf('SynchroSERVERPART') > -1) {
console.log('3');
options.data = {
...options.data,
STAFF_ID: currentUser.ID,
@ -104,6 +112,7 @@ requestEncryption.interceptors.request.use((url, opt: any) => {
} else {
if ((url.indexOf('Synchro') > -1 || url.indexOf('Save') > -1) &&
url.indexOf('Picture/SaveImgFile') === -1 && !requestEncryption) {
console.log('4');
options.data = {
...options.data,
STAFF_ID: currentUser.ID,

View File

@ -0,0 +1,220 @@
/** Request 网络请求工具 更详细的 api 文档: https://github.com/umijs/umi-request */
import { extend } from 'umi-request';
import { notification } from 'antd';
import Cookies from 'js-cookie';
import moment from 'moment';
import session from './session';
import type { CurrentUser } from '@/models/user';
import { SynchroBEHAVIORRECORD } from '@/services/user';
import { encryptAES } from './handleAes';
const codeMessage: Record<number, string> = {
200: '服务器成功返回请求的数据。',
201: '新建或修改数据成功。',
202: '一个请求已经进入后台排队(异步任务)。',
204: '删除数据成功。',
400: '发出的请求有错误,服务器没有进行新建或修改数据的操作。',
401: '用户没有权限(令牌、用户名、密码错误)。',
403: '用户得到授权,但是访问是被禁止的。',
404: '发出的请求针对的是不存在的记录,服务器没有进行操作。',
406: '请求的格式不可得。',
410: '请求的资源被永久删除,且不会再得到的。',
422: '当创建一个对象时,发生一个验证错误。',
500: '服务器发生错误,请检查服务器。',
502: '网关错误。',
503: '服务不可用,服务器暂时过载或维护。',
504: '网关超时。',
};
/**
* @zh-CN
* @en-US Exception handler
*/
const errorHandler = (error: { response: Response }): Response => {
const { response } = error;
if (response && response.status) {
const errorText = codeMessage[response.status] || response.statusText;
const { status, url } = response;
notification.error({
message: `请求错误 ${status}: ${url}`,
description: errorText,
});
} else if (!response) {
notification.error({
description: '您的网络异常,无法连接到服务器.',
message: '网络异常',
});
}
return response;
};
/**
* @en-US Configure the default parameters for request
* @zh-CN request请求时的默认参数
*/
const request = extend({
errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发
prefix: 'https://samember.yciccloud.com:8999/EShangApiMain', // 正式
headers: {
token: '',
ProvinceCode: '',
ServerpartCodes: '',
// tmp: (new Date()).getTime()
}
// credentials: 'include', // Does the default request bring cookies
});
// 存一下进来调用的值
// let userbeHaviObj: any = {}
// request拦截器, 改变url 或 options.
request.interceptors.request.use((url, opt: any) => {
const options = { ...opt }
const currentUser: CurrentUser = session.get('currentUser');
// let userbeHaviObj = {
// url: url,
// options: options,
// currentUser: currentUser,
// startTime: new Date().getTime()
// }
// options.userbeHaviObj = userbeHaviObj
if (currentUser) {
if (options.headers) {
if (url.indexOf('SynchroSERVERPART') > -1) {
options.headers = {
...options.headers,
PROVINCE_CODE: opt?.data?.PROVINCE_CODE,
ProvinceCode: opt?.data?.PROVINCE_CODE,
provincecode: opt?.data?.PROVINCE_CODE,
token: currentUser.UserToken || '',
ServerpartCodes: currentUser.CityAuthority || '',
ServerpartShopIds: currentUser.ServerpartShopIds || '',
UserPattern: currentUser?.UserPattern || '',
}
} else {
options.headers = {
...options.headers,
token: currentUser.UserToken || '',
ProvinceCode: opt?.data?.noProvinceCode ? '' : (currentUser.ProvinceCode || ''),
ServerpartCodes: currentUser.CityAuthority || '',
ServerpartShopIds: currentUser.ServerpartShopIds || '',
UserPattern: currentUser?.UserPattern || '',
}
}
}
if (url.indexOf('SynchroSERVERPART') > -1) {
options.data = {
...options.data,
STAFF_ID: currentUser.ID,
STAFF_NAME: currentUser.Name,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
PROVINCE_CODE: opt?.data?.PROVINCE_CODE,
}
} else {
if ((url.indexOf('Synchro') > -1 || url.indexOf('Save') > -1) &&
url.indexOf('Picture/SaveImgFile') === -1) {
// 添加操作人和业主单位信息
options.data = {
...options.data,
STAFF_ID: currentUser.ID,
STAFF_NAME: currentUser.Name,
OWNERUNIT_ID: options.data.OWNERUNIT_ID || currentUser.OwnerUnitId,
OWNERUNIT_NAME: options.data.OWNERUNIT_NAME || currentUser.ProvinceUnit,
PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode),
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss')
}
if (currentUser?.UserPattern === 2000) {
options.data = {
...options.data,
PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode),
BUSINESSMAN_ID: currentUser.BusinessManID,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss')
}
}
}
}
if (options && options.data && options.data.requestEncryption) {
options.data = {
name: "",
value: encryptAES(JSON.stringify(options.data))
}
}
}
return {
// url: url.indexOf('handler_ajax.ashx')>-1 ?`https://user.eshangtech.com${url}`: `http://47.96.233.105/EShangApiMain${url}`,
url,// .indexOf('handler_ajax.ashx')>-1 ?`${url}`: `/EShangApiMain${url}`,
options,
}
})
request.interceptors.response.use((response, option) => {
const nowTmp = moment()
Cookies.set('tmp', nowTmp.format())
// // 加个数组 如果请求地址是数组里面的 那就不调用 记录用户行为了
// let specialList = ['/FrameWork/GetFieldEnumByField', "/FrameWork/GetUserModuleList", "/FrameWork/GetFieldEnumTree", '/Logging/GetPassportInfoByToken', '/Logging/UserLogin', 'Dictionary/GetFieEnumList', '/Platform/SynchroBehaviorrecord']
// // 判断一下 现在的这次请求 是不是特殊 不需要进行记录的
// let isOk: boolean = true
// let userbeHaviObj = option?.userbeHaviObj || {}
// specialList.forEach((item: any) => {
// if (userbeHaviObj.url.indexOf(item) !== -1) {
// isOk = false
// }
// })
// if (isOk) {
// let nowMenu = session.get("currentMenu")
// let endTime = new Date().getTime()
// let basicInfo = session.get("basicInfo")
// let systemBasin = session.get("systemBasin")
// let browserVersion = session.get("browserVersion")
// const req: any = {
// USER_ID: userbeHaviObj.currentUser.ID,
// USER_NAME: userbeHaviObj.currentUser.Name,
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://pos.eshangtech.com')[1]}`,
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_ROUT: nowMenu.pathname,
// BEHAVIORRECORD_ROUTNAME: nowMenu.name,
// BEHAVIORRECORD_LEAVETIME: moment(new Date(endTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_DURATION: (endTime - userbeHaviObj.startTime) / 1000,
// OWNERUNIT_ID: userbeHaviObj.currentUser.OwnerUnitId,
// OWNERUNIT_NAME: userbeHaviObj.currentUser.OwnerUnitName,
// BUSINESSMAN_ID: userbeHaviObj.currentUser.BusinessManID,
// BUSINESSMAN_NAME: userbeHaviObj.currentUser.BusinessManName,
// SOURCE_PLATFORM: '驿商云平台',
// BEHAVIORRECORD_DESC: JSON.stringify(userbeHaviObj.options.params) === '{}' ? userbeHaviObj.url.split('?')[1] : JSON.stringify(userbeHaviObj.options.params), // 入参
// USER_LOGINIP: basicInfo.ip,
// USER_LOGINPLACE: `${basicInfo.country}${basicInfo.prov}${basicInfo.city}${basicInfo.district}`,
// BROWSER_VERSION: browserVersion,
// OPERATING_SYSTEM: systemBasin
// }
// console.log('reqreqreqreqreq', req);
// // fetch('https://pos.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
// // method: 'POST',
// // headers: {
// // 'Content-Type': 'application/json',
// // },
// // body: JSON.stringify(req),
// // })
// }
return response
})
export default request;