update
This commit is contained in:
parent
cb0823bbcb
commit
55eacd99f8
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ant-design-pro",
|
"name": "ant-design-pro",
|
||||||
"version": "4.5.26",
|
"version": "4.5.31",
|
||||||
"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": {
|
||||||
|
|||||||
@ -156,7 +156,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
const [tabList, setTabList] = useState<any>([]);// 选项卡列表
|
const [tabList, setTabList] = useState<any>([]);// 选项卡列表
|
||||||
const [showLoading, setShowLoading] = useState<boolean>(false)// 是否显示加载蒙层
|
const [showLoading, setShowLoading] = useState<boolean>(false)// 是否显示加载蒙层
|
||||||
const [showLoading1, setShowLoading1] = useState<boolean>(false)// 是否显示加载蒙层
|
const [showLoading1, setShowLoading1] = useState<boolean>(false)// 是否显示加载蒙层
|
||||||
const [showList,setShowList] = useState<boolean>(false)// 传给在营项目 是否显示列表
|
const [showList, setShowList] = useState<boolean>(false)// 传给在营项目 是否显示列表
|
||||||
const [detailMessage, setDetailMessage] = useState<any>()// 每个品牌的默认值
|
const [detailMessage, setDetailMessage] = useState<any>()// 每个品牌的默认值
|
||||||
const [serviceCar, setServiceCar] = useState<boolean>(false)// 月度车流分析
|
const [serviceCar, setServiceCar] = useState<boolean>(false)// 月度车流分析
|
||||||
const [serviceCarList, setServiceCarList] = useState<any>([])// 车流分析的数据
|
const [serviceCarList, setServiceCarList] = useState<any>([])// 车流分析的数据
|
||||||
@ -246,7 +246,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
const planType = useRef()// 判断打开的是年度计划还是月份计划
|
const planType = useRef()// 判断打开的是年度计划还是月份计划
|
||||||
const planRevenueData = useRef()// 自营计划的数据
|
const planRevenueData = useRef()// 自营计划的数据
|
||||||
const planRevenueDetailList = useRef()// 自营计划的月度明细
|
const planRevenueDetailList = useRef()// 自营计划的月度明细
|
||||||
const [contentLoading,setContentLoading] = useState<boolean>(false)// 显示抽屉加载效果的判断条件
|
const [contentLoading, setContentLoading] = useState<boolean>(false)// 显示抽屉加载效果的判断条件
|
||||||
// 设置页面右侧上面昨日数据里面的时间选择器里的禁用时间用的方法
|
// 设置页面右侧上面昨日数据里面的时间选择器里的禁用时间用的方法
|
||||||
const disabledDate = (current: any) => {
|
const disabledDate = (current: any) => {
|
||||||
return current && current < moment().subtract(10, 'day') || current > moment().subtract(1, 'day');
|
return current && current < moment().subtract(10, 'day') || current > moment().subtract(1, 'day');
|
||||||
@ -478,12 +478,12 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
req = {
|
req = {
|
||||||
ServerpartId: id,
|
ServerpartId: id,
|
||||||
StartDate: `${y}-01-01`,
|
StartDate: `${y}-01-01`,
|
||||||
ShowProjectSplit:false
|
ShowProjectSplit: false
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
req = {
|
req = {
|
||||||
ServerpartId: id,
|
ServerpartId: id,
|
||||||
ShowProjectSplit:false
|
ShowProjectSplit: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const data = await getBrandReceivablesList(req)
|
const data = await getBrandReceivablesList(req)
|
||||||
@ -656,8 +656,8 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
sectionMaxRef.current = Number((sectionMax / 10000).toFixed(2))
|
sectionMaxRef.current = Number((sectionMax / 10000).toFixed(2))
|
||||||
entryMaxRef.current = entryMax
|
entryMaxRef.current = entryMax
|
||||||
|
|
||||||
console.log('pieLine',pieLine)
|
console.log('pieLine', pieLine)
|
||||||
console.log('pieList',pieList)
|
console.log('pieList', pieList)
|
||||||
|
|
||||||
// setServiceCarList(data.data)
|
// setServiceCarList(data.data)
|
||||||
if (showDrawer) {
|
if (showDrawer) {
|
||||||
@ -717,7 +717,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
// 改变归属地右边城市列表的方法
|
// 改变归属地右边城市列表的方法
|
||||||
const getCityList = async (ProvinceName: string, allCount: number, type: number, time: any) => {
|
const getCityList = async (ProvinceName: string, allCount: number, type: number, time: any) => {
|
||||||
const req = {
|
const req = {
|
||||||
StatisticsMonth: time?moment(time).format('YYYYMM') :moment(moment().subtract(1, 'day').format('YYYY-MM-DD')).format('YYYYMM'),
|
StatisticsMonth: time ? moment(time).format('YYYYMM') : moment(moment().subtract(1, 'day').format('YYYY-MM-DD')).format('YYYYMM'),
|
||||||
Serverpart_ID: serverpartId.current,
|
Serverpart_ID: serverpartId.current,
|
||||||
ProvinceName,
|
ProvinceName,
|
||||||
isExclude: ProvinceName.indexOf(',') !== -1,
|
isExclude: ProvinceName.indexOf(',') !== -1,
|
||||||
@ -914,6 +914,8 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
}
|
}
|
||||||
const data = await getServiceDetail(req)
|
const data = await getServiceDetail(req)
|
||||||
setServiceName(data.SERVERPART_NAME)
|
setServiceName(data.SERVERPART_NAME)
|
||||||
|
console.log('datadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatadatavv', data);
|
||||||
|
|
||||||
setServiceDetail(data)
|
setServiceDetail(data)
|
||||||
}
|
}
|
||||||
const typeObj = {
|
const typeObj = {
|
||||||
@ -1194,15 +1196,15 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
<div className={'onSaleProjectTitle'}>在营项目</div>
|
<div className={'onSaleProjectTitle'}>在营项目</div>
|
||||||
<div className={'projectContent'}>
|
<div className={'projectContent'}>
|
||||||
<Radio.Group className={'tab'} value={selectTab} onChange={(val) => {
|
<Radio.Group className={'tab'} value={selectTab} onChange={(val) => {
|
||||||
console.log('val',val)
|
console.log('val', val)
|
||||||
setSelectTab(val.target.value)
|
setSelectTab(val.target.value)
|
||||||
setTableList(allList[val.target.value])
|
setTableList(allList[val.target.value])
|
||||||
console.log('tabs',tabs)
|
console.log('tabs', tabs)
|
||||||
}}>
|
}}>
|
||||||
{
|
{
|
||||||
tabs && tabs.length>0?tabs.map((item: any) => {
|
tabs && tabs.length > 0 ? tabs.map((item: any) => {
|
||||||
return <Radio.Button className={'tabItem'} value={item.key}>{item.label}<span style={{ marginLeft: '4px' }}>{`(${item.value})`}</span></Radio.Button>
|
return <Radio.Button className={'tabItem'} value={item.key}>{item.label}<span style={{ marginLeft: '4px' }}>{`(${item.value})`}</span></Radio.Button>
|
||||||
}):''
|
}) : ''
|
||||||
}
|
}
|
||||||
</Radio.Group>
|
</Radio.Group>
|
||||||
<div className={'brandList'}>
|
<div className={'brandList'}>
|
||||||
@ -1967,7 +1969,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
{/* giveProjectServiceInfo 拿到商家id和商家名称 handleGetTableList拿到在营项目列表中的列表数据 平面图出现的时候 左侧显示的内容 */}
|
{/* giveProjectServiceInfo 拿到商家id和商家名称 handleGetTableList拿到在营项目列表中的列表数据 平面图出现的时候 左侧显示的内容 */}
|
||||||
<OnlineProjectItem onRef={OnlineProjectItemRef} getModeLabel={getModeLabel} fmoney={fmoney} openProject={openProject} serverpartId={serverpartId}
|
<OnlineProjectItem onRef={OnlineProjectItemRef} getModeLabel={getModeLabel} fmoney={fmoney} openProject={openProject} serverpartId={serverpartId}
|
||||||
giveProjectServiceInfo={giveProjectServiceInfo} handleGetTableList={handleGetTableList} showList={showList} setShowList={setShowList}
|
giveProjectServiceInfo={giveProjectServiceInfo} handleGetTableList={handleGetTableList} showList={showList} setShowList={setShowList}
|
||||||
tableShowBottom={true}/>
|
tableShowBottom={true} />
|
||||||
|
|
||||||
{/* <div className={'onSaleProject'}> */}
|
{/* <div className={'onSaleProject'}> */}
|
||||||
{/* <div className={'onSaleProjectTitle'}>在营项目</div> */}
|
{/* <div className={'onSaleProjectTitle'}>在营项目</div> */}
|
||||||
@ -2667,23 +2669,23 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
</div>
|
</div>
|
||||||
<div className={'drawerContent'}>
|
<div className={'drawerContent'}>
|
||||||
{
|
{
|
||||||
contentLoading?
|
contentLoading ?
|
||||||
<div className={'contentLoading'}>
|
<div className={'contentLoading'}>
|
||||||
<div className={'loading'}>
|
<div className={'loading'}>
|
||||||
<Spin />
|
<Spin />
|
||||||
<span style={{ marginLeft: '5px' }}>{'加载中.....'}</span>
|
<span style={{ marginLeft: '5px' }}>{'加载中.....'}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>:''
|
</div> : ''
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
selectFun === 1 ?
|
selectFun === 1 ?
|
||||||
<>
|
<>
|
||||||
<div style={{ marginBottom: '12px', width: '100%', display: 'flex', justifyContent: 'space-between' }}>
|
<div style={{ marginBottom: '12px', width: '100%', display: 'flex', justifyContent: 'space-between' }}>
|
||||||
<RangePicker value={funTimeDate1} format={'YYYY-MM-DD'} onChange={(val: any) => {
|
<RangePicker value={funTimeDate1} format={'YYYY-MM-DD'} onChange={(val: any) => {
|
||||||
if (val){
|
if (val) {
|
||||||
setFunTimeDate1([moment(val[0]._d), moment(val[1]._d)])
|
setFunTimeDate1([moment(val[0]._d), moment(val[1]._d)])
|
||||||
handleMeetingDetail(serverpartId.current, [moment(val[0]._d), moment(val[1]._d)])
|
handleMeetingDetail(serverpartId.current, [moment(val[0]._d), moment(val[1]._d)])
|
||||||
}else{
|
} else {
|
||||||
setFunTimeDate1([])
|
setFunTimeDate1([])
|
||||||
setMeetDetail([])
|
setMeetDetail([])
|
||||||
}
|
}
|
||||||
@ -2774,10 +2776,10 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
<>
|
<>
|
||||||
<div style={{ marginBottom: '12px', width: '100%', display: 'flex', justifyContent: 'space-between' }}>
|
<div style={{ marginBottom: '12px', width: '100%', display: 'flex', justifyContent: 'space-between' }}>
|
||||||
<RangePicker value={funTimeDate3} disabledDate={dailyDisableDate} format={'YYYY-MM-DD'} onChange={(val: any) => {
|
<RangePicker value={funTimeDate3} disabledDate={dailyDisableDate} format={'YYYY-MM-DD'} onChange={(val: any) => {
|
||||||
if (val){
|
if (val) {
|
||||||
setFunTimeDate3([moment(val[0]._d), moment(val[1]._d)])
|
setFunTimeDate3([moment(val[0]._d), moment(val[1]._d)])
|
||||||
getDailySerach(serverpartId.current, [moment(val[0]._d), moment(val[1]._d)])
|
getDailySerach(serverpartId.current, [moment(val[0]._d), moment(val[1]._d)])
|
||||||
}else{
|
} else {
|
||||||
setFunTimeDate3([])
|
setFunTimeDate3([])
|
||||||
setDailyData([])
|
setDailyData([])
|
||||||
}
|
}
|
||||||
@ -2923,7 +2925,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
<>
|
<>
|
||||||
<div style={{ display: selectFun === 4 ? 'block' : 'none' }}>
|
<div style={{ display: selectFun === 4 ? 'block' : 'none' }}>
|
||||||
<Card bordered={false} bodyStyle={{ padding: 0, margin: 0 }}>
|
<Card bordered={false} bodyStyle={{ padding: 0, margin: 0 }}>
|
||||||
<RevenueSummary serverpartId={serverpartId.current} type={true}/>
|
<RevenueSummary serverpartId={serverpartId.current} type={true} />
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
@ -2935,7 +2937,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<>
|
<>
|
||||||
<div style={{ display: selectFun === 6 ? 'block' : 'none',width:'100%' }}>
|
<div style={{ display: selectFun === 6 ? 'block' : 'none', width: '100%' }}>
|
||||||
<ShareBenefit isComponents={true} ServerpartId={serverpartId.current} />
|
<ShareBenefit isComponents={true} ServerpartId={serverpartId.current} />
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -550,6 +550,14 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) =>
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
// fileList: fileList, // 绑定 fileList
|
// fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
console.log('info', info);
|
console.log('info', info);
|
||||||
console.log('fileList', fileList);
|
console.log('fileList', fileList);
|
||||||
|
|||||||
@ -345,6 +345,14 @@ const LostandFoundReview: React.FC<{ currentUser: CurrentUser | undefined }> = (
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
// fileList: fileList, // 绑定 fileList
|
// fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
console.log('info', info);
|
console.log('info', info);
|
||||||
console.log('fileList', fileList);
|
console.log('fileList', fileList);
|
||||||
|
|||||||
@ -559,6 +559,14 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: fileList, // 绑定 fileList
|
fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = fileList.findIndex(n => n.uid === info.file.uid);
|
const index = fileList.findIndex(n => n.uid === info.file.uid);
|
||||||
|
|||||||
@ -514,8 +514,17 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
|
|||||||
listType="picture-card"
|
listType="picture-card"
|
||||||
accept="image/*"
|
accept="image/*"
|
||||||
fieldProps={{
|
fieldProps={{
|
||||||
onPreview: handlePreview
|
onPreview: handlePreview,
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
</Col>
|
</Col>
|
||||||
|
|
||||||
|
|||||||
@ -842,6 +842,14 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (
|
|||||||
maxCount: 1,
|
maxCount: 1,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: fileList, // 绑定 fileList
|
fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = fileList.findIndex(n => n.uid === info.file.uid);
|
const index = fileList.findIndex(n => n.uid === info.file.uid);
|
||||||
|
|||||||
@ -1410,6 +1410,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
|||||||
handlePreview(1)
|
handlePreview(1)
|
||||||
},
|
},
|
||||||
fileList: mainImgList, // 绑定 fileList
|
fileList: mainImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = mainImgList.findIndex(n => n.uid === info.file.uid);
|
const index = mainImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
@ -1461,6 +1469,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
|||||||
handlePreview(2)
|
handlePreview(2)
|
||||||
},
|
},
|
||||||
fileList: headerImgList, // 绑定 fileList
|
fileList: headerImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = headerImgList.findIndex(n => n.uid === info.file.uid);
|
const index = headerImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
@ -1512,6 +1528,14 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
|||||||
handlePreview(3)
|
handlePreview(3)
|
||||||
},
|
},
|
||||||
fileList: detailImgList, // 绑定 fileList
|
fileList: detailImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = detailImgList.findIndex(n => n.uid === info.file.uid);
|
const index = detailImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
|
|||||||
@ -1316,6 +1316,14 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: mainImgList, // 绑定 fileList
|
fileList: mainImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = mainImgList.findIndex(n => n.uid === info.file.uid);
|
const index = mainImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
@ -1365,6 +1373,14 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: headerImgList, // 绑定 fileList
|
fileList: headerImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = headerImgList.findIndex(n => n.uid === info.file.uid);
|
const index = headerImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
@ -1416,6 +1432,14 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: detailImgList, // 绑定 fileList
|
fileList: detailImgList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
if (info.file.status === 'removed') {
|
if (info.file.status === 'removed') {
|
||||||
const index = detailImgList.findIndex(n => n.uid === info.file.uid);
|
const index = detailImgList.findIndex(n => n.uid === info.file.uid);
|
||||||
|
|||||||
@ -488,6 +488,14 @@ const SummaryofMerchantReviews: React.FC<{ currentUser: CurrentUser, isComponent
|
|||||||
accept="image/*"
|
accept="image/*"
|
||||||
fieldProps={{
|
fieldProps={{
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Col>
|
</Col>
|
||||||
|
|||||||
@ -107,6 +107,8 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
|||||||
fixed: "left",
|
fixed: "left",
|
||||||
render: (_, record) => {
|
render: (_, record) => {
|
||||||
return <a onClick={() => {
|
return <a onClick={() => {
|
||||||
|
console.log('recordrecord', record);
|
||||||
|
|
||||||
let imgList: any = []
|
let imgList: any = []
|
||||||
if (record?.ImageList && record?.ImageList.length > 0) {
|
if (record?.ImageList && record?.ImageList.length > 0) {
|
||||||
record?.ImageList.forEach((item: any) => {
|
record?.ImageList.forEach((item: any) => {
|
||||||
@ -345,16 +347,20 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
|||||||
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
|
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
handleConfirmLoading(true)
|
||||||
|
|
||||||
const data = await handeSynchroSCENICAREA(req)
|
const data = await handeSynchroSCENICAREA(req)
|
||||||
console.log('datadatadatadata', data);
|
console.log('datadatadatadata', data);
|
||||||
|
|
||||||
handleConfirmLoading(false)
|
|
||||||
if (data.Result_Code === 100) {
|
if (data.Result_Code === 100) {
|
||||||
|
console.log('res.SCENICAREA_Imageres.SCENICAREA_Imageres.SCENICAREA_Image', res.SCENICAREA_Image);
|
||||||
if (res.SCENICAREA_Image && res.SCENICAREA_Image.length > 0) {
|
if (res.SCENICAREA_Image && res.SCENICAREA_Image.length > 0) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
res.SCENICAREA_Image.forEach((file: any) => {
|
res.SCENICAREA_Image.forEach((file: any) => {
|
||||||
|
if (!file.ImageUrl) {
|
||||||
formData.append('files[]', file.originFileObj);
|
formData.append('files[]', file.originFileObj);
|
||||||
formData.append('ImageName', typeof file !== 'string' ? file?.name : '');
|
formData.append('ImageName', typeof file !== 'string' ? file?.name : '');
|
||||||
|
}
|
||||||
});
|
});
|
||||||
formData.append('TableId', data.Result_Data.SCENICAREA_ID);
|
formData.append('TableId', data.Result_Data.SCENICAREA_ID);
|
||||||
formData.append('TableType', '1305');
|
formData.append('TableType', '1305');
|
||||||
@ -365,6 +371,8 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
|||||||
|
|
||||||
handleSetlogSave(`${currentRow?.SCENICAREA_ID ? `更新${currentRow?.SCENICAREA_NAME}景区` : `新增${data.Result_Data.SCENICAREA_NAME}`}信息`)
|
handleSetlogSave(`${currentRow?.SCENICAREA_ID ? `更新${currentRow?.SCENICAREA_NAME}景区` : `新增${data.Result_Data.SCENICAREA_NAME}`}信息`)
|
||||||
|
|
||||||
|
|
||||||
|
handleConfirmLoading(false)
|
||||||
message.success("更新成功!")
|
message.success("更新成功!")
|
||||||
setCurrentRow(undefined)
|
setCurrentRow(undefined)
|
||||||
formRef?.current?.resetFields()
|
formRef?.current?.resetFields()
|
||||||
@ -372,6 +380,7 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
|||||||
actionRef.current?.reload()
|
actionRef.current?.reload()
|
||||||
setFileList([])
|
setFileList([])
|
||||||
} else {
|
} else {
|
||||||
|
handleConfirmLoading(false)
|
||||||
message.error(data.Result_Desc)
|
message.error(data.Result_Desc)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -682,9 +691,17 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
|||||||
listType="picture-card"
|
listType="picture-card"
|
||||||
accept="image/*"
|
accept="image/*"
|
||||||
fieldProps={{
|
fieldProps={{
|
||||||
beforeUpload,
|
beforeUpload: beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: fileList, // 绑定 fileList
|
fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
console.log('info', info);
|
console.log('info', info);
|
||||||
console.log('fileList', fileList);
|
console.log('fileList', fileList);
|
||||||
|
|||||||
@ -892,6 +892,14 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
|||||||
beforeUpload,
|
beforeUpload,
|
||||||
onPreview: handlePreview,
|
onPreview: handlePreview,
|
||||||
fileList: fileList, // 绑定 fileList
|
fileList: fileList, // 绑定 fileList
|
||||||
|
customRequest: ({ file, onSuccess }) => {
|
||||||
|
// 自定义上传,不实际发送请求
|
||||||
|
setTimeout(() => {
|
||||||
|
if (onSuccess) {
|
||||||
|
onSuccess({});
|
||||||
|
}
|
||||||
|
}, 0);
|
||||||
|
},
|
||||||
onChange: async (info: any) => {
|
onChange: async (info: any) => {
|
||||||
console.log('info', info);
|
console.log('info', info);
|
||||||
console.log('fileList', fileList);
|
console.log('fileList', fileList);
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
// 由 scripts/writeVersion.js 自动生成
|
// 由 scripts/writeVersion.js 自动生成
|
||||||
export const VERSION = "4.5.26";
|
export const VERSION = "4.5.31";
|
||||||
export const GIT_HASH = "c145b6c";
|
export const GIT_HASH = "cb0823b";
|
||||||
export const BUILD_TIME = "2025-08-15T08:20:30.752Z";
|
export const BUILD_TIME = "2025-08-18T02:35:36.007Z";
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user