Skip to content

J
jinfa-platform
Commit e0906406 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

Merge branch 'zwpFix' into dev

parents be399149 c7f7d8c8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 450 additions and 408 deletions
src/pages/classAndProperty/attribute/index.tsx
View file @ e0906406
......@@ -23,6 +23,7 @@ import Search from '@/components/NiceForm/components/Search'
import Submit from '@/components/NiceForm/components/Submit'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import ModalTable from '@/components/ModalTable'
import { clearModalParams } from '@/utils'
// import styles from './index.less'
const formActions = createFormActions();
......@@ -220,6 +221,7 @@ const Attribute: React.FC<{}> = () => {
}
setSyncVisible(false)
setSyncLoading(false)
clearModalParams()
})
} else {
message.error('请选择需要同步的属性')
......@@ -227,6 +229,11 @@ const Attribute: React.FC<{}> = () => {
}
}
const handleAsyncCancel = () => {
setSyncVisible(false)
clearModalParams()
}
const Actions = (
<Space>
<Button type="primary" icon={<PlusOutlined />} onClick={() => { history.push('/memberCenter/commodityAbility/classAndProperty/attribute/add') }}>
......@@ -295,7 +302,7 @@ const Attribute: React.FC<{}> = () => {
<ModalTable
modalTitle='同步平台属性'
confirm={handleAsyncOk}
cancel={() => setSyncVisible(false)}
cancel={handleAsyncCancel}
visible={syncVisible}
columns={columns}
rowSelection={rowSelection}
......
src/pages/classAndProperty/propertyValue/index.tsx
View file @ e0906406
......@@ -20,6 +20,7 @@ import Search from '@/components/NiceForm/components/Search'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import Submit from '@/components/NiceForm/components/Submit'
import { ISchema } from '@formily/antd';
import { clearModalParams } from '@/utils';
const treeActions = createTreeActions()
......@@ -36,7 +37,7 @@ const syncSchema: ISchema = {
type: 'string',
'x-component': 'ModalSearch',
'x-component-props': {
placeholder: '属性组名称',
placeholder: '属性组名',
align: 'flex-left',
},
},
......@@ -93,7 +94,6 @@ const PropertyValue: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const {
treeData,
resetMenu
......@@ -102,7 +102,6 @@ const PropertyValue: React.FC<{}> = () => {
fetchMenuData: fetchAttributeTreeData,
})
useEffect(() => {
let prefix = sessionStorage.getItem('beforeKeyPrefix')
let beforeKey = history.location.query.attrId
......@@ -306,6 +305,7 @@ const PropertyValue: React.FC<{}> = () => {
}
setSyncVisible(false)
setSyncLoading(false)
clearModalParams()
})
} else {
message.error('请选择需要同步的属性值')
......@@ -313,6 +313,17 @@ const PropertyValue: React.FC<{}> = () => {
}
}
const handleAsyncCancel = () => {
clearModalParams()
setSyncVisible(false)
}
// const clearModalParams = () => {
// let currentState = JSON.parse(sessionStorage.getItem("currentState"))
// let result = {...currentState, queryParams: {}, current: 1}
// sessionStorage.setItem("currentState", JSON.stringify(result))
// }
return <PageHeaderWrapper>
<Row gutter={[24, 36]}>
<Col span={8}>
......@@ -395,9 +406,9 @@ const PropertyValue: React.FC<{}> = () => {
</Row>
<ModalTable
modalTitle='同步平台属性'
modalTitle='同步平台属性值'
confirm={handleAsyncOk}
cancel={() => setSyncVisible(false)}
cancel={handleAsyncCancel}
visible={syncVisible}
columns={syncColumns}
rowSelection={rowSelection}
......
src/pages/commodity/products/addProducts.tsx
View file @ e0906406
......@@ -288,13 +288,13 @@ const AddProducts: React.FC<{}> = (props) => {
// 校验属性单位重量是否提供发票
try {
if(!_params.commodityAttributeList.length || !_params?.unitId || typeof(_params.isInvoice) !== 'boolean' || !_params?.logistics?.weight){
// if(!_params.commodityAttributeList.length || !_params?.unitId || typeof(_params.isInvoice) !== 'boolean' || !_params?.logistics?.weight){
if(!_params?.unitId || typeof(_params.isInvoice) !== 'boolean' || (_params.logistics.deliveryType === 1 && !_params.logistics?.weight)){
throw new Error('请完善商品其他信息！')
}
} catch (e) {
return e
}
console.log(!_params.commodityAttributeList.length && !_params?.unitId && typeof(_params.isInvoice) !== 'boolean' && !_params?.logistics?.weight,_params,'123456')
// 校验价格
try {
if(_params.unitPriceAndPicList){
......
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @ e0906406
......@@ -495,6 +495,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
setPlanPrice(v.target.value)
setProductPriceType(v.target.value)
setIsChangePriceType(true)
priceForm.setFieldsValue({isMemberPrice: false})
}
const setPriceOk = () => {
......@@ -756,7 +757,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
label={
<span>
会员折扣&nbsp;
<Tooltip title="是否允许会员使用会员折扣价购买当前商品">
<Tooltip title="是否允许会员使用会员折扣价购买当前商品，只支持现货商品">
<QuestionCircleOutlined />
</Tooltip>
</span>
......
src/pages/commodity/products/directChannel.tsx
View file @ e0906406
......@@ -173,11 +173,11 @@ const DirectChannel: React.FC<{}> = () => {
return (
<>
{(record.status===5) ? <Button type='link' onClick={()=>clickUp(0, record.id)}>下架</Button> : ''}
{(record.status===6) ?
{(record.status===6) ?
<>
<Button type='link' onClick={()=>clickUp(1, record.id)}>上架</Button>
<Button type='link' onClick={()=>clickModify(record)}>修改</Button>
</>
</>
: ''}
{(record.status===7) &&
<>
......@@ -298,13 +298,13 @@ const DirectChannel: React.FC<{}> = () => {
const onChangeUpShop = (values) => {
// 判断上架之前是否有店铺 有即可以上下架
// PublicApi.getTemplateShopFindShop().then(res => {
// if(res.data.logo){
PublicApi.getTemplateWebMemberChannelWebFindCurrMemberChannel().then(res => {
if(res.data.id){
setCheckedValues(values)
// }else{
// message.error('您还没有开通店铺，无法上下架商品！')
// }
// })
}else{
message.error('您还没有开通店铺，无法上下架商品！')
}
})
}
const handleUpDown = () => {
......@@ -379,7 +379,7 @@ const DirectChannel: React.FC<{}> = () => {
// ref.current.reload()
// setIsDisabledOKbtn(false)
// })
}
const handleCancelUpDown = () => {
......@@ -457,7 +457,7 @@ const DirectChannel: React.FC<{}> = () => {
FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => {
searchCustomerCategoryOptionEffect(actions, 'customerCategoryId')
})
}}
}}
schema={channelSchema}
/>
}
......@@ -491,7 +491,7 @@ const DirectChannel: React.FC<{}> = () => {
</Col>) :
Array.isArray(shopsOption) && shopsOption.map((item, index) => <Col key={index} span={8}>
<Checkbox value={item}>{item.name}</Checkbox>
</Col>)
</Col>)
}
</Row>
</Checkbox.Group>
......@@ -502,4 +502,4 @@ const DirectChannel: React.FC<{}> = () => {
)
}
export default DirectChannel
\ No newline at end of file
export default DirectChannel
src/pages/transaction/components/createElectronModal/index.tsx
View file @ e0906406
......@@ -134,12 +134,12 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
message.error('请先选择电子合同模板')
return ;
}
const orderNo = data.orderNo
const orderId = data.orderId
const signMemberId = data.createMemberId
const params = {
contractTemplateId,
orderNo,
orderId,
signMemberId
}
......
src/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/firstApprovedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/orderCollect/apis/index.ts
View file @ e0906406
......@@ -67,7 +67,7 @@ export const fetchOrderApi = {
// 生成电子合同
async createContract(params) {
const { data } = await PublicApi.postOrderSignatureSignContractCreate(params, {ctlType: "none"})
const { data } = await PublicApi.postOrderSignaturePreOrderSignContractCreate(params, {ctlType: "none"})
return data
},
......
src/pages/transaction/purchaseOrder/orderCollect/components/memberModalTable/index.tsx
View file @ e0906406
......@@ -9,7 +9,8 @@ export interface MemberModalTableProps extends ModalTableProps {
type?: 'radio' | 'checkbox',
schemaAction: ISchemaFormActions | ISchemaFormAsyncActions,
currentRef?: any,
confirmModal?()
confirmModal?(),
productRef?: any,
}
const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
......@@ -38,6 +39,10 @@ const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
// 清空之前可能存在的商品支付信息数据
schemaAction.setFieldValue('orderProductRequests', [])
schemaAction.setFieldValue('paymentInformationResponses', [])
if(props?.productRef) {
props.productRef.current.rowSelectionCtl.setSelectRow([])
props.productRef.current.rowSelectionCtl.setSelectedRowKeys([])
}
}
return (
<ModalTable
......
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @ e0906406
......@@ -274,7 +274,15 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
})
}
if(data['electronicContractId']) {
fetchOrderApi.createContract({contractTemplateId: data['electronicContractId'], signMemberId: params['memberId'] }).then(_data => {
fetchOrderApi.createContract({
contractTemplateId: data['electronicContractId'],
signMemberId: params['memberId'],
signRoleId: params['memberRoleId'],
quotationNo: ctx.getFieldValue("quotationNo"),
orderProductRequests: ctx.getFieldValue('orderProductRequests'),
orderModel: ctx.getFieldValue('orderModel'),
deliveryAddresId: ctx.getFieldValue('deliveryAddresId'),
}).then(_data => {
ctx.setFieldState("usingElectronicContracts", state => {
state.props["x-component-props"].contract = { contractTemplateId: data['electronicContractId'], ..._data, }
})
......
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @ e0906406
......@@ -510,7 +510,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
/>
</Card>
<ProductModalTable currentRef={productRef} schemaAction={addSchemaAction} sectionProps={sectionProps} forceRender/>
<MemberModalTable currentRef={memberRef} schemaAction={addSchemaAction}/>
<MemberModalTable currentRef={memberRef} productRef={productRef} schemaAction={addSchemaAction}/>
{/* 询价报价单弹窗 */}
<InquiryModalTable currentRef={inquiryRef} schemaAction={addSchemaAction}/>
......
src/pages/transaction/purchaseOrder/readyAddOrder/schema/index.ts
View file @ e0906406
......@@ -51,26 +51,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/readyConfirmContract/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/readyFileOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/readyPayOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/readyReceiveOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/readySubmitOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/purchaseOrder/secondApprovedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/addSaleDelevedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/firstApprovedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyAddLogisticsOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyApprovedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyConfirmOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyConfirmReturnOrder/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyPayResult/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/readyReturnDocument/schema/index.ts
View file @ e0906406
......@@ -48,26 +48,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/pages/transaction/saleOrder/secondApprovedOrder/schema/index.ts
View file @ e0906406
......@@ -47,26 +47,26 @@ export const tableListSchema: ISchema = {
value: item,
}))
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
},
// "externalState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择外部状态'
// },
// enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
// label: PurchaseOrderOutWorkStateTexts[item],
// value: item,
// }))
// },
// "interiorState": {
// type: 'string',
// "x-component-props": {
// placeholder: '请选择内部状态'
// },
// enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
// label: PurchaseOrderInsideWorkStateTexts[item],
// value: item,
// }))
// },
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
......
src/utils/index.tsx
View file @ e0906406
......@@ -523,6 +523,17 @@ export const findLastIndexFlowState = (data: any[], customKey = 'isExecute'): nu
return index;
};
/**
* 清空当前存储在 sessionStorage 中的筛选参数
* 适用于重置 模态框筛选数据
*/
export const clearModalParams = () => {
let currentState = JSON.parse(sessionStorage.getItem("currentState"))
let result = {...currentState, queryParams: {}, current: 1}
sessionStorage.setItem("currentState", JSON.stringify(result))
}
export default {
isArray,
isObject,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment