diff --git a/package.json b/package.json index ecb88fb..5c55bab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.32", + "version": "4.5.35", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/assets/tab/upMenu.png b/src/assets/tab/upMenu.png new file mode 100644 index 0000000..a9f3f69 Binary files /dev/null and b/src/assets/tab/upMenu.png differ diff --git a/src/assets/versionChange.png b/src/assets/versionChange.png new file mode 100644 index 0000000..7a395b6 Binary files /dev/null and b/src/assets/versionChange.png differ diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index a499cbd..3489719 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -21,14 +21,14 @@ import Authorized from '@/utils/Authorized'; import RightContent from '@/components/GlobalHeader/RightContent'; import type { ConnectState } from '@/models/connect'; import { getMatchMenu } from '@umijs/route-utils'; -import logo from '../assets/logo.svg'; +import logo from '../assets/logo.png'; import './BasicLayout.less' import { DoubleRightOutlined } from '@ant-design/icons'; import * as Icon from '@ant-design/icons' import IconFont from '@/components/IconFont'; import type { CurrentUser } from '@/models/user' 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 { handleGetServerpartTree } from '@/pages/basicManage/serverpartAssets/service'; import { handeGetFieldEnumByFieldYN, handeGetNestingFIELDENUMList } from '@/pages/travelMember/service'; diff --git a/src/pages/DataVerification/list/list.tsx b/src/pages/DataVerification/list/list.tsx index 70a5f0d..7f20f9f 100644 --- a/src/pages/DataVerification/list/list.tsx +++ b/src/pages/DataVerification/list/list.tsx @@ -38,7 +38,7 @@ import interfaceImg from '@/assets/DataVerification/interface.png' import defaultIcon from '@/assets/brand/defaultIcon.png' import ItemDetail from './components/ItemDetail' 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 UnUploadDetail from "./components/unUploadDetail"; import data from "@/pages/newDataAnalysis/areaVehicle/data"; diff --git a/src/pages/Setting/Roles/index.tsx b/src/pages/Setting/Roles/index.tsx index d4977ab..9aae76b 100644 --- a/src/pages/Setting/Roles/index.tsx +++ b/src/pages/Setting/Roles/index.tsx @@ -557,7 +557,7 @@ const RoleList: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => onClick={() => { getRoleMenu(currentUser?.TopSystemRoleId) // 新增角色时，若账号为内部账号则默认角色父级为-1 ，否则则为账号所属角色的父级角色 - setCurrentRow({ SYSTEMROLE_PID: currentUser?.TopSystemRoleId, SYSTEMROLE_STATUS: 1 }) + setCurrentRow({ SYSTEMROLE_PID: bigTabSelect === '1' ? currentUser?.TopSystemRoleId : '-1', SYSTEMROLE_STATUS: 1 }) handleModalVisible(true) }} >角色, diff --git a/src/pages/Setting/serviceConfig/component/ChosePlayers.tsx b/src/pages/Setting/serviceConfig/component/ChosePlayers.tsx index 2e8a478..ea2fad1 100644 --- a/src/pages/Setting/serviceConfig/component/ChosePlayers.tsx +++ b/src/pages/Setting/serviceConfig/component/ChosePlayers.tsx @@ -238,6 +238,7 @@ const ChosePlayers = ({ onRef, defaultPerson, showChosePlayer, currentUser, moda pageSize: 999999 } const list = await getRoleList(req) + console.log('listlistlistlistlist', list); setTreeView(list) // 请求供应商的左边那棵树的数据 diff --git a/src/pages/Setting/serviceConfig/index.tsx b/src/pages/Setting/serviceConfig/index.tsx index a907fac..947afc4 100644 --- a/src/pages/Setting/serviceConfig/index.tsx +++ b/src/pages/Setting/serviceConfig/index.tsx @@ -376,6 +376,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => { } const req: any = { SearchParameter: { + PROVINCE_CODE: currentUser.ProvinceCode, OPERATION_TYPES: selectedId || '11', APPROVALROUTE_VALID: 1, APPROVALROUTE_STATES: params?.APPROVALROUTE_STATE || '', @@ -515,6 +516,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => { USER_PATTERN: res?.USER_PATTERN, APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null, APPROVALROUTE_VALID: 1, + PROVINCE_CODE: currentUser.ProvinceCode, // RECORD_DATE:moment().format('YYYY-MM-DD'), NEXT_STATE: res?.NEXT_STATE } @@ -526,6 +528,7 @@ const ServiceConfig: React.FC<{ currentUser: CurrentUser }> = (props) => { USER_PATTERN: res?.USER_PATTERN, APPROVALSTAFF_ID: res?.APPROVALSTAFF_ID ? res?.APPROVALSTAFF_ID.toString() : null, APPROVALROUTE_VALID: 1, + PROVINCE_CODE: currentUser.ProvinceCode, // RECORD_DATE:moment().format('YYYY-MM-DD'), NEXT_STATE: res?.NEXT_STATE } diff --git a/src/pages/User/login/index.tsx b/src/pages/User/login/index.tsx index cf9a47b..507bc43 100644 --- a/src/pages/User/login/index.tsx +++ b/src/pages/User/login/index.tsx @@ -19,7 +19,7 @@ import type { Dispatch } from 'umi'; import type { StateType } from '@/models/login'; import type { LoginParamsType } from '@/services/login'; 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 { line } from '@antv/g2plot'; import session from '@/utils/session'; @@ -73,9 +73,9 @@ const Login: React.FC = (props) => { function findIP(onNewIP) { const peerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection; const pc = new peerConnection({ iceServers: [] }); - const noop = function () { }; - const IPRegex = /([0-9]{1,3}(\.[0-9]{1,3}){3})/; - const ipCandidates = []; + const noop = function () { }; + const IPRegex = /([0-9]{1,3}(\.[0-9]{1,3}){3})/; + const ipCandidates = []; pc.createDataChannel(""); pc.createOffer().then(function (sdp) { sdp.sdp.split('\n').forEach(function (line) { diff --git a/src/pages/reports/productControl/NewProductApproval/index.tsx b/src/pages/reports/productControl/NewProductApproval/index.tsx index 79632db..cfb1a82 100644 --- a/src/pages/reports/productControl/NewProductApproval/index.tsx +++ b/src/pages/reports/productControl/NewProductApproval/index.tsx @@ -416,6 +416,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props useEffect(async () => { const req: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100100", @@ -434,7 +435,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props } // 判断当前用户 是否有新增权限 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); if (idList.indexOf(currentUser?.ID.toString()) !== -1) { @@ -867,6 +868,8 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props }]} request={async () => { const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true) + console.log('data321312', data); + const list: any = [] if (data && data.length > 0) { data.forEach((item: any) => { @@ -876,9 +879,9 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props }) } }) - data.forEach((item: any) => { - list.push({ label: item.label, value: item.value }) - }) + // data.forEach((item: any) => { + // list.push({ label: item.label, value: item.value }) + // }) } return list }} @@ -904,6 +907,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props request={async () => { const reqState: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100100", diff --git a/src/pages/reports/productControl/ProductChangeInfoApproval/index.tsx b/src/pages/reports/productControl/ProductChangeInfoApproval/index.tsx index 50e2fb0..65be801 100644 --- a/src/pages/reports/productControl/ProductChangeInfoApproval/index.tsx +++ b/src/pages/reports/productControl/ProductChangeInfoApproval/index.tsx @@ -576,6 +576,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props useEffect(async () => { const req: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100200", @@ -594,7 +595,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props } // 判断当前用户 是否有新增权限 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); if (idList.indexOf(currentUser?.ID.toString()) !== -1) { @@ -1037,9 +1038,9 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props }) } }) - data.forEach((item: any) => { - list.push({ label: item.label, value: item.value }) - }) + // data.forEach((item: any) => { + // list.push({ label: item.label, value: item.value }) + // }) } return list }} @@ -1064,6 +1065,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props request={async () => { const reqState: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100210", @@ -1123,6 +1125,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props console.log('approveCurrentRowapproveCurrentRowapproveCurrentRow', currentRow); const reqState: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100210", diff --git a/src/pages/reports/productControl/ProductChangePriceApproval/index.tsx b/src/pages/reports/productControl/ProductChangePriceApproval/index.tsx index 9636c9d..d4cb708 100644 --- a/src/pages/reports/productControl/ProductChangePriceApproval/index.tsx +++ b/src/pages/reports/productControl/ProductChangePriceApproval/index.tsx @@ -546,6 +546,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop useEffect(async () => { const req: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100200", @@ -564,7 +565,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop } // 判断当前用户 是否有新增权限 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); if (idList.indexOf(currentUser?.ID.toString()) !== -1) { @@ -1084,9 +1085,9 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop }) } }) - data.forEach((item: any) => { - list.push({ label: item.label, value: item.value }) - }) + // data.forEach((item: any) => { + // list.push({ label: item.label, value: item.value }) + // }) } return list }} @@ -1111,6 +1112,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop request={async () => { const reqState: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100200", @@ -1166,6 +1168,7 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop request={async () => { const reqState: any = { SearchParameter: { + PROVINCE_CODE: currentUser?.ProvinceCode, APPROVALROUTE_STATES: "", APPROVALROUTE_VALID: 1, OPERATION_TYPES: "100200", diff --git a/src/pages/reports/productControl/commodityInfo/index.tsx b/src/pages/reports/productControl/commodityInfo/index.tsx index eabe3e5..d6db5af 100644 --- a/src/pages/reports/productControl/commodityInfo/index.tsx +++ b/src/pages/reports/productControl/commodityInfo/index.tsx @@ -140,10 +140,10 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => { }) } - serverpartList.unshift({ - label: "全部", - value: serverpartId - }) + // serverpartList.unshift({ + // label: "全部", + // value: '' + // }) return serverpartList }, fieldProps: { @@ -237,7 +237,7 @@ const commodityInfo: React.FC<{ currentUser: CurrentUser }> = (props) => { title:
商品单位
, width: 80, dataIndex: 'COMMODITY_UNIT', - align: 'right', + align: 'center', 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') { diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 97e6014..54858ae 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.32"; -export const GIT_HASH = "55eacd9"; -export const BUILD_TIME = "2025-08-19T10:31:57.380Z"; +export const VERSION = "4.5.35"; +export const GIT_HASH = "1ce314d"; +export const BUILD_TIME = "2025-08-21T11:03:22.048Z";