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

update

Browse Source
This commit is contained in:
ylj20011123 2025-08-15 17:41:32 +08:00
parent c145b6c9a5
commit cb0823bbcb
11 changed files with 199 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

4
src/pages/examine/monthSettlement/index.tsx
View File

@ -976,7 +976,9 @@ const monthSettlement: React.FC<{ currentUser?: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
if (list && list.length > 0 && list.length === 1) {

40
src/pages/examine/myApproval/index.tsx
View File

@ -123,32 +123,32 @@ const myApproval: React.FC<{ currentUser?: CurrentUser }> = (props) => {
hideInSearch: true,
valueType: 'select',
width: 150,
request: async ()=>{
request: async () => {
const req: any = {
SearchParameter:{
SearchParameter: {
APPROVALROUTE_VALID: 1,
OPERATION_TYPES: 11
},
SortStr:'APPROVALROUTE_STATE asc',
SortStr: 'APPROVALROUTE_STATE asc',
PageIndex: 1,
PageSize: 999999
}
const data = await handleGetAPPROVALROUTEList(req)
if (data && data.length>0){
if (data && data.length > 0) {
const list: any = []
data.forEach((item: any)=>{
list.push({label: item.APPROVALROUTE_NAME,value: item.APPROVALROUTE_STATE})
data.forEach((item: any) => {
list.push({ label: item.APPROVALROUTE_NAME, value: item.APPROVALROUTE_STATE })
})
list.push({label: '已审结',value: 9000})
list.push({label: '已驳回',value: 3000})
list.push({ label: '已审结', value: 9000 })
list.push({ label: '已驳回', value: 3000 })
let str: string = ''
list.forEach((item: any)=>{
if (item.value===3000){
list.forEach((item: any) => {
if (item.value === 3000) {
}else{
if(str){
str+=`,${item.value}`
}else{
} else {
if (str) {
str += `,${item.value}`
} else {
str = item.value
}
}
@ -225,7 +225,7 @@ const myApproval: React.FC<{ currentUser?: CurrentUser }> = (props) => {
]
// 驳回还是审核 审核1 驳回2
const handleGetToExamine = async (desc: string, target: any,nextPerson: any) => {
const handleGetToExamine = async (desc: string, target: any, nextPerson: any) => {
let req: any = {}
let data: any = {}
// 审核
@ -306,7 +306,7 @@ const myApproval: React.FC<{ currentUser?: CurrentUser }> = (props) => {
formDescRef.current.validateFields().then(res => {
if (res.desc) {
// setDescText(res.desc)
handleGetToExamine(res.desc, res.targetProinstState,res.APPROVALSTAFF_ID)
handleGetToExamine(res.desc, res.targetProinstState, res.APPROVALSTAFF_ID)
setDescText('')
}
})
@ -357,7 +357,7 @@ const myApproval: React.FC<{ currentUser?: CurrentUser }> = (props) => {
}
{
getType === 1 && proinstRow?.NextState!==9000 ?
getType === 1 && proinstRow?.NextState !== 9000 ?
<ProFormSelect
name="APPROVALSTAFF_ID"
label="审批人"
@ -372,10 +372,12 @@ const myApproval: React.FC<{ currentUser?: CurrentUser }> = (props) => {
BUSINESSAPPROVALId: proinstRow?.BusinessApproval_ID
}
const data = await handleGetGetBUSINESSAPPROVALDetail(req)
const list: any = []
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
if (list && list.length > 0 && list.length === 1) {

8
src/pages/market/marketResearch/index.tsx
View File

@ -325,7 +325,9 @@ const marketResearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
@ -653,7 +655,9 @@ const marketResearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
return list

238
src/pages/market/marketSearch/index.tsx
View File

@ -1,70 +1,70 @@
import type {CurrentUser} from "@/models/user";
import type {ConnectState} from "@/models/connect";
import {connect} from "umi";
import React, {useEffect, useRef,useState} from "react";
import type {ActionType} from "@ant-design/pro-table";
import { ProTable} from "@ant-design/pro-table";
import type {FormInstance} from "antd/es/form/hooks/useForm";
import {Button, Drawer, message, Space,Image,Popconfirm} from "antd";
import type { CurrentUser } from "@/models/user";
import type { ConnectState } from "@/models/connect";
import { connect } from "umi";
import React, { useEffect, useRef, useState } from "react";
import type { ActionType } from "@ant-design/pro-table";
import { ProTable } from "@ant-design/pro-table";
import type { FormInstance } from "antd/es/form/hooks/useForm";
import { Button, Drawer, message, Space, Image, Popconfirm } from "antd";
import './style.less'
import {
handleGetBUSINESSAPPROVALDetail,
handleGetBusinessProcessList, handleGetSupplierDDL,
handleGetWAREHOUSETree, handleSynchroBUSINESSAPPROVAL
} from "@/pages/market/marketResearch/service";
import {handleGetAPPROVALROUTEList} from "@/pages/Setting/serviceConfig/service";
import {handleGetAPPROVALROUTEDetail} from "@/pages/reports/revenueConfirmation/components/service";
import {GetPictureList} from "@/pages/supplier/inspectionReport/service";
import { handleGetAPPROVALROUTEList } from "@/pages/Setting/serviceConfig/service";
import { handleGetAPPROVALROUTEDetail } from "@/pages/reports/revenueConfirmation/components/service";
import { GetPictureList } from "@/pages/supplier/inspectionReport/service";
import LoadingBox from "@/pages/reports/Finance/businessAnalysis/components/loading";
import fileIcon from "@/assets/fileIcon.svg";
import ProForm, {ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton,ProFormTreeSelect} from "@ant-design/pro-form";
import ProForm, { ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton, ProFormTreeSelect } from "@ant-design/pro-form";
import moment from "moment/moment";
import ReviewProcess from "@/pages/reports/revenueConfirmation/components/ReviewProcess";
const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
const marketSearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
const { currentUser } = props
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const detailFormRef = useRef<FormInstance>();
const [getType,setGetType] = useState<number>(0) // 3为查看详情
const [proinstRow,setProinstRow] = useState<any>()
const [getType, setGetType] = useState<number>(0) // 3为查看详情
const [proinstRow, setProinstRow] = useState<any>()
// 选择的行数据
const [currentRow,setCurrentRow] = useState<any>()
const [currentRow, setCurrentRow] = useState<any>()
// 上传附件的抽屉
const [showDrawer,setShowDrawer] = useState<boolean>(false)
const [showDrawer, setShowDrawer] = useState<boolean>(false)
// 审批人数组
const [APPROVALSTAFFIDList,setAPPROVALSTAFFIDList] = useState<any>()
const [APPROVALSTAFFIDList, setAPPROVALSTAFFIDList] = useState<any>()
// 附件列表的加载效果
const [fileListLoading,setFileListLoading] = useState<boolean>(false)
const [fileListLoading, setFileListLoading] = useState<boolean>(false)
// 附件列表
const [fileList,setFileList] = useState<any>()
const [fileList, setFileList] = useState<any>()
// 默认查询的流程状态
const [isMerchantState,setIsMerchantState] = useState<string>('')
const [isMerchantState, setIsMerchantState] = useState<string>('')
// 判断是不是第一次进入页面 第一次进入不调列表查询
const [isFirst,setFirst] = useState<boolean>(true)
const [isFirst, setFirst] = useState<boolean>(true)
// 显示审核流程抽屉
const [showReviewProcess,setShowReviewProcess] = useState<boolean>(false)
const [showReviewProcess, setShowReviewProcess] = useState<boolean>(false)
// 审批环节数组
const [stateList,setStateList] = useState<any>()
const [stateList, setStateList] = useState<any>()
const columns: any = [
{
title:'业务名称',
dataIndex:'BusinessProcess_Name',
title: '业务名称',
dataIndex: 'BusinessProcess_Name',
width: 250,
ellipsis:true,
render:(_,record)=>{
return <a onClick={async ()=>{
const data = await handleGetBUSINESSAPPROVALDetail({BUSINESSAPPROVALId: record?.BusinessApproval_ID})
console.log('data22',data)
ellipsis: true,
render: (_, record) => {
return <a onClick={async () => {
const data = await handleGetBUSINESSAPPROVALDetail({ BUSINESSAPPROVALId: record?.BusinessApproval_ID })
console.log('data22', data)
setGetType(3)
setProinstRow(record)
const res = data
if (res.SERVERPART_IDS && res.SERVERPART_IDS.indexOf(',')!==-1){
const [serverid,managerid] = res.SERVERPART_IDS.split(',')
if (res.SERVERPART_IDS && res.SERVERPART_IDS.indexOf(',') !== -1) {
const [serverid, managerid] = res.SERVERPART_IDS.split(',')
res.Serverpart_ID = Number(serverid)
res.managerId = Number(managerid)
}
@ -74,7 +74,7 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
APPROVALSTAFF_ID: `${res.APPOVED_NAME}-${res.APPOVED_IDS}`,
BusinessApprovalId: record?.BusinessApproval_ID
})
console.log('CurrentRow',{
console.log('CurrentRow', {
...record,
...res,
})
@ -83,14 +83,14 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
}
},
{
title:'审批环节',
dataIndex:'BusinessProcess_State',
title: '审批环节',
dataIndex: 'BusinessProcess_State',
valueType: 'select',
width: 150,
ellipsis:true,
request: async ()=>{
ellipsis: true,
request: async () => {
const req: any = {
SearchParameter:{
SearchParameter: {
APPROVALROUTE_VALID: 1,
OPERATION_TYPES: 13
},
@ -98,22 +98,22 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
PageSize: 999999
}
const data = await handleGetAPPROVALROUTEList(req)
console.log('data',data)
if (data && data.length>0){
console.log('data', data)
if (data && data.length > 0) {
const list: any = []
let merchantState: string = ''
data.forEach((item: any)=>{
if (merchantState){
merchantState += `,${item.APPROVALROUTE_STATE}`
}else{
merchantState = item.APPROVALROUTE_STATE
}
list.push({label: item.APPROVALROUTE_NAME,value: item.APPROVALROUTE_STATE})
data.forEach((item: any) => {
if (merchantState) {
merchantState += `,${item.APPROVALROUTE_STATE}`
} else {
merchantState = item.APPROVALROUTE_STATE
}
list.push({ label: item.APPROVALROUTE_NAME, value: item.APPROVALROUTE_STATE })
})
merchantState+=',9000'
list.push({label:'已审结',value: 9000})
merchantState += ',9000'
list.push({ label: '已审结', value: 9000 })
setIsMerchantState(merchantState)
list.push({label:'已驳回',value: 3000})
list.push({ label: '已驳回', value: 3000 })
setStateList(list)
return list
@ -140,60 +140,60 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
}
},
{
title:'服务区名称',
dataIndex:'Serverpart_Name',
title: '服务区名称',
dataIndex: 'Serverpart_Name',
width: 150,
ellipsis:true,
ellipsis: true,
hideInSearch: true,
render:(_,record)=>{
return record?.Serverpart_Name?record?.Serverpart_Name.split(',')[0]:''
render: (_, record) => {
return record?.Serverpart_Name ? record?.Serverpart_Name.split(',')[0] : ''
}
},
{
title:'管理处名称',
dataIndex:'管理处名称',
title: '管理处名称',
dataIndex: '管理处名称',
width: 150,
ellipsis:true,
ellipsis: true,
hideInSearch: true,
render:(_,record)=>{
return record?.Serverpart_Name?record?.Serverpart_Name.split(',')[1]:''
render: (_, record) => {
return record?.Serverpart_Name ? record?.Serverpart_Name.split(',')[1] : ''
}
},
{
title:'备注说明',
dataIndex:'BusinessProcess_Desc',
title: '备注说明',
dataIndex: 'BusinessProcess_Desc',
width: 300,
ellipsis:true,
ellipsis: true,
hideInSearch: true,
},
{
title:'供应商名称',
dataIndex:'BusinessProcess_ID',
title: '供应商名称',
dataIndex: 'BusinessProcess_ID',
width: 200,
ellipsis:true,
ellipsis: true,
hideInSearch: true,
valueType: 'select',
request:async ()=>{
request: async () => {
const req: any = {
ProvinceCode: currentUser?.ProvinceCode
}
const data = await handleGetSupplierDDL(req)
console.log('data',data)
console.log('data', data)
return data
}
},
{
title:'申请时间',
dataIndex:'BusinessProcess_StartDate',
title: '申请时间',
dataIndex: 'BusinessProcess_StartDate',
width: 150,
ellipsis:true,
ellipsis: true,
hideInSearch: true,
},
]
// 获得审批人列表的方法
const handleGetPersonList = async (serverpartId: any,managerId: any)=>{
if (serverpartId && managerId){
// 获得审批人列表的方法
const handleGetPersonList = async (serverpartId: any, managerId: any) => {
if (serverpartId && managerId) {
const id: string = `${serverpartId},${managerId}`
const req: any = {
OperationType: 13,
@ -204,37 +204,39 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
}
const data = await handleGetAPPROVALROUTEDetail(req)
const list: any = []
if (data.UserList && data.UserList.length>0){
data.UserList.forEach((item: any)=>{
list.push({label: item.USER_NAME,value: `${item.USER_NAME}-${item.USER_ID}`})
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
console.log('321312list',list)
console.log('321312list', list)
setAPPROVALSTAFFIDList(list)
}
}
// 查询图片列表
const handleGetPictureList = async (id: string)=>{
const handleGetPictureList = async (id: string) => {
setFileListLoading(true)
const req: any = {
TableId: id,
TableType: 1128,
}
const data = await GetPictureList(req)
console.log('data',data)
console.log('data', data)
setFileList(data)
setFileListLoading(false)
}
useEffect(() => {
if (showDrawer){
if (showDrawer) {
// 拿到服务区 和管理处的选择列表
// handleGetManagerList()
// 拿到下一阶段人的数据
handleGetPersonList(currentRow?.Serverpart_ID,currentRow?.managerId)
handleGetPersonList(currentRow?.Serverpart_ID, currentRow?.managerId)
// 图片的数组
if (currentRow){
if (currentRow) {
handleGetPictureList(currentRow?.BUSINESSAPPROVAL_ID)
}
}
@ -248,8 +250,8 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
formRef={formRef}
columns={columns}
bordered
request={async(params: any)=>{
if (isFirst){
request={async (params: any) => {
if (isFirst) {
setFirst(false)
return
}
@ -265,19 +267,19 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
BusinessProcess_StartDate: params.StartDate || '',
BusinessProcess_EndDate: params.EndDate || '',
},
keyWord:{
Key:'BusinessProcess_Name',
keyWord: {
Key: 'BusinessProcess_Name',
Value: params?.BusinessProcess_Name || ''
}
}
const data = await handleGetBusinessProcessList(req)
console.log('data',data)
if (data && data.length>0){
return {data, success: true}
console.log('data', data)
if (data && data.length > 0) {
return { data, success: true }
}
return {data:[],success: true}
return { data: [], success: true }
}}
/>
/>
<Drawer
@ -309,7 +311,7 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
initialValues={currentRow}
>
{
getType===3?
getType === 3 ?
<ProFormTreeSelect
label={'审批环节'}
name={'BusinessProcess_State'}
@ -318,7 +320,7 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
options: stateList
}}
/>
:''
: ''
}
@ -329,7 +331,7 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
rules={[
{
required: true,
message:'请输入业务名称'
message: '请输入业务名称'
}
]}
/>
@ -341,17 +343,17 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
rules={[
{
required: true,
message:'请选择服务区'
message: '请选择服务区'
}
]}
request={async()=>{
request={async () => {
const req: any = {
wareHouseType: 2,
showSite: false
}
const data = await handleGetWAREHOUSETree(req)
console.log('list',data)
if (data && data.length>0){
console.log('list', data)
if (data && data.length > 0) {
return data
}
return []
@ -368,19 +370,19 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
title: "label",
},
}}
request={async()=>{
if (getType>0){
request={async () => {
if (getType > 0) {
const id = currentRow?.SERVERPART_IDS.split(',')[1] || ''
const name = currentRow?.SERVERPART_NAME.split(',')[1] || ''
return [{label: name,value: id}]
return [{ label: name, value: id }]
}
const req: any = {
wareHouseType: 1,
showSite: false
}
const data = await handleGetWAREHOUSETree(req)
console.log('list',data)
if (data && data.length>0){
console.log('list', data)
if (data && data.length > 0) {
return data
}
return []
@ -389,18 +391,18 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
rules={[
{
required: true,
message:'请选择管理处'
message: '请选择管理处'
}
]}
/>
{
getType===3?
getType === 3 ?
<ProFormText
label={'申请人'}
name={'Staff_Name'}
readonly
/>:''
/> : ''
}
<ProFormSelect
@ -427,17 +429,17 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
</ProForm>
{
getType>0?
<Button type={'primary'} style={{marginTop:'24px'}} onClick={()=>{
console.log('currentRow',currentRow)
getType > 0 ?
<Button type={'primary'} style={{ marginTop: '24px' }} onClick={() => {
console.log('currentRow', currentRow)
setShowReviewProcess(true);
}}>查看流程进度</Button>:''
}}>查看流程进度</Button> : ''
}
</div>
<div className={'contentRight'}>
<p className={'fileListTitle'}>附件列表</p>
{
fileListLoading ? <LoadingBox/> :
fileListLoading ? <LoadingBox /> :
<div className={'imgListBox'}>
{
fileList && fileList.length > 0 ?
@ -445,9 +447,9 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
return <div className={'imgItem'}>
{
item.ImageUrl.indexOf('.png') !== -1 || item.ImageUrl.indexOf('.jpg') !== -1 || item.ImageUrl.indexOf('.jpeg') !== -1 ?
<Image width={200} height={200} className={'imgBox'} src={item.ImageUrl}/> :
<Image width={200} height={200} className={'imgBox'} src={item.ImageUrl} /> :
<div className={'otherFile'}>
<img className={'fileIcon'} src={fileIcon}/>
<img className={'fileIcon'} src={fileIcon} />
<a onClick={() => {
window.open(item.ImageUrl)
}}>{item.ImageName || ''}</a>
@ -472,15 +474,15 @@ const marketSearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
setShowReviewProcess(false);
}}
destroyOnClose
bodyStyle={{backgroundColor: "#f9f9f9", padding: 16}}
bodyStyle={{ backgroundColor: "#f9f9f9", padding: 16 }}
closable={false}
>
<ReviewProcess compareCurrent={currentRow} showReviewProcess={showReviewProcess}/>
<ReviewProcess compareCurrent={currentRow} showReviewProcess={showReviewProcess} />
</Drawer>
</div>
)
}
export default connect(({user,}: ConnectState) => ({
export default connect(({ user, }: ConnectState) => ({
currentUser: user.currentUser,
}))(marketSearch);

20
src/pages/productManager/shopManager/components/shopDetail.tsx
View File

@ -305,7 +305,9 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
setNextPersonList(list)
@ -464,7 +466,7 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
approveedStaffName: backObj?.APPROVALSTAFF_NAME,
approveedInfo: res.processDesc,
targetProinstState: backObj?.APPROVALROUTE_STATE
}
}
data = await handleRejectRTGoodsAutoTypeProinst(req)
}
console.log('req', req);
@ -538,8 +540,8 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
businessApprovelId: currentDetail?.BusinessApproval_ID,
}
console.log('shopReq',shopReq);
console.log('shopReq', shopReq);
handleGetGoodsListByType(shopReq).then(res => {
console.log('res123', res);
if (res && res.length > 0) {
@ -693,7 +695,7 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
let res = detailFormRef.current?.getFieldValue('managerId')
console.log('res', res);
if (res && res.length>0) {
if (res && res.length > 0) {
} else {
setManagerIdRequired(true)
setServerpartRequired(true)
@ -773,7 +775,7 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
detailFormRef.current?.validateFields(['Serverpart_ID'])
} else {
let res = detailFormRef.current?.getFieldValue('Serverpart_ID')
if (res && res.length>0) {
if (res && res.length > 0) {
} else {
setManagerIdRequired(true)
setServerpartRequired(true)
@ -932,14 +934,14 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
detailFormRef.current?.validateFields().then(res => {
console.log('res', res);
if (res.managerId && res.managerId.length>0 && res.Serverpart_ID&& res.Serverpart_ID.length>0) {
if (res.managerId && res.managerId.length > 0 && res.Serverpart_ID && res.Serverpart_ID.length > 0) {
setShowManagerTable(true)
setShowServerpartTable(true)
setSelectTab('1')
} else if (res.managerId&& res.managerId.length>0) {
} else if (res.managerId && res.managerId.length > 0) {
setShowManagerTable(true)
setSelectTab('2')
} else if (res.Serverpart_ID&& res.Serverpart_ID.length>0) {
} else if (res.Serverpart_ID && res.Serverpart_ID.length > 0) {
setShowServerpartTable(true)
setSelectTab('1')
}

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

@ -3885,7 +3885,9 @@ const compareList: React.FC<{
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
}
})
}

7
src/pages/reports/settlementAccount/component/afterSettlement.tsx
View File

@ -640,6 +640,9 @@ const AfterSettlement = ({ parentRow, dataRef, onShow, setIsFinishCalibration, o
if (parentRow?.BUSINESSAPPROVAL_ID) {
detailData = await handleGetBUSINESSAPPROVALDetail(detailReq)
}
console.log('detailData', detailData);
const list: any = []
if (detailData.REJECT_TYPE === 2) {
const nowPersonList: any = detailData.approveList[detailData.approveList.length - 1]
@ -653,7 +656,9 @@ const AfterSettlement = ({ parentRow, dataRef, onShow, setIsFinishCalibration, o
setNextState(undefined)
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
if (list && list.length > 0 && list.length === 1) {

20
src/pages/reports/settlementAccount/index copy.tsx
View File

@ -883,7 +883,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
width: 150,
hideInSearch: true,
render: (_, record) => {
return showSettlementDrawer ? <span style={{ color: '#1890ff' }}>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00') }${record?.addRevenueMoney ? `（${record?.addRevenueMoney > 0 ? '+' : record?.addRevenueMoney < 0 ? '-' : ''}${record?.addRevenueMoney}）` : ''}` : '0'}</span> : record.level === 1 ? <a onClick={() => {
return showSettlementDrawer ? <span style={{ color: '#1890ff' }}>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00')}${record?.addRevenueMoney ? `（${record?.addRevenueMoney > 0 ? '+' : record?.addRevenueMoney < 0 ? '-' : ''}${record?.addRevenueMoney}）` : ''}` : '0'}</span> : record.level === 1 ? <a onClick={() => {
if (record?.SETTLEMENT_TYPE === '2') {
return
}
@ -904,9 +904,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
setCurrentCompareRow(obj)
setShowCompareDrawer(true)
}}>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00') }${record?.CORRECT_AMOUNT ? `（${record?.CORRECT_AMOUNT > 0 ? '+' : record?.CORRECT_AMOUNT < 0 ? '' : ''}${record?.CORRECT_AMOUNT}）` : ''}` : '0'}</a> :
}}>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00')}${record?.CORRECT_AMOUNT ? `（${record?.CORRECT_AMOUNT > 0 ? '+' : record?.CORRECT_AMOUNT < 0 ? '' : ''}${record?.CORRECT_AMOUNT}）` : ''}` : '0'}</a> :
showToExamineModal ?
<span>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00') }${record?.CORRECT_AMOUNT ? `（${record?.CORRECT_AMOUNT > 0 ? '+' : record?.CORRECT_AMOUNT < 0 ? '' : ''}${record?.CORRECT_AMOUNT}）` : ''}` : '0'}</span> :
<span>{record?.RevenueAmount ? `${numeral(getMoney(record?.RevenueAmount)).format('0,0.00')}${record?.CORRECT_AMOUNT ? `（${record?.CORRECT_AMOUNT > 0 ? '+' : record?.CORRECT_AMOUNT < 0 ? '' : ''}${record?.CORRECT_AMOUNT}）` : ''}` : '0'}</span> :
<span>{record?.RevenueAmount ? numeral(getMoney(record?.RevenueAmount)).format('0,0.00') : '0'}</span>
}
}
@ -1224,7 +1224,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
align: 'right',
hideInSearch: true,
render: (_, record) => {
const title: string = `分润营业额(${record.REVENUEDAILY_AMOUNTTotal}) * 提成比例(${record.GUARANTEERATIO?`${record.GUARANTEERATIO}%`:''})`
const title: string = `分润营业额(${record.REVENUEDAILY_AMOUNTTotal}) * 提成比例(${record.GUARANTEERATIO ? `${record.GUARANTEERATIO}%` : ''})`
return record.GUARANTEERATIO ? <Tooltip title={title}>
<span>{numeral(record?.GUARANTEERATIOAMOUNT).format('0,0.00')}</span>
</Tooltip> : <span>{numeral(record?.GUARANTEERATIOAMOUNT).format('0,0.00')}</span>
@ -3444,8 +3444,8 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
setProFormLoading(false)
return { CORRECT_AMOUNT: obj?.CorrectAmount || 0 }
}
setProFormLoading(false)
return {}
setProFormLoading(false)
return {}
}}
>
@ -3479,7 +3479,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
if (list && list.length > 0 && list.length === 1) {
@ -3882,7 +3884,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
if (list && list.length > 0 && list.length === 1) {

20
src/pages/reports/settlementAccount/old.tsx
View File

@ -1135,7 +1135,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
width: 120,
hideInSearch: true,
render: (_, record) => {
const str: string = `租金(${numeral(record?.GuaranteeFee).format('0.00')}) ${record?.GuaranteeFee > (record?.RevenueAmount * (record?.GuaranteeRatio) / 100) ? '>' : '<'} 营业额(${record?.RevenueAmount || 0}) * 提成比率(${record?.GuaranteeRatio ? `${record?.GuaranteeRatio }%` : ''})`
const str: string = `租金(${numeral(record?.GuaranteeFee).format('0.00')}) ${record?.GuaranteeFee > (record?.RevenueAmount * (record?.GuaranteeRatio) / 100) ? '>' : '<'} 营业额(${record?.RevenueAmount || 0}) * 提成比率(${record?.GuaranteeRatio ? `${record?.GuaranteeRatio}%` : ''})`
return record?.GuaranteeFee ?
<Tooltip title={str}>
<span>{numeral(record?.GuaranteeFee).format('0,0.00')}</span>
@ -2872,7 +2872,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
<td>{exportData2Obj?.PeriodDesc || ''}</td>
<td></td>
<td></td>
<td>{exportData2Obj?.GuaranteeRatio ? `${exportData2Obj?.GuaranteeRatio }%` : ''}</td>
<td>{exportData2Obj?.GuaranteeRatio ? `${exportData2Obj?.GuaranteeRatio}%` : ''}</td>
<td>{numeral(exportData2Obj?.CashAmount).format('0,0.00')}</td>
<td>{numeral(exportData2Obj?.MobilePayAmount).format('0,0.00')}</td>
<td>{numeral(exportData2Obj?.RevenueAmount).format('0,0.00')}</td>
@ -3967,9 +3967,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
const data = await handleGetProjectPeriodAccount(req)
console.log('data', data);
if(data.ProjectPeriodList && data.ProjectPeriodList.length>0){
if (data.ProjectPeriodList && data.ProjectPeriodList.length > 0) {
const res: any = wrapTreeNode(data.ProjectPeriodList)
settlementRef.current?.setFieldsValue({CORRECT_AMOUNT: res[0].CorrectAmount})
settlementRef.current?.setFieldsValue({ CORRECT_AMOUNT: res[0].CorrectAmount })
}
// setTableLoading(true)
@ -4277,7 +4277,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
})
}
if (list && list.length > 0 && list.length === 1) {
@ -4774,7 +4776,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
if (list && list.length > 0 && list.length === 1) {
@ -4938,7 +4942,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = []
if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => {
list.push({ label: item.USER_NAME, value: item.USER_ID })
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID })
}
})
}
if (list && list.length > 0 && list.length === 1) {

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.24";
export const GIT_HASH = "415f6a5";
export const BUILD_TIME = "2025-08-14T01:28:36.852Z";
export const VERSION = "4.5.26";
export const GIT_HASH = "c145b6c";
export const BUILD_TIME = "2025-08-15T08:20:30.752Z";