ylj/newCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ylj:ea27a3213f1b786445317c7bd5a6472518bbc79e
Branches Tags
ylj:main
..
compare: ylj:4073d23d664c31bb0e5b6428f90e1048d20eff32
Branches Tags
ylj:main

No commits in common. "ea27a3213f1b786445317c7bd5a6472518bbc79e" and "4073d23d664c31bb0e5b6428f90e1048d20eff32" have entirely different histories.
ea27a3213f ... 4073d23d66

21 changed files with 757 additions and 910 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

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

45
src/components/SmartLoading/index.tsx
View File

@ -16,42 +16,10 @@ const SmartLoading: React.FC<SmartLoadingProps> = ({
fallback,
enablePreload = true
}) => {
const location = useLocation();
const [loadingType, setLoadingType] = useState<'page' | 'table' | 'form' | 'card'>('page');
const [shouldShow, setShouldShow] = useState(false);
const [location, setLocation] = useState<any>(null);
// 安全获取location，避免在路由未准备好时出错
try {
const currentLocation = useLocation();
if (!location) {
setLocation(currentLocation);
}
} catch (error) {
// 如果useLocation失败，使用window.location作为fallback
if (!location && typeof window !== 'undefined') {
setLocation({ pathname: window.location.pathname });
}
}
useEffect(() => {
// 对于页面切换，立即显示骨架屏，但对于初始加载延迟显示
const isInitialLoad = !location?.pathname || location.pathname === '/';
if (isInitialLoad) {
// 初始加载时延迟显示，避免刷新时闪烁
const timer = setTimeout(() => {
setShouldShow(true);
}, 200);
return () => clearTimeout(timer);
} else {
// 页面切换时立即显示，保持骨架屏效果
setShouldShow(true);
}
}, [location?.pathname]);
useEffect(() => {
if (!location?.pathname) return;
// 根据路径判断页面类型，选择合适的骨架屏
const path = location.pathname;
@ -65,24 +33,17 @@ const SmartLoading: React.FC<SmartLoadingProps> = ({
setLoadingType('page');
}
// 预加载相关路由（降低优先级，避免影响主流程）
// 预加载相关路由
if (enablePreload) {
setTimeout(() => {
routePreloader.preloadBasedOnUserBehavior(path);
}, 500);
}
}, [location?.pathname, enablePreload]);
}, [location.pathname, enablePreload]);
// 如果提供了自定义fallback，使用它
if (fallback) {
return <>{fallback}</>;
}
// 延迟显示，避免闪烁
if (!shouldShow) {
return null;
}
// 根据页面类型返回对应的骨架屏
return <SkeletonLoading type={loadingType} rows={getRowsByType(loadingType)} />;
};

2
src/layouts/BasicLayout.tsx
View File

@ -1041,7 +1041,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
tab={item.title} key={item?.path}
style={{ padding: 24, paddingTop: 0 }}>
<SimplePageTransition>
<Suspense fallback={null}>
<Suspense fallback={<div>Loading...</div>}>
<Authorized authority={authorized!.authority} noMatch={noMatch}>
{item.children}
</Authorized>

83
src/layouts/SecurityLayout.tsx
View File

@ -15,101 +15,68 @@ type SecurityLayoutProps = {
type SecurityLayoutState = {
isReady: boolean;
shouldShowLoading: boolean;
initialLoadComplete: boolean;
};
class SecurityLayout extends React.Component<SecurityLayoutProps, SecurityLayoutState> {
state: SecurityLayoutState = {
isReady: false,
shouldShowLoading: false,
initialLoadComplete: false,
};
private loadingTimer?: NodeJS.Timeout;
componentDidMount() {
const { location } = history;
const { location } = history
const { dispatch } = this.props;
// 检查是否有缓存的用户信息，避免不必要的加载状态
const cachedUser = session.get("currentUser");
// 设置防闪烁定时器，只有加载时间超过300ms才显示loading
this.loadingTimer = setTimeout(() => {
if (!this.state.isReady && !this.state.initialLoadComplete) {
this.setState({
shouldShowLoading: true,
});
}
}, 300);
if (dispatch) {
dispatch({
type: 'user/fetch',
callback: (user) => {
// 清除定时器
if (this.loadingTimer) {
clearTimeout(this.loadingTimer);
}
type: 'user/fetch', callback: (user) => {
if (user.code && location.pathname !== '/user/login') {
history.push('/user/login');
return;
return
}
console.log('secur')
dispatch({
type: 'global/getMenuData',
payload: user.ID,
callback: (menu) => {
type: 'global/getMenuData', payload: user.ID, callback: (menu) => {
if (menu) {
this.setState({
isReady: true,
shouldShowLoading: false,
initialLoadComplete: true,
});
}
}
});
})
}
});
})
} else {
// 清除定时器
if (this.loadingTimer) {
clearTimeout(this.loadingTimer);
}
this.setState({
isReady: true,
shouldShowLoading: false,
initialLoadComplete: true,
});
}
}
componentWillUnmount() {
if (this.loadingTimer) {
clearTimeout(this.loadingTimer);
}
}
render() {
const { isReady, shouldShowLoading, initialLoadComplete } = this.state;
const { children, currentUser } = this.props;
const { isReady } = this.state;
const { children, loading, currentUser } = this.props;
// const { location } = history;
// 用户认证规则
// You can replace it to your authentication rule (such as check token exists)
// You can replace it with your own login authentication rules (such as judging whether the token exists)
const isLogin = currentUser && currentUser.ID;
// 如果初始化未完成且需要显示加载状态，才显示骨架屏
if (!isReady && shouldShowLoading) {
if ((!isLogin && loading) || !isReady) {
return <PageLoading />;
}
// 如果还在初始化过程中，但不需要显示loading，返回null（避免闪烁）
if (!isReady && !shouldShowLoading) {
return null;
}
// if (!isLogin && location.pathname !== '/user/login') {
// history.push('/user/login');
// }
return children;
}
}

16
src/pages/basicManage/Brand/serverpart.tsx
View File

@ -1298,7 +1298,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={area} />
<span className={'itemLeftLabel'}>占地面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.FLOORAREA ? fmoney(serviceDetail?.ServerpartInfo?.FLOORAREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.FLOORAREA ? fmoney(serviceDetail.ServerpartInfo.FLOORAREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -1306,7 +1306,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={stopArea} />
<span className={'itemLeftLabel'}>停车场面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SHAREAREA ? fmoney(serviceDetail?.ServerpartInfo?.SHAREAREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SHAREAREA ? fmoney(serviceDetail.ServerpartInfo.SHAREAREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -1314,7 +1314,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={buildArea} />
<span className={'itemLeftLabel'}>建筑面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_AREA ? fmoney(serviceDetail?.ServerpartInfo?.SERVERPART_AREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_AREA ? fmoney(serviceDetail.ServerpartInfo.SERVERPART_AREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -1322,7 +1322,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={water} />
<span className={'itemLeftLabel'}>取水方式</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 1 ? '自来水' : serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 2 ? '井水' : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 1 ? '自来水' : serviceDetail.ServerpartInfo.WATERINTAKE_TYPE === 2 ? '井水' : ''}</div>
</div>
<div className={'detailItem'}>
@ -1330,7 +1330,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={badWater} />
<span className={'itemLeftLabel'}>污水处理</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 1 ? '市政' : serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 2 ? '污水处理设备' : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 1 ? '市政' : serviceDetail.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 2 ? '污水处理设备' : ''}</div>
</div>
<div className={'detailItem'}>
@ -1338,7 +1338,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={fixed} />
<span className={'itemLeftLabel'}>市区县镇</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS ? serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS ? serviceDetail.ServerpartInfo.SERVERPART_ADDRESS : ''}</div>
</div>
<div className={'detailItem'}>
@ -1346,7 +1346,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={managerUnit} />
<span className={'itemLeftLabel'}>管理单位</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.MANAGERCOMPANY ? serviceDetail?.ServerpartInfo?.MANAGERCOMPANY : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.MANAGERCOMPANY ? serviceDetail.ServerpartInfo.MANAGERCOMPANY : ''}</div>
</div>
<div className={'detailItem'}>
@ -1354,7 +1354,7 @@ const BrandTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUser }) =>
<img className={'itemLeftIcon'} src={propryRight} />
<span className={'itemLeftLabel'}>产权单位</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.OWNEDCOMPANY ? serviceDetail?.ServerpartInfo?.OWNEDCOMPANY : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.OWNEDCOMPANY ? serviceDetail.ServerpartInfo.OWNEDCOMPANY : ''}</div>
</div>
</div>
: ''

1
src/pages/basicManage/BusinessTrade/index.tsx
View File

@ -333,7 +333,6 @@ const BusinessTradeModelTable: React.FC<{ currentUser: CurrentUser }> = (props)
<Drawer
width={600}
visible={showDetail}
bodyStyle={{ padding: '24px' }}
onClose={() => {
setCurrentRow(undefined);
setShowDetail(false);

2
src/pages/basicManage/serviceArea/index.tsx
View File

@ -141,7 +141,6 @@ const serviceArea: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'BUSINESS_UNIT',
align: 'center',
hideInSearch: true,
ellipsis: true
},
]
@ -272,7 +271,6 @@ const serviceArea: React.FC<{ currentUser: CurrentUser }> = (props) => {
}}
headerTitle={<PageTitleBox props={props} />}
search={{ span: 6 }}
scroll={{ x: "100%", y: 'calc(100vh - 430px)' }}
request={async (params) => {
if (!selectedId) {
return

21
src/pages/newDataAnalysis/serviceAreaPersonnel/index.tsx
View File

@ -354,7 +354,6 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
setEditModal(false)
setCurrentRow(undefined)
setPersonDetail(undefined)
setShowPROWERSETList([])
}}
footer={<div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<div>
@ -419,7 +418,6 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
setEditModal(false)
setCurrentRow(undefined)
setPersonDetail(undefined)
setShowPROWERSETList([])
}}>取消</Button>
</div>
</div>}
@ -446,25 +444,6 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
})
}
console.log('author', author);
let list: any = []
let nowValueList: any = []
if (currentRow?.CASHWORKER_TYPE === 1) {
nowValueList = ['1', '2', '4', '5', '6', '8', '9', '10', '13', '15', '35', '47', '52', '53']
} else if (currentRow?.CASHWORKER_TYPE === 2) {
nowValueList = ['1', '2', '3', '4', '5', '6', '8', '9', '10', '13', '15', '18', '35', '36', '47', '50', '51', '52', '53', '120']
} else if (currentRow?.CASHWORKER_TYPE === 20) {
nowValueList = ['2', '3', '4', '6', '8', '9', '10', '18', '35', '47', '51']
}
if (PROWERSET && PROWERSET.length > 0) {
PROWERSET.forEach((item: any) => {
if (nowValueList.indexOf(item.value.toString()) !== -1) {
list.push(item)
}
})
}
setShowPROWERSETList(list)
setPersonDetail({
...data,
WORKER_OTHER: author

4
src/pages/operatingMerchants/MerchantInformation/index.tsx
View File

@ -944,7 +944,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
<div style={{ backgroundColor: '#fff', display: 'flex' }}>
<LeftSelectTree setSelectedId={setSelectedId} setCollapsible={setCollapsible} collapsible={collapsible} />
<div style={{
width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
width: !collapsible ? 'calc(100% - 340px)' : 'calc(100% - 60px)',
paddingTop: 0,
paddingBottom: 0,
paddingRight: 0
@ -1279,8 +1279,6 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
formRef?.current?.validateFields().then(() => {
handleConfirmLoading(true)
formRef?.current?.submit()
}).catch((err) => {
message.error('请检查表单输入是否完整！')
})
}}>保存</Button>
</div>

144
src/pages/reports/BusinessProject/index.tsx
View File

@ -16,7 +16,7 @@ import useRequest from "@ahooksjs/use-request";
import SubMenu from 'antd/lib/menu/SubMenu';
import { PageContainer } from '@ant-design/pro-layout';
import { MenuFoldOutlined } from '@ant-design/icons';
import { fmoney, getServerpartTree } from '@/services/options';
import {fmoney, getServerpartTree} from '@/services/options';
import { contractType } from '@/pages/contract/emun';
import { connect, history } from 'umi';
import { useEffect, useRef, useState } from 'react';
@ -31,13 +31,13 @@ import type { RevenueConfirmModel, RevenueConfirmParams } from './data';
import type { BusinessProjectModel } from '@/pages/BussinessProject/data';
import { getRevenueConfirmList } from './service';
import { printContract, handlePrint } from "@/utils/utils";
import {printContract,handlePrint} from "@/utils/utils";
import { getProjectDetail } from '@/pages/BussinessProject/service';
import { exportExcel, printOutBody } from '@/utils/utils';
import RevenueList from '@/pages/BussinessProject/components/RevenueList';
import '@/pages/merchantManagement/style.less';
import session from "@/utils/session";
import { getDetail } from "@/pages/basicManage/Serverpart/service";
import {getDetail} from "@/pages/basicManage/Serverpart/service";
import PageTitleBox from '@/components/PageTitleBox';
const { Text } = Typography;
@ -75,17 +75,17 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
const [selectShops, setSelectShops] = useState<any[]>() // 选中的数量
const [curProject, setProject] = useState<BusinessProjectModel | any>(undefined) // 选中的当前行
const [printOut, setPrintOut] = useState<any>(); // 打印数据的内容
const [currentServiceName, setServiceName] = useState<any>();// 拿到服务区的名字还为截取
const [currentServiceName,setServiceName] = useState<any>();// 拿到服务区的名字还为截取
// 树相关的属性和方法
const [currenMenu, setCurrenMenu] = useState<any>(); // 当前选中的左侧菜单
const [selectedId, setSelectedId] = useState<string[]>([])
const [collapsible, setCollapsible] = useState<boolean>(false)
// 选中的服务区名称
const [serviceName, setSelectServiceName] = useState<string>()
const [serviceName,setSelectServiceName] = useState<string>()
// 加载服务区树
const { loading: treeLoading, data: treeView = [] } = useRequest(() => { return getServerpartTree(currentUser?.ProvinceCode) })
// 表格数据
const [tableData, setTableData] = useState<any>()// 表格数据
const [tableData,setTableData] = useState<any>()// 表格数据
// 根据左侧选中的菜单加载右侧数据
const loadSelectedId = async (item?: any) => {
setSelectedId(item.selectedKeys || []) // 选中的子菜单key
@ -191,16 +191,14 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
hideInSearch: true,
render: (_, record) => {
return <a onClick={async () => {
console.log('record',record)
// 查询经营项目信息详情
// const project = await getProjectDetail(record.BUSINESSPROJECT_ID);
getProjectDetail(record.BUSINESSPROJECT_ID).then((project) => {
setProject({ ...project, BUSINESSPROJECT_ID: project.BUSINESSPROJECT_ID })
})
const project = await getProjectDetail(record.BUSINESSPROJECT_ID);
// 点击实际营业额时 打开抽屉 展示每日营收数据
setCurrentRow(record)
setProject(project)
setShowDetail(true)
}}>{record.ACTUAL_REVENUE ? fmoney(record.ACTUAL_REVENUE, 2) : ''}</a>
}}>{record.ACTUAL_REVENUE?fmoney(record.ACTUAL_REVENUE,2):''}</a>
},
},
{
@ -241,7 +239,7 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
]
return (
<div ref={(el) => {
<div ref={(el)=>{
// 打印报表
setPrintOut(el);
}}>
@ -253,11 +251,11 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
width: '100%',
height: '100%'
}}>
<ProCard split="vertical" style={{ backgroundColor: '#fff', width: 'calc(100vw - 260px)', height: 'calc(100vh - 130px)' }}>
<ProCard split="vertical" style={{ backgroundColor: '#fff',width:'calc(100vw - 260px)',height:'calc(100vh - 130px)'}}>
<ProCard
style={{ height: '100%' }}
style={{height:'100%'}}
className="pageTable-leftnav"
bodyStyle={{ padding: 0, paddingTop: 20, paddingLeft: 20 }}
bodyStyle={{ padding: 0, paddingTop: 20, paddingLeft: 20}}
extra={<MenuFoldOutlined onClick={() => { setCollapsible(!collapsible) }} />}
colSpan={!collapsible ? "300px" : "60px"}
title={!collapsible ? "请选择服务区" : ""}
@ -266,15 +264,15 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
>
{!treeLoading && <Menu
mode="inline"
style={{ height: 'calc(100% - 100px)', overflowY: 'auto', overflowX: 'hidden' }}
style={{ height:'calc(100% - 100px)', overflowY: 'auto', overflowX: 'hidden' }}
selectedKeys={selectedId}
onSelect={(item) => {
// 拿到选择的服务区名称给导出的文件赋值
if (treeView && treeView.length > 0) {
treeView.forEach((i: any) => {
if (i.children && i.children.length > 0) {
i.children.forEach((subItem: any) => {
if (subItem.key === item.key) {
if (treeView && treeView.length>0){
treeView.forEach((i: any)=>{
if (i.children && i.children.length>0){
i.children.forEach((subItem: any)=>{
if (subItem.key===item.key){
setSelectServiceName(subItem.label)
}
})
@ -322,12 +320,12 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
columns={revenuenColumns}
pagination={false}
rowSelection={{
onChange: (selectedRowKeys, selectedRows) => {
onChange:(selectedRowKeys, selectedRows)=>{
setSelectShops(selectedRows)
}
}}
toolbar={{
actions: [
actions:[
// react打印插件
<ReactToPrint
// 打印内容的页面留白
@ -342,13 +340,13 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
// 点击触发的事件
content={() => {
// printOut是整个页面的dom 一般情况都是有的
if (printOut) {
if (printOut){
// 标题 先找到标题的dom元素
const title = document.createElement('p')
// 设置标题dom元素的内容
title.innerHTML = `${currentServiceName}合作单位保底提成结算表`
// 给标题dom设置样式
title.setAttribute('style', 'font-size:20px;font-weight:600;display:flex;width:100%;justify-content: center;')
title.setAttribute('style','font-size:20px;font-weight:600;display:flex;width:100%;justify-content: center;')
// 日期时间 timeUnit为父节点 time和date为子节点 显示打印内容标题下面 表格上面的那一块区域
const timeUnit = document.createElement('div')
@ -361,7 +359,7 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
timeUnit.appendChild(time)
timeUnit.appendChild(date)
// 样式
timeUnit.setAttribute('style', 'width:100%;display:flex;justify-content: space-between;margin-bottom:15px;')
timeUnit.setAttribute('style','width:100%;display:flex;justify-content: space-between;margin-bottom:15px;')
// 数据内容 打印的表格dom
// 表格的dom元素
@ -369,32 +367,32 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
// 克隆出来不影响原页面
const domNoChange = dataList[0].cloneNode(true)
// 拿到是不是有已经被选中的行
const length = selectShops ? selectShops.length : false
if (length) {
const length = selectShops?selectShops.length:false
if (length){
// 拿到表头的dom
const tableHeader = domNoChange.getElementsByClassName('ant-table-thead')
// 表头增加样式
tableHeader[0].setAttribute('style', 'width:100%;background: #fafafa;')
tableHeader[0].setAttribute('style','width:100%;background: #fafafa;')
// 拿到每一列的标题
const th = tableHeader[0].getElementsByTagName("th");
// 由于页面的表头和效果图要的不一样 所以就自定义一个效果图上要的表头数组
// 由于这个页面莫名其妙在每行的后面都有一个空节点，所以最后给他赋值个空的
const titleText = ['合作单位', '结算起止时间', '营业额', '提成标准', '提成额', '保证租金', '备注说明', '']
const titleText = ['合作单位','结算起止时间','营业额','提成标准','提成额','保证租金','备注说明','']
const headList: { innerHTML: string; }[] = []
// th的第一个节点删除是因为要把选择框的节点去掉 打印不能有选择框出现
th.forEach((item: { innerHTML: string; }, index: string | number) => {
if (index === 0) {
th.forEach((item: { innerHTML: string; }, index: string | number)=>{
if(index===0){
item.remove()
} else if (index <= 7 && index !== 0) {
} else if(index<=7 && index!==0){
// 页面需要的节点 给他赋值上需要的标题 然后添加到一个数组里面
item.innerHTML = titleText[index]
headList.push(item)
}
})
// 不让标题内容换行 minWidth无法适配 只能不换行来满足需求
th.forEach((item: { innerHTML: string; }, index: string | number) => {
th.forEach((item: { innerHTML: string; }, index: string | number)=>{
// 因为最后一个节点还是空节点所以不让最后一个不换行 其实问题也不大
if (index !== th.length - 1) {
if (index !== th.length-1 ){
item.style.whiteSpace = 'nowrap'
}
})
@ -406,78 +404,78 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
// 哪几行是没被选中的索引列表
const numList: any[] = []
// 遍历每一行数据
tr.forEach((item: { getElementsByClassName: (arg0: string) => any; }, index: any) => {
tr.forEach((item: { getElementsByClassName: (arg0: string) => any; }, index: any)=>{
// 拿到打钩的那个节点 如果这个节点下的checked节点为true那就是被选中了 false就是没选中
const isChecked = item.getElementsByClassName('ant-checkbox-input')
// 没被选中的行数的索引被添加到数组中
if (!isChecked[0].checked) {
if (!isChecked[0].checked){
numList.push(index)
}
})
// 倒序的for循环 正序的话当一个节点删除时 下一个节点会到刚刚删除的节点位置 无法参与判断
// 如果是没选中的节点就直接移除掉 留下来的节点都是选中的节点
for (let i = tr.length - 1; i >= 0; i -= 1) {
numList.forEach(item => {
if (i === item) {
for(let i=tr.length - 1;i>=0;i-=1){
numList.forEach(item=>{
if (i === item){
tr[i].remove()
}
})
}
// 选中的节点继续遍历
tr.forEach((item: { getElementsByClassName: (arg0: string) => any; }, index: any) => {
tr.forEach((item: { getElementsByClassName: (arg0: string) => any; }, index: any)=>{
// 因为页面的dom元素和要求图的dom元素不一样 所以用list先存页面中的数据
const list: any[] = []
// 获得每一行的 每一列对应的节点
const td = item.getElementsByTagName('td')
// 遍历一行的数据
td.forEach((subItem: { innerHTML: any; }, subIndex: number) => {
td.forEach((subItem: { innerHTML: any; },subIndex: number) =>{
// 背景都变成白色
subItem.style.backgroundColor = 'white'
// 因为td的第一项是选择框 所以不放进数据列表中
if (subIndex >= 1) {
if (subIndex>=1){
list.push(subItem.innerHTML)
}
})
// 把选择框的dom节点移除
td[0].remove()
// 拼接数据
td.forEach((subItem: { innerHTML: string; }, subIndex: number) => {
td.forEach((subItem: { innerHTML: string; }, subIndex: number)=>{
subItem.style.backgroundColor = 'white'
if (subIndex === 0) {
if (subIndex === 0){
subItem.innerHTML = list[0]
subItem.style.whiteSpace = 'nowrap'
} else if (subIndex === 1) {
}else if (subIndex === 1){
// 时间数据的拼接
subItem.innerHTML = `${moment(list[1]).format('YYYY年MM月DD日')} - ${moment(list[2]).format('YYYY年MM月DD日')}`
subItem.style.whiteSpace = 'nowrap'
} else if (subIndex > 1 && subIndex <= 6) {
}else if (subIndex >1 && subIndex<=6){
// 因为上面拼接了一个 所以索引加1 小于6 是因为 要求的数据只有七行 但是会有一个空节点
subItem.innerHTML = list[subIndex + 1]
if (subIndex !== 6) {
if (subIndex!==6){
// 备注就让它可以换行
subItem.style.whiteSpace = 'nowrap'
}
} else {
}else{
subItem.style.backgroundColor = 'white'
}
})
})
} else {
}else{
// 没有选中任何一行 就默认打印全部
// 表头dom节点 逻辑和上面差不多 就是没有了是否选中的判断
const tableHeader = domNoChange.getElementsByClassName('ant-table-thead')
const th = tableHeader[0].getElementsByTagName("th");
const titleText = ['合作单位', '结算起止时间', '营业额', '提成标准', '提成额', '保证租金', '备注说明', '']
const titleText = ['合作单位','结算起止时间','营业额','提成标准','提成额','保证租金','备注说明','']
const headList: { innerHTML: string; }[] = []
th[0].remove()
th.forEach((item: { innerHTML: string; }, index: string | number) => {
if (index !== th.length - 1) {
th.forEach((item: { innerHTML: string; }, index: string | number)=>{
if (index !== th.length-1){
item.style.whiteSpace = 'nowrap'
}
if (index <= 7 && index >= 0) {
if(index<=7 && index>=0){
item.innerHTML = titleText[index]
headList.push(item)
} else {
}else{
item.style.maxWidth = '0px'
}
})
@ -485,30 +483,30 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
const tableBody = domNoChange.getElementsByClassName('ant-table-tbody')
const tr = tableBody[0].getElementsByTagName('tr')
// 先遍历每一行的数据 拿到每一行中的数据
tr.forEach((item: { getElementsByTagName: (arg0: string) => any; }, index: any) => {
tr.forEach((item: { getElementsByTagName: (arg0: string) => any; }, index: any)=>{
const list: any[] = []
const td = item.getElementsByTagName('td')
// 再对每一行的数据进行遍历 把原本的值先存一份
td.forEach((subItem: { innerHTML: any; }, subIndex: number) => {
if (subIndex >= 1) {
td.forEach((subItem: { innerHTML: any; },subIndex: number) =>{
if (subIndex>=1){
list.push(subItem.innerHTML)
}
})
td[0].remove()
td.forEach((subItem: { innerHTML: string; }, subIndex: number) => {
if (subIndex === 0) {
td.forEach((subItem: { innerHTML: string; }, subIndex: number)=>{
if (subIndex === 0){
subItem.innerHTML = list[0]
subItem.style.whiteSpace = 'nowrap'
} else if (subIndex === 1) {
}else if (subIndex === 1){
subItem.innerHTML = `${moment(list[1]).format('YYYY年MM月DD日')} - ${moment(list[2]).format('YYYY年MM月DD日')}`
subItem.style.whiteSpace = 'nowrap'
} else if (subIndex > 1 && subIndex <= 6) {
}else if (subIndex >1 && subIndex<=6){
subItem.innerHTML = list[subIndex + 1]
if (subIndex !== 6) {
if (subIndex!==6){
subItem.style.whiteSpace = 'nowrap'
}
} else {
item.setAttribute('style', 'width: 0%')
}else{
item.setAttribute('style','width: 0%')
}
})
})
@ -517,19 +515,19 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
// 创建一个父节点 下面三个子节点 然后flex布局变掉 加一个当前用户的名称就可以
const currentUser = session.get('currentUser');
const signAndSeal = document.createElement('div')
signAndSeal.setAttribute('style', 'width:100%;display:flex;align-item:center;justify-content: space-between;margin-top:20px')
signAndSeal.setAttribute('style','width:100%;display:flex;align-item:center;justify-content: space-between;margin-top:20px')
const serviceSeal = document.createElement('div')
const companySeal = document.createElement('div')
const makeExcel = document.createElement('div')
serviceSeal.innerHTML = '服务区 (签字盖章) :'
companySeal.innerHTML = '合作单位 (签字盖章) :'
makeExcel.innerHTML = `制表人 : ${currentUser.Name}`
makeExcel.setAttribute('style', 'text-align:right')
makeExcel.setAttribute('style','text-align:right')
signAndSeal.appendChild(serviceSeal)
signAndSeal.appendChild(companySeal)
signAndSeal.appendChild(makeExcel)
// printContract方法也就是把第一个形参数组里面的每一项拼到一个父节点的里面 然后return出来
const ele = printContract([title || '', timeUnit || '', domNoChange || '', signAndSeal || ''], '');
const ele = printContract( [title || '',timeUnit || '',domNoChange || '',signAndSeal || ''], '');
// content方法中return出来的值 就会自动调起ReactToPrint依赖 然后根据ele来打印
return ele
}
@ -539,7 +537,7 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
/>,
<Button
type="primary"
onClick={async () => {
onClick={async ()=>{
const nowColumns = revenuenColumns.filter(n => !n.hideInTable)
const fat = nowColumns.map((n: any, index: number) => {
if (n?.children) {
@ -550,9 +548,9 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
}
return n
})
console.log('tableData', tableData)
console.log('tableData',tableData)
const dataList: any = JSON.parse(JSON.stringify(tableData))
dataList.forEach((item: any) => {
dataList.forEach((item: any)=>{
item.BUSINESS_ENDDATE = moment(item.BUSINESS_ENDDATE).format('YYYY-MM-DD')
item.BUSINESS_STARTDATE = moment(item.BUSINESS_STARTDATE).format('YYYY-MM-DD')
})
@ -610,7 +608,7 @@ const ShareBenefit: React.FC<{ currentUser?: CurrentUser }> = (props) => {
ShopRoyaltyId={currentRow?.SHOPROYALTY_ID ? currentRow?.SHOPROYALTY_ID : 0}
ShopIds={currentRow?.SERVERPARTSHOP_ID ? currentRow?.SERVERPARTSHOP_ID : ''}
StartDate={moment(currentRow?.BUSINESS_STARTDATE).format('YYYY-MM-DD')}
EndDate={moment(currentRow?.BUSINESS_ENDDATE).format('YYYY-MM-DD')} BusinessProjectId={currentRow?.BUSINESSPROJECT_ID}></RevenueList>}
EndDate={moment(currentRow?.BUSINESS_ENDDATE).format('YYYY-MM-DD')}></RevenueList>}
</Drawer>
</PageContainer>
</div>

16
src/pages/reports/Finance/TradeWarning/components/serviceAreaDetails.tsx
View File

@ -369,7 +369,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={area} />
<span className={'itemLeftLabel'}>占地面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.FLOORAREA ? fmoney(serviceDetail?.ServerpartInfo?.FLOORAREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.FLOORAREA ? fmoney(serviceDetail.ServerpartInfo.FLOORAREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -377,7 +377,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={stopArea} />
<span className={'itemLeftLabel'}>停车场面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SHAREAREA ? fmoney(serviceDetail?.ServerpartInfo?.SHAREAREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SHAREAREA ? fmoney(serviceDetail.ServerpartInfo.SHAREAREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -385,7 +385,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={buildArea} />
<span className={'itemLeftLabel'}>建筑面积</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_AREA ? fmoney(serviceDetail?.ServerpartInfo?.SERVERPART_AREA, 2) : '-'}m²</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_AREA ? fmoney(serviceDetail.ServerpartInfo.SERVERPART_AREA, 2) : '-'}m²</div>
</div>
<div className={'detailItem'}>
@ -393,7 +393,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={water} />
<span className={'itemLeftLabel'}>取水方式</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 1 ? '自来水' : serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 2 ? '井水' : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.WATERINTAKE_TYPE === 1 ? '自来水' : serviceDetail.ServerpartInfo.WATERINTAKE_TYPE === 2 ? '井水' : ''}</div>
</div>
<div className={'detailItem'}>
@ -401,7 +401,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={badWater} />
<span className={'itemLeftLabel'}>污水处理</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 1 ? '市政' : serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 2 ? '污水处理设备' : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 1 ? '市政' : serviceDetail.ServerpartInfo?.SEWAGEDISPOSAL_TYPE === 2 ? '污水处理设备' : ''}</div>
</div>
<div className={'detailItem'}>
@ -409,7 +409,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={fixed} />
<span className={'itemLeftLabel'}>市区县镇</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS ? serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.SERVERPART_ADDRESS ? serviceDetail.ServerpartInfo.SERVERPART_ADDRESS : ''}</div>
</div>
<div className={'detailItem'}>
@ -417,7 +417,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={managerUnit} />
<span className={'itemLeftLabel'}>管理单位</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.MANAGERCOMPANY ? serviceDetail?.ServerpartInfo?.MANAGERCOMPANY : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.MANAGERCOMPANY ? serviceDetail.ServerpartInfo.MANAGERCOMPANY : ''}</div>
</div>
<div className={'detailItem'}>
@ -425,7 +425,7 @@ const serviceAreaDetails = ({ onRef, onShow, id, width, onClose }: DetailProps)
<img className={'itemLeftIcon'} src={propryRight} />
<span className={'itemLeftLabel'}>产权单位</span>
</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.OWNEDCOMPANY ? serviceDetail?.ServerpartInfo?.OWNEDCOMPANY : ''}</div>
<div className={'detailItemRight'}>{serviceDetail?.ServerpartInfo?.OWNEDCOMPANY ? serviceDetail.ServerpartInfo.OWNEDCOMPANY : ''}</div>
</div>
</div>
: ''

194
src/pages/reports/audit/feedback/index.tsx
View File

@ -1,25 +1,25 @@
import { connect } from "umi";
import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
import React, { useRef, useState } from "react";
import {connect} from "umi";
import type {CurrentUser} from "umi";
import type {ConnectState} from "@/models/connect";
import React, {useRef, useState} from "react";
import ProCard from "@ant-design/pro-card";
import { MenuFoldOutlined } from "@ant-design/icons";
import type { FormInstance } from "antd";
import { Avatar, Button, Drawer, Menu, message, Space, Spin, Tree } from "antd";
import {MenuFoldOutlined} from "@ant-design/icons";
import type {FormInstance} from "antd";
import {Avatar, Button, Drawer, Menu, message, Space, Spin, Tree} from "antd";
import useRequest from "@ahooksjs/use-request";
import { getServerpartTree, handleCallLogs } from "@/services/options";
import type { ActionType } from "@ant-design/pro-table";
import {getServerpartTree, handleCallLogs} from "@/services/options";
import type {ActionType} from "@ant-design/pro-table";
import ProTable from "@ant-design/pro-table";
import ReactHTMLTableToExcel from "react-html-table-to-excel";
import SubMenu from "antd/lib/menu/SubMenu";
import moment from "moment/moment";
import { handleGetCHECKACCOUNTList, handleUpLoadAuditExplain } from "@/pages/reports/audit/feedback/service";
import {handleGetCHECKACCOUNTList, handleUpLoadAuditExplain} from "@/pages/reports/audit/feedback/service";
import AuditDetail from "@/pages/DataVerification/list/components/auditDetail";
import upload from '@/assets/upload.png'
import PageTitleBox from "@/components/PageTitleBox";
const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const checkAcount: React.FC<{ currentUser: CurrentUser}> = (props) => {
const { currentUser } = props
const downloadBtnRef = useRef<any>()
const actionRef = useRef<ActionType>();
@ -27,24 +27,24 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const [reqDetailList, setReqDetailList] = useState<any>(); // 合计项数据源
const [printOut, setPrintOut] = useState<any>(); // 打印数据的内容
const [collapsible, setCollapsible] = useState<boolean>(false)
const [treeView, setTreeView] = useState<any>()
const [treeView,setTreeView] = useState<any>()
// 加载服务区树
const { loading: treeLoading, data: treeViews } = useRequest(async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
setTreeView(data)
return data
})
// 树相关的属性和方法
// 树相关的属性和方法
const [selectedId, setSelectedId] = useState<string>()
// 导出的加载效果
const [showLoading, setShowLoading] = useState<boolean>(false)
// 导出的加载效果
const [showLoading,setShowLoading] = useState<boolean>(false)
// 是否显示打印的表格
const [showExportTable, setShowExportTable] = useState<boolean>(false)
const [showExportTable,setShowExportTable] = useState<boolean>(false)
const [currenMenu, setCurrenMenu] = useState<any>(); // 当前选中左侧菜单的服务区节点
// 点击稽查反馈出现的弹框
const [inspectionModal, setInspectionModal] = useState<boolean>(false)
const [inspectionModal,setInspectionModal] = useState<boolean>(false)
const auditDetailRef = useRef<any>()
const [currentRow, setCurrentRow] = useState<any>()
const [currentRow,setCurrentRow] = useState<any>()
const columns: any = [
{
@ -53,9 +53,9 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'TREATMENT_MARKSTATE',
valueType: 'select',
valueEnum: {
0: '全部',
1: '未反馈',
2: '未冲正'
0:'全部',
1:'未反馈',
2:'未冲正'
},
initialValue: '0'
},
@ -66,7 +66,7 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInTable: true,
hideInDescriptions: true,
colSize: 1,
initialValue: [moment().add(-1, 'month').format('YYYY-MM-DD'), moment().add(-1, "day").format('YYYY-MM-DD')],
initialValue: [moment().add(-1, 'month').format('YYYY-MM-DD'), moment().add(-1,"day").format('YYYY-MM-DD')],
search: {
transform: (value) => {
return {
@ -80,20 +80,20 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
},
{
title: '稽查类型',
title:'稽查类型',
hideInTable: true,
dataIndex: 'CHECK_TYPE',
dataIndex:'CHECK_TYPE',
valueType: 'select',
valueEnum: {
"": "全部",
"现场稽查": "现场稽查",
"区域稽查": "区域稽查",
"公司稽查": "公司稽查",
valueEnum:{
"":"全部",
"现场稽查":"现场稽查",
"区域稽查":"区域稽查",
"公司稽查":"公司稽查",
},
initialValue: ""
},
{
title: '图片上传',
title:'图片上传',
hideInTable: true,
hideInSearch: true,
dataIndex: ''
@ -115,25 +115,23 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
dataIndex: 'HasImage',
valueType: 'select',
valueEnum: {
"0": '全部',
"0":'全部',
"1": '支持',
"2": '不支持'
},
initialValue: "0"
},
{
title: <div style={{ textAlign: 'center' }}>{'序号'}</div>,
title: <div style={{textAlign:'center'}}>{'序号'}</div>,
hideInSearch: true,
width: 70,
align: 'center',
valueType: 'index',
dataIndex: 'index'
dataIndex: ''
},
{
title: <div style={{ textAlign: 'center' }}>{'服务区名称'}</div>,
title: <div style={{textAlign:'center'}}>{'服务区名称'}</div>,
hideInSearch: true,
width: 120,
ellipsis: true,
dataIndex: 'SERVERPART_NAME',
// render:(_,record)=>{
// return <div style={{display:'flex',alignItems:'center'}}>
@ -147,34 +145,34 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
// }
},
{
title: <div style={{ textAlign: 'center' }}>{'门店名称'}</div>,
title: <div style={{textAlign:'center'}}>{'门店名称'}</div>,
hideInSearch: true,
ellipsis: true,
width: 150,
dataIndex: 'SHOPNAME',
render: (_, record) => {
return <div style={{ display: 'flex', alignItems: 'center' }}>
render:(_,record)=>{
return <div style={{display:'flex',alignItems:'center'}}>
{
record?.HasImage ?
<img style={{ width: '20px', height: '20px' }} src={upload} />
: ''
<img style={{width:'20px',height:'20px'}} src={upload}/>
:''
}
{record?.SHOPNAME || ''}
{record?.SHOPNAME ||''}
</div>
}
},
{
title: <div style={{ textAlign: 'center' }}>{'稽核反馈'}</div>,
title: <div style={{textAlign:'center'}}>{'稽核反馈'}</div>,
width: 200,
ellipsis: true,
hideInSearch: true,
dataIndex: 'CHECKACCOUNT_DESC',
render: (_, record) => {
return <a onClick={() => {
render:(_,record)=>{
return <a onClick={()=>{
setCurrentRow({
...record,
Audit_Id: record.CHECKACCOUNT_ID,
MachineCode: record.MACHINECODE
MachineCode:record.MACHINECODE
})
setInspectionModal(true)
}}>
@ -183,54 +181,54 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
},
{
title: <div style={{ textAlign: 'center' }}>{'稽核误差率'}</div>,
title: <div style={{textAlign:'center'}}>{'稽核误差率'}</div>,
width: 140,
hideInSearch: true,
align: 'right',
dataIndex: 'ERROR_RATE',
render: (_, record) => {
return record?.ERROR_RATE ?
<span style={{ color: 'red', fontWeight: 'bold' }}>{`${record?.ERROR_RATE}%`}</span>
: '-'
render:(_,record)=>{
return record?.ERROR_RATE?
<span style={{color: 'red',fontWeight:'bold'}}>{`${record?.ERROR_RATE}%`}</span>
:'-'
}
},
{
title: <div style={{ textAlign: 'center' }}>{'长短款/冲正流水'}</div>,
title: <div style={{textAlign:'center'}}>{'长短款/冲正流水'}</div>,
width: 160,
hideInSearch: true,
align: 'right',
dataIndex: 'DIFFERENT_PRICE',
render: (_, record) => {
return <span style={{ color: record.DIFFERENT_PRICE < 0 || record?.REPLENISH_AMOUNT < 0 ? 'red' : record.DIFFERENT_PRICE > 0 || record?.REPLENISH_AMOUNT > 0 ? '#008000' : '', fontWeight: 'bold' }}>
render:(_,record)=>{
return <span style={{color:record.DIFFERENT_PRICE <0||record?.REPLENISH_AMOUNT<0?'red':record.DIFFERENT_PRICE >0||record?.REPLENISH_AMOUNT>0?'#008000':'',fontWeight:'bold' }}>
{`${record.DIFFERENT_PRICE || '0'}/${record?.REPLENISH_AMOUNT || '0'}`}
</span>
}
},
{
title: <div style={{ textAlign: 'center' }}>{'稽核现金/对客现金'}</div>,
title: <div style={{textAlign:'center'}}>{'稽核现金/对客现金'}</div>,
width: 160,
hideInSearch: true,
dataIndex: 'CASH',
align: 'right',
render: (_, record) => {
render:(_,record)=>{
return `${record.CASHPAY || ''}/${record?.CASH || ''}`
}
},
{
title: <div style={{ textAlign: 'center' }}>{'对客营收'}</div>,
title: <div style={{textAlign:'center'}}>{'对客营收'}</div>,
width: 120,
hideInSearch: true,
align: 'right',
dataIndex: 'TOTALSELLAMOUNT'
},
{
title: <div style={{ textAlign: 'center' }}>{'稽查时间'}</div>,
title: <div style={{textAlign:'center'}}>{'稽查时间'}</div>,
width: 160,
hideInSearch: true,
align: 'right',
dataIndex: 'CHECK_ENDDATE',
render: (_, record) => {
return record?.CALIBRATOR_DATE ? moment(record?.CHECK_ENDDATE).format('YYYY-MM-DD HH:mm:ss') : '-'
render: (_,record)=>{
return record?.CALIBRATOR_DATE?moment(record?.CHECK_ENDDATE).format('YYYY-MM-DD HH:mm:ss'):'-'
}
}
]
@ -257,7 +255,7 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
tempTable.remove() // 防止重复打印一个内容
}
// 查询的条件
const [searchParams, setSearchParams] = useState<any>()
const [searchParams,setSearchParams] = useState<any>()
return (
<div ref={(el) => {
@ -289,13 +287,13 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
borderRadius: '8px',
width: '200px'
}}>
<Spin />
<span style={{ marginLeft: '5px' }}>数据导出中...</span>
<Spin/>
<span style={{marginLeft: '5px'}}>数据导出中...</span>
</div>
</div> : ''
}
<div className={'saleReportHideBox'} style={{ position: 'fixed', zIndex: -1, top: 0, left: 0 }}>
<div className={'saleReportHideBox'} style={{position: 'fixed', zIndex: -1, top: 0, left: 0}}>
{
showExportTable && reqDetailList && reqDetailList.length > 0 ?
<ProTable
@ -308,16 +306,16 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
/> : ''
}
</div>
<div id='hiddenBox' style={{ position: 'fixed', zIndex: -1, top: 0, left: 0 }} />
<div id='hiddenBox' style={{position: 'fixed', zIndex: -1, top: 0, left: 0}}/>
<div style={{ backgroundColor: '#fff', display: 'flex' }}>
<div style={{backgroundColor: '#fff',display:'flex'}}>
<ProCard
style={{ width: !collapsible ? "300px" : "60px" }}
style={{width:!collapsible ? "300px" : "60px"}}
className="pageTable-leftnav"
bodyStyle={{ padding: 0, paddingTop: 20, paddingLeft: 20, width: !collapsible ? "300px" : "60px" }}
bodyStyle={{padding: 0, paddingTop: 20, paddingLeft: 20,width:!collapsible ? "300px" : "60px"}}
extra={<MenuFoldOutlined onClick={() => {
setCollapsible(!collapsible)
}} />}
}}/>}
colSpan={!collapsible ? "300px" : "60px"}
title={!collapsible ? "请选择服务区" : ""}
headerBordered
@ -347,7 +345,7 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
/> : ''}
</ProCard>
<div style={{
width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
width:!collapsible?'calc(100% - 300px)':'calc(100% - 60px)',
paddingTop: 0,
paddingBottom: 0,
paddingRight: 0
@ -358,34 +356,34 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
columns={columns}
bordered
headerTitle={<PageTitleBox props={props} />}
search={{ span: 6 }}
request={async (params) => {
if (!selectedId) {
search={{span: 6}}
request={async(params)=>{
if (!selectedId){
return
}
const req = {
SearchParameter: {
SearchParameter:{
...params,
TREATMENT_MARKSTATE: params.TREATMENT_MARKSTATE === '0' ? '' : params.TREATMENT_MARKSTATE,
TREATMENT_MARKSTATE:params.TREATMENT_MARKSTATE==='0'?'':params.TREATMENT_MARKSTATE,
SERVERPART_IDS: selectedId,
HasImage: params.HasImage === '0' ? null : params.HasImage === '1' ? true : params.HasImage === '2' ? false : '',
VALID: 1,// 有效
HasImage: params.HasImage==='0'?null:params.HasImage==='1'?true:params.HasImage==='2'?false:'',
VALID:1 ,// 有效
},
PageIndex: 1,
PageSize: 99999
PageIndex:1,
PageSize:99999
}
handleCallLogs()
setSearchParams(params)
const data = await handleGetCHECKACCOUNTList(req)
if (data && data.length > 0) {
if (data && data.length>0){
setReqDetailList(data)
return { data, success: true }
return {data,success: true}
}
return { data: [], success: true }
return {data: [],success: true}
}}
toolbar={{
actions: [
<span style={{ visibility: 'hidden' }}>
<span style={{visibility: 'hidden'}}>
<ReactHTMLTableToExcel
buttonText={'导出excel'}
ref={downloadBtnRef}
@ -429,29 +427,29 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
setInspectionModal(false);
}}
destroyOnClose={true}
footer={<div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', alignItems: 'center' }}>
footer={<div style={{display: 'flex', width: '100%', justifyContent: 'space-between',alignItems:'center'}}>
<div>
<Button danger onClick={() => {
auditDetailRef.current.setShowMoadl(!auditDetailRef.current.showModal)
}}>上传单据</Button>
</div>
<div>
<Button style={{ marginRight: '8px' }} onClick={() => {
<Button style={{marginRight: '8px'}} onClick={()=>{
setCurrentRow(undefined)
setInspectionModal(false);
}}>取消</Button>
<Button type='primary' onClick={async () => {
auditDetailRef.current?.auditFormRef.current.validateFields().then(async (res: any) => {
if (res) {
auditDetailRef.current?.auditFormRef.current.validateFields().then(async (res: any)=>{
if (res){
const res: any = auditDetailRef.current?.auditFormRef.current.getFieldsValue()
const detailObj: any = auditDetailRef.current?.detailRow
const imgList: any = auditDetailRef.current?.picList
let imgStr: string = ''
if (imgList && imgList.length > 0) {
imgList.forEach((item: any) => {
if (imgStr) {
imgStr += `,${item.url}`
} else {
if (imgList && imgList.length>0){
imgList.forEach((item: any)=>{
if (imgStr){
imgStr+=`,${item.url}`
}else{
imgStr = item.url
}
})
@ -459,19 +457,19 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const req: any = {
CheckAccount_Id: currentRow.Audit_Id,
auditExplain: res?.CheckAccount_Desc,
isAddIn: !detailObj?.Add_Amount && detailObj?.Add_Amount !== 0, // 有值false 没值true
imageInfo: imgStr,
isAddIn: !detailObj?.Add_Amount && detailObj?.Add_Amount!==0, // 有值false 没值true
imageInfo:imgStr,
// memberShipId:'',
provinceCode: currentUser.ProvinceCode,
addAmout: res?.Add_Amount
}
const data = await handleUpLoadAuditExplain(req)
if (data.Result_Code === 100) {
if (data.Result_Code===100){
message.success(data.Result_Desc)
setCurrentRow(undefined)
setInspectionModal(false);
actionRef.current?.reload()
} else {
}else{
message.error(data.Result_Desc)
}
}
@ -480,12 +478,12 @@ const checkAcount: React.FC<{ currentUser: CurrentUser }> = (props) => {
</div>
</div>}
>
<AuditDetail onRef={auditDetailRef} isShow={inspectionModal} rowDetail={currentRow} currentDetail={currentRow} />
<AuditDetail onRef={auditDetailRef} isShow={inspectionModal} rowDetail={currentRow} currentDetail={currentRow}/>
</Drawer>
</div>
)
}
export default connect(({ user }: ConnectState) => ({
export default connect(({user}: ConnectState) => ({
currentUser: user.currentUser
}))(checkAcount);

22
src/pages/reports/productControl/commodityInfo/index.tsx
View File

@ -110,6 +110,17 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
})
const [customClassList, setCustomClassList] = useState<any>()
const columns: any = [
{
title: '状态',
dataIndex: 'CommodityState',
hideInTable: true,
valueType: 'select',
valueEnum: {
0: { text: '无效' },
1: { text: '有效' }
},
initialValue: '1'
},
{
title: '服务区',
dataIndex: 'ServerpartID',
@ -141,17 +152,6 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
filterOption: (input, option) => (option?.label ?? '').toLowerCase().includes(input.toLowerCase()),
}
},
{
title: '状态',
dataIndex: 'CommodityState',
hideInTable: true,
valueType: 'select',
valueEnum: {
0: { text: '无效' },
1: { text: '有效' }
},
initialValue: '1'
},
{
dataIndex: 'searchText',
title: '查询内容',

41
src/pages/reports/productControl/commoditySearch/index.tsx
View File

@ -104,6 +104,17 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
})
const columns: any = [
{
title: '状态',
dataIndex: 'COMMODITY_STATE',
hideInTable: true,
valueType: 'select',
valueEnum: {
0: { text: '无效' },
1: { text: '有效' }
},
initialValue: '1'
},
{
title: '服务区',
dataIndex: 'ServerpartID',
@ -120,32 +131,11 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
filterOption: (input, option) => (option?.label ?? '').toLowerCase().includes(input.toLowerCase()),
}
},
{
title: '状态',
dataIndex: 'COMMODITY_STATE',
hideInTable: true,
valueType: 'select',
valueEnum: {
0: { text: '无效' },
1: { text: '有效' }
},
initialValue: '1'
},
{
dataIndex: 'searchText',
title: '查询内容',
hideInTable: true,
fieldProps: {
placeholder: "请输入商品名称/商品条码/商品类型"
}
},
{
title: <div style={{ textAlign: 'center' }}>序号</div>,
width: 70,
dataIndex: 'index',
hideInSearch: true,
align: 'center',
valueType: 'index'
},
{
@ -414,14 +404,12 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
const req: any = {
SearchType: 3,
ProvinceCode: currentUser?.ProvinceCode,
ProvinceCode: currentUser?.USER_PROVINCE,
CommodityTypeId: currenMenu === '999999' ? '' : currenMenu,
CommodityState: params?.COMMODITY_STATE,
ServerpartID: params?.ServerpartID,
PageIndex: 1,
PageSize: 999999,
SearchKey: "COMMODITY_NAME,COMMODITY_BARCODE",
SearchValue: params?.searchText || ""
PageSize: 999999
// PageSize: 20
}
handleCallLogs()
@ -880,7 +868,7 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
<Drawer
width={'60%'}
width={1000}
open={showDetail}
onClose={() => {
setCurrentRow(undefined)
@ -888,7 +876,6 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
}}
closable={false}
destroyOnClose
bodyStyle={{ padding: "24px" }}
>
<Detail currentRow={currentRow} currentUser={currentUser} treeView={treeView} />
</Drawer>

56
src/pages/reports/productControl/components/detail.tsx
View File

@ -1,7 +1,7 @@
import type { CurrentUser } from "umi";
import { connect } from "umi";
import type { ConnectState } from "@/models/connect";
import { Col, Row } from "antd";
import type { CurrentUser} from "umi";
import {connect} from "umi";
import type {ConnectState} from "@/models/connect";
import {Col, Row} from "antd";
import ProForm, {
ProFormDateTimePicker, ProFormDigit,
ProFormSelect,
@ -9,35 +9,35 @@ import ProForm, {
ProFormTextArea,
ProFormTreeSelect
} from "@ant-design/pro-form";
import { getServerpartTree } from "@/services/options";
import {getServerpartTree} from "@/services/options";
import moment from "moment/moment";
import React, { useEffect, useRef, useState } from "react";
import React, {useEffect, useRef, useState} from "react";
import './detail.less'
import { handleGetServerpartShopTrade } from "@/pages/reports/productControl/commodityInfo/service";
import {handleGetServerpartShopTrade} from "@/pages/reports/productControl/commodityInfo/service";
const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHotKey }: { currentUser?: any, treeView?: any, currentRow: any, showHotKeyEdit?: boolean, setGetNewHotKey: any }) => {
const detail = ({currentUser,treeView,currentRow,showHotKeyEdit,setGetNewHotKey}: {currentUser?: any,treeView?: any,currentRow: any,showHotKeyEdit?: boolean,setGetNewHotKey: any}) => {
const modalFormRef = useRef<any>();
const [commodityList, setCommodityList] = useState<any>([])
const [commodityList,setCommodityList] = useState<any>([])
useEffect(() => {
useEffect(()=>{
handleGetCommodity()
}, [currentRow])
const handleGetCommodity = async (id: any) => {
},[currentRow])
const handleGetCommodity = async (id: any)=>{
const req: any = {
ProvinceCode: currentUser?.USER_PROVINCE,
ServerpartId: currentRow?.SERVERPART_ID
}
const data = await handleGetServerpartShopTrade(req)
console.log('data', data)
console.log('data',data)
setCommodityList(data)
}
return (
<div style={{ width: '100%', boxSizing: 'border-box', padding: '24rpx' }}>
<div>
<ProForm
formRef={modalFormRef}
submitter={false}
initialValues={{ ...currentRow, ADDTIME: moment(currentRow?.ADDTIME).format('YYYY-MM-DD HH:mm:ss') }}
initialValues={currentRow}
layout={'horizontal'}
>
<div className={'modalTitle'}>商品基本信息</div>
@ -70,12 +70,12 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
data.forEach((item: any) => {
if (item.children && item.children.length > 0) {
item.children.forEach((subItem: any) => {
list.push({ label: subItem.label, value: subItem.value })
list.push({label: subItem.label, value: subItem.value})
})
}
})
data.forEach((item: any) => {
list.push({ label: item.label, value: item.value })
list.push({label: item.label, value: item.value})
})
}
return list
@ -133,7 +133,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="快捷键值"
readonly={!showHotKeyEdit}
fieldProps={{
onChange: (e: any) => {
onChange:(e: any)=>{
setGetNewHotKey(e.target.value)
}
}}
@ -145,7 +145,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="质量等级"
readonly
initialValue={1000}
options={[{ label: '一等品', value: 1000 }, { label: '二等品', value: 2000 }, { label: '三等品', value: 5000 }, { label: '优等品', value: 3000 }, { label: '合格品', value: 4000 },]}
options={[{label:'一等品',value:1000},{label:'二等品',value:2000},{label:'三等品',value:5000},{label:'优等品',value:3000},{label:'合格品',value:4000},]}
/>
</Col>
<Col span={8}>
@ -179,9 +179,9 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
</Col>
<Col span={24}>
<div style={{ marginBottom: '24px', display: 'flex', alignItems: "flex-start" }}>
<span style={{ display: 'inline-block', width: '70px' }}>商品说明：</span>
<span style={{ display: 'inline-block', whiteSpace: 'pre-line', lineHeight: '22px' }}>{currentRow?.COMMODITY_DESC}</span>
<div style={{marginBottom:'24px',display:'flex',alignItems:"flex-start"}}>
<span style={{display:'inline-block',width:'70px'}}>商品说明：</span>
<span style={{display:'inline-block',whiteSpace:'pre-line',lineHeight:'22px'}}>{currentRow?.COMMODITY_DESC}</span>
</div>
{/* <ProFormTextArea */}
{/* name="COMMODITY_DESC" */}
@ -198,7 +198,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="是否销售"
readonly
initialValue={1}
options={[{ label: '是', value: 1 }, { label: '否', value: 0 }]}
options={[{label:'是',value:1},{label:'否',value:0}]}
/>
</Col>
<Col span={8}>
@ -207,7 +207,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="是否散装"
readonly
initialValue={0}
options={[{ label: '是', value: 1 }, { label: '否', value: 0 }]}
options={[{label:'是',value:1},{label:'否',value:0}]}
/>
</Col>
<Col span={8}>
@ -216,7 +216,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="称重方式"
readonly
initialValue={1}
options={[{ label: '计价', value: 1 }, { label: '散装称重', value: 0 }]}
options={[{label:'计价',value:1},{label:'散装称重',value:0}]}
/>
</Col>
@ -227,7 +227,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
label="审核状态"
readonly
initialValue={1}
options={[{ label: '有效', value: 1 }, { label: '审核中', value: 2 }, { label: '无效', value: 0 }]}
options={[{label:'有效',value:1},{label:'审核中',value:2},{label:'无效',value:0}]}
/>
</Col>
<Col span={8}>
@ -314,7 +314,7 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
name="COMMODITY_FROZENCOUNT"
label="采购状态"
readonly
options={[{ label: '允许', value: 1000 }, { label: '禁止', value: 2000 }]}
options={[{label:'允许',value:1000},{label:'禁止',value:2000}]}
/>
</Col>
</Row>
@ -322,6 +322,6 @@ const detail = ({ currentUser, treeView, currentRow, showHotKeyEdit, setGetNewHo
</div>
)
}
export default connect(({ user }: ConnectState) => ({
export default connect(({user}: ConnectState) => ({
currentUser: user.currentUser
}))(detail);

3
src/pages/reports/productControl/hotkeyset/index.tsx
View File

@ -432,14 +432,13 @@ const hotkeyset: React.FC<{ currentUser: CurrentUser }> = (props) => {
</div>
<Drawer
width={'60%'}
width={1000}
open={showDetail}
onClose={() => {
setCurrentRow(undefined)
setShowDetail(false)
setShowHotKeyEdit(false)
}}
bodyStyle={{ padding: '24px' }}
closable={false}
destroyOnClose
footer={

6
src/pages/reports/revenueConfirmation/components/compareList.tsx
View File

@ -2054,11 +2054,8 @@ const compareList: React.FC<{
MobilePayCorrect: MobilePayCorrect || 0,
CashPayCorrect: CashPayCorrect || 0
}
console.log('reqreqrsdasda', req);
const data = await handleGetProjectPeriodIncome(req)
console.log('data3232', data)
console.log('compareCurrent3232', compareCurrent)
if (data && data.length > 0) {
const secondItem: any = data[0]
@ -2160,6 +2157,9 @@ const compareList: React.FC<{
}
}
// setSecondTable([data[0]])
}
if (handleGetRefreshTableData) {
handleGetRefreshTableData()

4
src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx
View File

@ -2422,10 +2422,6 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
if (isFirst.current) {
isFirst.current = false
console.log('isShowClosebtn.currentisShowClosebtn.current', isShowClosebtn.current);
console.log('parentRowparentRowparentRowparentRow', parentRow);
if (isYear && isShowClosebtn.current && parentRow?.PeriodClosed) {
handleCloseSettlement(closeReqTableDataRef.current)
} else if (isShowClosebtn.current && parentRow?.CLOSED_DATE && !isYear && parentRow?.PeriodClosed) {

42
src/pages/travelMember/ShoppingMallProductSearch/index.tsx
View File

@ -100,14 +100,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
// 当前查询的文字
const [currentSearchText, setCurrentSearchText] = useState<string>('')
// 预览上传后的图片
const handlePreview = async (type: number) => {
if (type === 1) {
setFileList(mainImgList)
} else if (type === 2) {
setFileList(headerImgList)
} else if (type === 3) {
setFileList(detailImgList)
}
const handlePreview = async () => {
setFileList(fileList)
setImagePreviewVisible(true)
};
const handleChangePreview = (val: any) => {
@ -695,26 +689,6 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
pagination={{ defaultPageSize: 10 }}
/>
</div>
{fileList && fileList.length > 0 && <div style={{ display: 'none' }}>
<Image.PreviewGroup
preview={{
visible: imagePreviewVisible,
onVisibleChange: vis => {
setImagePreviewVisible(vis)
}
}}>
{
fileList.map((n) =>
<Image src={n.url} key={n.url} />
)
}
</Image.PreviewGroup>
</div>}
{/* 添加商品的悬浮框 */}
<Modal
// title={currentRow ? '更新商品管理' : '新建商品管理'}
@ -1340,9 +1314,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
disabled
fieldProps={{
beforeUpload,
onPreview: () => {
handlePreview(1)
},
onPreview: handlePreview,
fileList: mainImgList, // 绑定 fileList
customRequest: ({ file, onSuccess }) => {
// 自定义上传，不实际发送请求
@ -1400,9 +1372,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
accept="image/*"
fieldProps={{
beforeUpload,
onPreview: () => {
handlePreview(2)
},
onPreview: handlePreview,
fileList: headerImgList, // 绑定 fileList
customRequest: ({ file, onSuccess }) => {
// 自定义上传，不实际发送请求
@ -1462,9 +1432,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
accept="image/*"
fieldProps={{
beforeUpload,
onPreview: () => {
handlePreview(3)
},
onPreview: handlePreview,
fileList: detailImgList, // 绑定 fileList
customRequest: ({ file, onSuccess }) => {
// 自定义上传，不实际发送请求

1
src/pages/travelMember/scenicSpotConfig/index.tsx
View File

@ -552,7 +552,6 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
// 编辑数据
newValue = { ...values, SCENICAREA_ID: currentRow.SCENICAREA_ID };
}
handleConfirmLoading(true)
// 如果有开关，要把开关的代码写进去
await handleAddUpdate(newValue);

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.54";
export const GIT_HASH = "26ef480";
export const BUILD_TIME = "2025-09-10T08:05:17.397Z";
export const VERSION = "4.5.51";
export const GIT_HASH = "a4729f7";
export const BUILD_TIME = "2025-09-08T03:14:16.308Z";