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", "name": "ant-design-pro",
"version": "4.5.24", "version": "4.5.26",
"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": {

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

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

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

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

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

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

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

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

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

@ -305,7 +305,9 @@ const shopDetail = ({ type, currentUser, setAddShopDrawer, currentDetail, showCo
const list: any = [] const list: any = []
if (data.UserList && data.UserList.length > 0) { if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => { data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` }) list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
}) })
} }
setNextPersonList(list) setNextPersonList(list)

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

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

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

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

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

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

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

@ -4277,7 +4277,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = [] const list: any = []
if (data.UserList && data.UserList.length > 0) { if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => { data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` }) list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
}
}) })
} }
if (list && list.length > 0 && list.length === 1) { if (list && list.length > 0 && list.length === 1) {
@ -4774,7 +4776,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = [] const list: any = []
if (data.UserList && data.UserList.length > 0) { if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => { data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID }) list.push({ label: item.USER_NAME, value: item.USER_ID })
}
}) })
} }
if (list && list.length > 0 && list.length === 1) { if (list && list.length > 0 && list.length === 1) {
@ -4938,7 +4942,9 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
const list: any = [] const list: any = []
if (data.UserList && data.UserList.length > 0) { if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach((item: any) => { data.UserList.forEach((item: any) => {
if (item.USER_STATUS === 1) {
list.push({ label: item.USER_NAME, value: item.USER_ID }) list.push({ label: item.USER_NAME, value: item.USER_ID })
}
}) })
} }
if (list && list.length > 0 && list.length === 1) { if (list && list.length > 0 && list.length === 1) {

6
src/versionEnv.ts
View File

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