From e03ffe490200166fa8a17f3133a0f22a3a7d907c Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Thu, 21 Aug 2025 19:14:08 +0800 Subject: [PATCH] first commit --- package.json | 2 +- src/assets/tab/upMenu.png | Bin 0 -> 2906 bytes src/assets/versionChange.png | Bin 0 -> 6092 bytes src/layouts/BasicLayout.tsx | 4 ++-- src/pages/DataVerification/list/list.tsx | 2 +- src/pages/Setting/Roles/index.tsx | 2 +- .../serviceConfig/component/ChosePlayers.tsx | 1 + src/pages/Setting/serviceConfig/index.tsx | 3 +++ src/pages/User/login/index.tsx | 8 ++++---- .../productControl/NewProductApproval/index.tsx | 12 ++++++++---- .../ProductChangeInfoApproval/index.tsx | 11 +++++++---- .../ProductChangePriceApproval/index.tsx | 11 +++++++---- .../productControl/commodityInfo/index.tsx | 12 ++++++------ src/versionEnv.ts | 6 +++--- 14 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 src/assets/tab/upMenu.png create mode 100644 src/assets/versionChange.png 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 0000000000000000000000000000000000000000..a9f3f69da20a0835d2d1855cdbe459d9c10aca6c GIT binary patch literal 2906 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 Mh8C!D{hPS|2g#@+od5s; literal 0 HcmV?d00001 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";