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-22 19:39:48 +08:00
parent e03ffe4902
commit 9fb0245d17
14 changed files with 529 additions and 465 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",
"version": "4.5.35",
"version": "4.5.36",
"private": true,
"description": "An out-of-box UI solution for enterprise applications",
"scripts": {

3
src/pages/merchantManagement/reports/SalesFlow/index.tsx
View File

@ -206,7 +206,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
...params,
SERVERPARTSHOP_ID: shopId && shopId.length > 0 ? shopId.toString() : currentUser?.ServerpartShopIds,
});
setReqDetailList(data.data);
setReqDetailList(data.List);
console.log('data', data);
const list: any = JSON.parse(JSON.stringify(data.List))
if (list && list.length > 0) {
@ -346,7 +346,6 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
}
onRow={(record) => {
return {
onClick: () => {
setCurrentRow(record)
setVisible(true)

111
src/pages/newDataAnalysis/serviceAreaPersonnel/index.tsx
View File

@ -11,7 +11,7 @@ import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
import React, { useRef, useState } from "react";
import ProCard from "@ant-design/pro-card";
import { MenuFoldOutlined } from "@ant-design/icons";
import { MenuFoldOutlined, PlusOutlined } from "@ant-design/icons";
import { Col, Divider, FormInstance, Modal, Row } from "antd";
import { Button, message, Space, Spin, Tree } from "antd";
import useRequest from "@ahooksjs/use-request";
@ -23,6 +23,8 @@ import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSele
import ProForm, { ProFormCheckbox, ProFormRadio, ProFormSelect, ProFormText } from "@ant-design/pro-form";
import { handleGetCASHWORKERDetail, handleGetCASHWORKERList, handleGetServerpartShopList, handleSynchroCASHWORKER } from "./service";
import PageTitleBox from "@/components/PageTitleBox";
import session from "@/utils/session";
import { handleNewGetSERVERPARTDetail } from "../service";
const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) => {
@ -316,7 +318,10 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
}}
>
导出excel
</Button>
</Button>,
<Button icon={<PlusOutlined />} type={"primary"} onClick={() => {
setEditModal(true)
}}>服务区人员</Button>
]
}}
/>
@ -331,7 +336,6 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
open={editModal}
footer={null}
destroyOnClose={true}
onCancel={() => {
setEditModal(false)
setCurrentRow(undefined)
@ -339,13 +343,19 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
}}
footer={<div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
<div>
<Button type='primary' onClick={() => {
{/* <Button type='primary' onClick={() => {
setRelatedShop(true)
}}>关联门店</Button>
}}>关联门店</Button> */}
</div>
<div>
<Button type='primary' style={{ marginRight: '16px' }} onClick={() => {
editFormRef.current?.validateFields().then(async (res) => {
// 根据当前的服务区 去拿个code
const code = await handleNewGetSERVERPARTDetail({ SERVERPARTId: res.SERVERPART_ID })
console.log('codecodecodecode', code);
let SERVERPART_CODE = code.SERVERPART_CODE
// 255个0
let defaultAuthor: string = "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
console.log('personDetail', personDetail);
@ -360,10 +370,22 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
actionRef.current?.reload()
})
}
const req: any = {
...personDetail,
WORKER_OTHER: defaultAuthor
let req: any = {}
if (currentRow?.CASHWORKER_ID) {
req = {
...res,
WORKER_OTHER: defaultAuthor,
SERVERPART_CODE: SERVERPART_CODE
}
} else {
req = {
...personDetail,
...res,
WORKER_OTHER: defaultAuthor,
SERVERPART_CODE: SERVERPART_CODE
}
}
const data = await handleSynchroCASHWORKER(req)
console.log('data', data);
if (data.Result_Code === 100) {
@ -371,6 +393,8 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
setEditModal(false)
setCurrentRow(undefined)
setPersonDetail(undefined)
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
}
@ -388,7 +412,7 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
formRef={editFormRef}
request={async () => {
console.log('currentRow', currentRow);
if (currentRow?.CASHWORKER_ID) {
const req: any = {
CASHWORKERId: currentRow?.CASHWORKER_ID
}
@ -414,6 +438,11 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
...data,
WORKER_OTHER: author
}
} else {
return {
WORKER_VALID: 1
}
}
}}
submitter={{
render: (props, doms) => {
@ -422,6 +451,19 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
}}
>
<Row gutter={18}>
<Col span={12}>
<ProFormText
label='人员名称'
name="CASHWORKER_NAME"
rules={[
{
required: true,
message: '请输入人员名称',
},
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
label='人员类别'
@ -437,32 +479,18 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
rules={[
{
required: true,
message: '请输入名称',
message: '请选择人员类别',
},
]}
/>
</Col>
<Col span={12}>
<ProFormText
disabled
disabled={currentRow?.CASHWORKER_ID}
label="人员账号"
name="CASHWORKER_LOGINNAME"
/>
</Col>
</Row>
<Row gutter={18}>
<Col span={12}>
<ProFormText
label='人员名称'
name="CASHWORKER_NAME"
rules={[
{
required: true,
message: '请输入名称',
},
]}
/>
</Col>
<Col span={12}>
<ProFormText
label="人员密码"
@ -470,13 +498,27 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
rules={[
{
required: true,
message: '请输入名称',
message: '请输入人员密码',
},
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
label='服务区'
name="SERVERPART_ID"
request={() => {
let serverpartList = session.get('ServerpartIdsTree')
return serverpartList
}}
rules={[
{
required: true,
message: '请选择服务区',
},
]}
/>
</Col>
</Row>
<Row gutter={18}>
<Col span={12}>
<ProFormSelect
label='人员状态'
@ -491,7 +533,7 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
rules={[
{
required: true,
message: '请输入名称',
message: '请选择人员状态',
},
]}
/>
@ -611,13 +653,16 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
return `${record?.SERVERPARTSHOP_ID}`
}}
request={async () => {
if (!currentRow?.SERVERPART_ID) {
return
let id: string = ''
if (!currentRow?.CASHWORKER_ID) {
let formRef: any = editFormRef.current?.getFieldsValue()
console.log('formRefformRefformRef', formRef);
id = formRef.SERVERPART_ID
}
const req: any = {
SearchParameter: {
ISVALID: 1,
SERVERPART_IDS: currentRow?.SERVERPART_ID,
SERVERPART_IDS: id || currentRow?.SERVERPART_ID,
SortStr: "BUSINESS_STATE,SHOPTRADE,SHOPSHORTNAME,SHOPREGION"
},
SortStr: "BUSINESS_STATE,SHOPTRADE,SHOPSHORTNAME,SHOPREGION",
@ -629,7 +674,7 @@ const serviceAreaPersonnel: React.FC<{ currentUser: CurrentUser }> = (props) =>
}
return { data: [], success: true }
}}
headerTitle={`当前收银员为【${currentRow?.CASHWORKER_NAME}】`}
headerTitle={`当前收银员为【${currentRow?.CASHWORKER_NAME || ""}】`}
pagination={false}
scroll={{ y: 400 }}
rowSelection={{

8
src/pages/newDataAnalysis/serviceAreaPersonnel/service.ts
View File

@ -49,13 +49,7 @@ export async function handleSynchroCASHWORKER(params?: any) {
});
if (data.Result_Code !== 100) {
return {
data: [],
current: 1,
pageSize: 10,
total: 0,
success: false
}
return data
}
return data;

1
src/pages/reports/audit/abnormalAudit/index.tsx
View File

@ -308,6 +308,7 @@ const abnormalAudit: React.FC<{ currentUser: CurrentUser}> = (props) => {
const req = {
SearchParameter: {
...params,
PROVINCE_CODE: currentUser?.ProvinceCode,
SERVERPART_ID: selectedId
},
PageIndex: 1,

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

@ -18,6 +18,7 @@ import useRequest from "@ahooksjs/use-request";
import moment from 'moment'
import { handleApproveCommodityProInst, handleCreateCommodityProInst, handleDeleteCOMMODITY_RUNNING, handleDeleteCommodityProInst, handleGetApprovalCommodityList, handleGetBUSINESSAPPROVALDetail, handleGetCOMMODITYRUNNINGList, handleReapplyCommodityProInst, handleRejectCommodityProInst } from "../ProductApprovalProcess/service";
import './style.less'
import session from "@/utils/session";
const { Step } = Steps
@ -867,23 +868,26 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
message: "请选择服务区！"
}]}
request={async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
console.log('data321312', data);
const ServerpartIdsTree = session.get('ServerpartIdsTree')
return ServerpartIdsTree
const list: any = []
if (data && data.length > 0) {
data.forEach((item: any) => {
if (item.children && item.children.length > 0) {
item.children.forEach((subItem: any) => {
list.push({ label: subItem.label, value: subItem.value })
})
}
})
// 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) => {
// list.push({ label: item.label, value: item.value })
// if (item.children && item.children.length > 0) {
// item.children.forEach((subItem: any) => {
// list.push({ label: subItem.label, value: subItem.value })
// })
}
return list
// }
// })
// // data.forEach((item: any) => {
// // list.push({ label: item.label, value: item.value })
// // })
// }
// return list
}}
disabled={currentRow?.BusinessProcess_State > 1000 || (currentRow?.BusinessApproval_ID && currentRow?.ApproveStaff_ID !== currentUser?.ID)}
fieldProps={{

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

@ -1028,21 +1028,23 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
message: "请选择服务区！"
}]}
request={async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
const list: any = []
if (data && data.length > 0) {
data.forEach((item: any) => {
if (item.children && item.children.length > 0) {
item.children.forEach((subItem: any) => {
list.push({ label: subItem.label, value: subItem.value })
})
}
})
const ServerpartIdsTree = session.get('ServerpartIdsTree')
return ServerpartIdsTree
// const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
// const list: any = []
// if (data && data.length > 0) {
// data.forEach((item: any) => {
// list.push({ label: item.label, value: item.value })
// if (item.children && item.children.length > 0) {
// item.children.forEach((subItem: any) => {
// list.push({ label: subItem.label, value: subItem.value })
// })
}
return list
// }
// })
// // data.forEach((item: any) => {
// // list.push({ label: item.label, value: item.value })
// // })
// }
// return list
}}
disabled={currentRow?.BusinessProcess_State > 1000 || (currentRow?.BusinessApproval_ID && currentRow?.ApproveStaff_ID !== currentUser?.ID)}
fieldProps={{
@ -1633,7 +1635,7 @@ const ProductChangeInfoApproval: React.FC<{ currentUser: CurrentUser }> = (props
<ProFormText
name="COMMODITY_BARCODE"
label="商品条码"
disabled={currentRow}
disabled={true}
/>
</Col>
<Col span={8}>

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

@ -1075,21 +1075,23 @@ const ProductChangePriceApproval: React.FC<{ currentUser: CurrentUser }> = (prop
message: "请选择服务区！"
}]}
request={async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
const list: any = []
if (data && data.length > 0) {
data.forEach((item: any) => {
if (item.children && item.children.length > 0) {
item.children.forEach((subItem: any) => {
list.push({ label: subItem.label, value: subItem.value })
})
}
})
const ServerpartIdsTree = session.get('ServerpartIdsTree')
return ServerpartIdsTree
// const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
// const list: any = []
// if (data && data.length > 0) {
// data.forEach((item: any) => {
// list.push({ label: item.label, value: item.value })
// if (item.children && item.children.length > 0) {
// item.children.forEach((subItem: any) => {
// list.push({ label: subItem.label, value: subItem.value })
// })
}
return list
// }
// })
// // data.forEach((item: any) => {
// // list.push({ label: item.label, value: item.value })
// // })
// }
// return list
}}
disabled={currentRow?.BusinessProcess_State > 1000 || (currentRow?.BusinessApproval_ID && currentRow?.ApproveStaff_ID !== currentUser?.ID)}
fieldProps={{

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

@ -1,3 +1,4 @@
// 商品信息管理
import { connect } from "umi";
import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";

25
src/pages/reports/productControl/commoditySearch/index.tsx
View File

@ -1,3 +1,4 @@
// 商品信息查询
import { connect } from "umi";
import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
@ -43,6 +44,7 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
const [printOut, setPrintOut] = useState<any>(); // 打印数据的内容
const [collapsible, setCollapsible] = useState<boolean>(false)
const [treeView, setTreeView] = useState<any>()
const [allTreeView, setAllTreeView] = useState<any>()
const [allTotal, setAllTotal] = useState<number>(20)
// 加载服务区树
const { loading: treeLoading, data: treeViews } = useRequest(async () => {
@ -52,8 +54,18 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
ShowCode: true
}
const data = await handleGetNestingCOMMODITYTYPETree(req)
console.log('data',data)
setTreeView(data)
let list: any = data
if (currentUser?.ProvinceCode === '734100') {
list.unshift({
label: "全部",
value: 999999,
key: '1-999999',
type: 1
})
console.log('listlistlistlist', list);
}
setTreeView(list)
setAllTreeView(list)
return data
})
// 树相关的属性和方法
@ -109,8 +121,10 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
valueType: 'select',
hideInTable: true,
request: async () => {
const data = await getServerpartOption(340000)
return data
// const data = await getServerpartOption(currentUser?.ProvinceCode)
// console.log('datadatadatadata', data);
const serverpartList: any = session.get('serverpartList')
return serverpartList
},
fieldProps: {
showSearch: true,
@ -377,6 +391,7 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
formRef={formRef}
columns={columns}
bordered
scroll={{ x: '100%', y: 'calc(100vh - 450px)' }}
headerTitle={<PageTitleBox props={props} />}
search={{ span: 6 }}
pagination={{
@ -390,7 +405,7 @@ const commoditySearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
const req: any = {
SearchType: 3,
ProvinceCode: currentUser?.USER_PROVINCE,
CommodityTypeId: currenMenu,
CommodityTypeId: currenMenu === '999999' ? '' : currenMenu,
CommodityState: params?.COMMODITY_STATE,
ServerpartID: params?.ServerpartID,
PageIndex: 1,

3
src/pages/reports/productControl/shopCommodity/index.tsx
View File

@ -34,7 +34,8 @@ const shopCommodity: React.FC<{ currentUser: CurrentUser }> = (props) => {
const [treeView, setTreeView] = useState<any>()
// 加载服务区树
const { loading: treeLoading, data: treeViews } = useRequest(async () => {
const data = await getSPRegionShopTree(currentUser?.ProvinceCode, '', '', '', '1000,2000,3000', '2000,3000,4000', true, false, true, 'SERVERPARTSHOP_INDEX,BUSINESS_STATE,SHOPSHORTNAME', false, true);
// 734100 是建工 他要显示多一点
const data = await getSPRegionShopTree(currentUser?.ProvinceCode, '', '', '', '1000,2000,3000', currentUser?.ProvinceCode === '734100' ? '' : '2000,3000,4000', true, true, true, 'SERVERPARTSHOP_INDEX,BUSINESS_STATE,SHOPSHORTNAME', false, true);
setTreeView(data)
console.log('data222', data)
return data

2
src/services/options/index.ts
View File

@ -235,7 +235,7 @@ export async function getServerpartTree(ProvinceCode?: number | string, Serverpa
const data = await request(`/BaseInfo/GetServerpartTree?
ProvinceCode=${ProvinceCode || ''}&ServerpartCodes=${ServerpartCodes || ''}&
ShowWholePower=${ShowWholePower || false}&ShowWholePower=${ShowSPRegion || true}&
ShowRoyalty=${false}&ShowCompactCount=${ShowCompactCount || false}&StatisticsType=${StatisticsType || ''}`, {
ShowRoyalty=${ShowRoyalty}&ShowCompactCount=${ShowCompactCount || false}&StatisticsType=${StatisticsType || ''}`, {
method: 'GET',
});

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.35";
export const GIT_HASH = "1ce314d";
export const BUILD_TIME = "2025-08-21T11:03:22.048Z";
export const VERSION = "4.5.36";
export const GIT_HASH = "e03ffe4";
export const BUILD_TIME = "2025-08-22T10:43:11.324Z";