diff --git a/package.json b/package.json index 5abe106..6a79e60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.79", + "version": "4.5.80", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/basicManage/ServerpartShop/index.tsx b/src/pages/basicManage/ServerpartShop/index.tsx index 361a618..7e10f12 100644 --- a/src/pages/basicManage/ServerpartShop/index.tsx +++ b/src/pages/basicManage/ServerpartShop/index.tsx @@ -22,7 +22,7 @@ import type { FormInstance } from "antd"; import type { ServerpartShopModel } from './data' import { useRef, useState } from "react"; -import { getList, delServerpartShop, updateServerpartShop, handleSynchroServerpartShop, handleDeleteServerpartShop, handleSynchroRTSERVERPARTSHOP } from "./service"; +import { getList, delServerpartShop, updateServerpartShop, handleSynchroServerpartShop, handleDeleteServerpartShop, handleSynchroRTSERVERPARTSHOP, handleModifyShopBusinessState } from "./service"; import './style.less' import type { ConnectState } from "@/models/connect"; @@ -280,8 +280,27 @@ const ServerpartShopTable: React.FC<{ currentUser: CurrentUser }> = ({ currentUs // 同步门店经营状态 const handleUpdateShopState = async (value: any) => { + let list: any = [] + if (selectServerPartList && selectServerPartList.length > 0) { + selectServerPartList.forEach((item: any) => { + list.push({ + ServerPartShopId: item, + BusinessState: value.BUSINESS_STATE.toString() + }) + }) + } + setUpdateShopStateLoading(true) + const data = await handleModifyShopBusinessState({ list: list }) setUpdateShopStateLoading(false) + if (data.Result_Code === 100) { + message.success(data.Result_Desc) + setSelectServerPartList([]) + setUpdateShopStateModal(false) + actionRef.current?.reload() + } else { + message.error(data.Result_Desc) + } } diff --git a/src/pages/basicManage/ServerpartShop/service.ts b/src/pages/basicManage/ServerpartShop/service.ts index baee1ae..adfe529 100644 --- a/src/pages/basicManage/ServerpartShop/service.ts +++ b/src/pages/basicManage/ServerpartShop/service.ts @@ -194,5 +194,19 @@ export async function handleSynchroRTSERVERPARTSHOP(params?: any) { return data } + return data +} + +// 批量同步门店状态 +export async function handleModifyShopBusinessState(params?: any) { + const data = await request(`/BaseInfo/ModifyShopBusinessState`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }); + + if (data.Result_Code !== 100) { + return data + } + return data } \ No newline at end of file diff --git a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx index abb9cd1..6bdddf4 100644 --- a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx +++ b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx @@ -383,6 +383,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare nextApproveState: AfterSettlementRef.current?.nextState || '' } console.log('req', req); + const data = await handleCreateSettlement(req) if (data.Result_Code === 100) { const fileList: any = AfterSettlementRef.current?.fileList diff --git a/src/versionEnv.ts b/src/versionEnv.ts index f6fe8a1..245b7a0 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.79"; -export const GIT_HASH = "19e42b8"; -export const BUILD_TIME = "2025-12-24T06:15:18.426Z"; +export const VERSION = "4.5.80"; +export const GIT_HASH = "1871dcf"; +export const BUILD_TIME = "2026-01-30T08:29:11.807Z";