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

first commit

Browse Source
This commit is contained in:
ylj20011123 2025-08-21 19:14:08 +08:00
parent 1ce314d533
commit e03ffe4902
14 changed files with 44 additions and 30 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.32", "version": "4.5.35",
"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": {

BIN
src/assets/tab/upMenu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/assets/versionChange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

4
src/layouts/BasicLayout.tsx
View File

@ -21,14 +21,14 @@ import Authorized from '@/utils/Authorized';
import RightContent from '@/components/GlobalHeader/RightContent'; import RightContent from '@/components/GlobalHeader/RightContent';
import type { ConnectState } from '@/models/connect'; import type { ConnectState } from '@/models/connect';
import { getMatchMenu } from '@umijs/route-utils'; import { getMatchMenu } from '@umijs/route-utils';
import logo from '../assets/logo.svg'; import logo from '../assets/logo.png';
import './BasicLayout.less' import './BasicLayout.less'
import { DoubleRightOutlined } from '@ant-design/icons'; import { DoubleRightOutlined } from '@ant-design/icons';
import * as Icon from '@ant-design/icons' import * as Icon from '@ant-design/icons'
import IconFont from '@/components/IconFont'; import IconFont from '@/components/IconFont';
import type { CurrentUser } from '@/models/user' import type { CurrentUser } from '@/models/user'
import session from '@/utils/session'; import session from '@/utils/session';
import upMenu from '@/assets/tab/upMenu.svg' import upMenu from '../assets/tab/upMenu.png'
import { getFieldEnum, getFieldEnumTravel, getFieldEnumTree, getFieldGetFieEnumList, getTravelFieldEnumTree, handleGetFieldEnumTreeTravel, handleGetNestingFIELDENUMList } from "@/services/options"; import { getFieldEnum, getFieldEnumTravel, getFieldEnumTree, getFieldGetFieEnumList, getTravelFieldEnumTree, handleGetFieldEnumTreeTravel, handleGetNestingFIELDENUMList } from "@/services/options";
import { handleGetServerpartTree } from '@/pages/basicManage/serverpartAssets/service'; import { handleGetServerpartTree } from '@/pages/basicManage/serverpartAssets/service';
import { handeGetFieldEnumByFieldYN, handeGetNestingFIELDENUMList } from '@/pages/travelMember/service'; import { handeGetFieldEnumByFieldYN, handeGetNestingFIELDENUMList } from '@/pages/travelMember/service';

2
src/pages/DataVerification/list/list.tsx
View File

@ -38,7 +38,7 @@ import interfaceImg from '@/assets/DataVerification/interface.png'
import defaultIcon from '@/assets/brand/defaultIcon.png' import defaultIcon from '@/assets/brand/defaultIcon.png'
import ItemDetail from './components/ItemDetail' import ItemDetail from './components/ItemDetail'
import { dailyVerifyEndaccount, handleGetAccountList, handleGetServiceShopList, submitEndaccountState } from "@/pages/DataVerification/service"; import { dailyVerifyEndaccount, handleGetAccountList, handleGetServiceShopList, submitEndaccountState } from "@/pages/DataVerification/service";
import changeIcon from '@/assets/versionChange.svg' import changeIcon from '../../../assets/versionChange.png'
import ProForm, { ProFormInstance, ProFormSelect } from "@ant-design/pro-form"; import ProForm, { ProFormInstance, ProFormSelect } from "@ant-design/pro-form";
import UnUploadDetail from "./components/unUploadDetail"; import UnUploadDetail from "./components/unUploadDetail";
import data from "@/pages/newDataAnalysis/areaVehicle/data"; import data from "@/pages/newDataAnalysis/areaVehicle/data";

2
src/pages/Setting/Roles/index.tsx
View File

@ -557,7 +557,7 @@ const RoleList: React.FC<{ currentUser: CurrentUser | undefined }> = (props) =>
onClick={() => { onClick={() => {
getRoleMenu(currentUser?.TopSystemRoleId) getRoleMenu(currentUser?.TopSystemRoleId)
// 新增角色时，若账号为内部账号则默认角色父级为-1 ，否则则为账号所属角色的父级角色 // 新增角色时，若账号为内部账号则默认角色父级为-1 ，否则则为账号所属角色的父级角色
setCurrentRow({ SYSTEMROLE_PID: currentUser?.TopSystemRoleId, SYSTEMROLE_STATUS: 1 }) setCurrentRow({ SYSTEMROLE_PID: bigTabSelect === '1' ? currentUser?.TopSystemRoleId : '-1', SYSTEMROLE_STATUS: 1 })
handleModalVisible(true) handleModalVisible(true)
}} }}
>角色</Button>, >角色</Button>,

1
src/pages/Setting/serviceConfig/component/ChosePlayers.tsx
View File

@ -238,6 +238,7 @@ const ChosePlayers = ({ onRef, defaultPerson, showChosePlayer, currentUser, moda
pageSize: 999999 pageSize: 999999
} }
const list = await getRoleList(req) const list = await getRoleList(req)
console.log('listlistlistlistlist', list);
setTreeView(list) setTreeView(list)
// 请求供应商的左边那棵树的数据 // 请求供应商的左边那棵树的数据

3
src/pages/Setting/serviceConfig/index.tsx
View File

@ -376,6 +376,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => {
} }
const req: any = { const req: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser.ProvinceCode,
OPERATION_TYPES: selectedId || '11', OPERATION_TYPES: selectedId || '11',
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
APPROVALROUTE_STATES: params?.APPROVALROUTE_STATE || '', APPROVALROUTE_STATES: params?.APPROVALROUTE_STATE || '',
@ -515,6 +516,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => {
USER_PATTERN: res?.USER_PATTERN, USER_PATTERN: res?.USER_PATTERN,
APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null, APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null,
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
PROVINCE_CODE: currentUser.ProvinceCode,
// RECORD_DATE:moment().format('YYYY-MM-DD'), // RECORD_DATE:moment().format('YYYY-MM-DD'),
NEXT_STATE: res?.NEXT_STATE NEXT_STATE: res?.NEXT_STATE
} }
@ -526,6 +528,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => {
USER_PATTERN: res?.USER_PATTERN, USER_PATTERN: res?.USER_PATTERN,
APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null, APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null,
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
PROVINCE_CODE: currentUser.ProvinceCode,
// RECORD_DATE:moment().format('YYYY-MM-DD'), // RECORD_DATE:moment().format('YYYY-MM-DD'),
NEXT_STATE: res?.NEXT_STATE NEXT_STATE: res?.NEXT_STATE
} }

2
src/pages/User/login/index.tsx
View File

@ -19,7 +19,7 @@ import type { Dispatch } from 'umi';
import type { StateType } from '@/models/login'; import type { StateType } from '@/models/login';
import type { LoginParamsType } from '@/services/login'; import type { LoginParamsType } from '@/services/login';
import type { ConnectState } from '@/models/connect'; import type { ConnectState } from '@/models/connect';
import loginBg from '@/assets/login-bg.png'; import loginBg from '../../../assets/login-bg.png';
import styles from './index.less'; import styles from './index.less';
import { line } from '@antv/g2plot'; import { line } from '@antv/g2plot';
import session from '@/utils/session'; import session from '@/utils/session';

12
src/pages/reports/productControl/NewProductApproval/index.tsx
View File

@ -416,6 +416,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
useEffect(async () => { useEffect(async () => {
const req: any = { const req: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100100", OPERATION_TYPES: "100100",
@ -434,7 +435,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
} }
// 判断当前用户 是否有新增权限 // 判断当前用户 是否有新增权限
let have: boolean = false let have: boolean = false
let idList: any = firstSetp.APPROVALSTAFF_ID.split(',') let idList: any = firstSetp && firstSetp.APPROVALSTAFF_ID ? firstSetp.APPROVALSTAFF_ID.split(',') : ""
console.log('idList', idList); console.log('idList', idList);
if (idList.indexOf(currentUser?.ID.toString()) !== -1) { if (idList.indexOf(currentUser?.ID.toString()) !== -1) {
@ -867,6 +868,8 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
}]} }]}
request={async () => { request={async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true) const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
console.log('data321312', data);
const list: any = [] const list: any = []
if (data && data.length > 0) { if (data && data.length > 0) {
data.forEach((item: any) => { data.forEach((item: any) => {
@ -876,9 +879,9 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
}) })
} }
}) })
data.forEach((item: any) => { // data.forEach((item: any) => {
list.push({ label: item.label, value: item.value }) // list.push({ label: item.label, value: item.value })
}) // })
} }
return list return list
}} }}
@ -904,6 +907,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
request={async () => { request={async () => {
const reqState: any = { const reqState: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100100", OPERATION_TYPES: "100100",

11
src/pages/reports/productControl/ProductChangeInfoApproval/index.tsx
View File

@ -576,6 +576,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
useEffect(async () => { useEffect(async () => {
const req: any = { const req: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100200", OPERATION_TYPES: "100200",
@ -594,7 +595,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
} }
// 判断当前用户 是否有新增权限 // 判断当前用户 是否有新增权限
let have: boolean = false let have: boolean = false
let idList: any = firstSetp.APPROVALSTAFF_ID.split(',') let idList: any = firstSetp && firstSetp.APPROVALSTAFF_ID ? firstSetp.APPROVALSTAFF_ID.split(',') : []
console.log('idList', idList); console.log('idList', idList);
if (idList.indexOf(currentUser?.ID.toString()) !== -1) { if (idList.indexOf(currentUser?.ID.toString()) !== -1) {
@ -1037,9 +1038,9 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
}) })
} }
}) })
data.forEach((item: any) => { // data.forEach((item: any) => {
list.push({ label: item.label, value: item.value }) // list.push({ label: item.label, value: item.value })
}) // })
} }
return list return list
}} }}
@ -1064,6 +1065,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
request={async () => { request={async () => {
const reqState: any = { const reqState: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100210", OPERATION_TYPES: "100210",
@ -1123,6 +1125,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
console.log('approveCurrentRowapproveCurrentRowapproveCurrentRow', currentRow); console.log('approveCurrentRowapproveCurrentRowapproveCurrentRow', currentRow);
const reqState: any = { const reqState: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100210", OPERATION_TYPES: "100210",

11
src/pages/reports/productControl/ProductChangePriceApproval/index.tsx
View File

@ -546,6 +546,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
useEffect(async () => { useEffect(async () => {
const req: any = { const req: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100200", OPERATION_TYPES: "100200",
@ -564,7 +565,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
} }
// 判断当前用户 是否有新增权限 // 判断当前用户 是否有新增权限
let have: boolean = false let have: boolean = false
let idList: any = firstSetp.APPROVALSTAFF_ID.split(',') let idList: any = firstSetp && firstSetp.APPROVALSTAFF_ID ? firstSetp.APPROVALSTAFF_ID.split(',') : []
console.log('idList', idList); console.log('idList', idList);
if (idList.indexOf(currentUser?.ID.toString()) !== -1) { if (idList.indexOf(currentUser?.ID.toString()) !== -1) {
@ -1084,9 +1085,9 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
}) })
} }
}) })
data.forEach((item: any) => { // data.forEach((item: any) => {
list.push({ label: item.label, value: item.value }) // list.push({ label: item.label, value: item.value })
}) // })
} }
return list return list
}} }}
@ -1111,6 +1112,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
request={async () => { request={async () => {
const reqState: any = { const reqState: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100200", OPERATION_TYPES: "100200",
@ -1166,6 +1168,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
request={async () => { request={async () => {
const reqState: any = { const reqState: any = {
SearchParameter: { SearchParameter: {
PROVINCE_CODE: currentUser?.ProvinceCode,
APPROVALROUTE_STATES: "", APPROVALROUTE_STATES: "",
APPROVALROUTE_VALID: 1, APPROVALROUTE_VALID: 1,
OPERATION_TYPES: "100200", OPERATION_TYPES: "100200",

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

@ -140,10 +140,10 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
}) })
} }
serverpartList.unshift({ // serverpartList.unshift({
label: "全部", // label: "全部",
value: serverpartId // value: ''
}) // })
return serverpartList return serverpartList
}, },
fieldProps: { fieldProps: {
@ -237,7 +237,7 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
title: <div style={{ textAlign: 'center' }}>商品单位</div>, title: <div style={{ textAlign: 'center' }}>商品单位</div>,
width: 80, width: 80,
dataIndex: 'COMMODITY_UNIT', dataIndex: 'COMMODITY_UNIT',
align: 'right', align: 'center',
hideInSearch: true, hideInSearch: true,
}, },
{ {
@ -349,7 +349,7 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
} }
}) })
} }
formRef.current?.setFieldsValue({ ServerpartID: serverpartId }) // formRef.current?.setFieldsValue({ ServerpartID: serverpartId })
} }
if (type === '1') { if (type === '1') {

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.32"; export const VERSION = "4.5.35";
export const GIT_HASH = "55eacd9"; export const GIT_HASH = "1ce314d";
export const BUILD_TIME = "2025-08-19T10:31:57.380Z"; export const BUILD_TIME = "2025-08-21T11:03:22.048Z";