Skip to content

J
jinfa-platform
Commit 91f5d509 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

新增单据中

parent dbe3cd46
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 42 deletions
src/constants/index.ts
View file @ 91f5d509
......@@ -298,8 +298,18 @@ export const DOC_DIRECTION = {
export const ORDER_TYPE2_INQUIRY = 1; // 询价采购
export const ORDER_TYPE2_DEMAND = 2; // 需求采购
export const ORDER_TYPE2_SPOT = 3; // 现货采购
// export const ORDER_TYPE2_iNQUIRY = 4; // 集采
// export const ORDER_TYPE2_iNQUIRY = 5; // 积分兑换
// export const ORDER_TYPE2_iNQUIRY = 6; // 渠道直采
// export const ORDER_TYPE2_iNQUIRY = 7; // 渠道现货
// export const ORDER_TYPE2_iNQUIRY = 8; // 渠道积分兑换
\ No newline at end of file
export const ORDER_TYPE2_CENTRALIZED = 4; // 集采
export const ORDER_TYPE2_POINTS = 5; // 积分兑换
export const ORDER_TYPE2_CHANNEL_DIRECT = 6; // 渠道直采
export const ORDER_TYPE2_CHANNEL_SPOT = 7; // 渠道现货
export const ORDER_TYPE2_CHANNEL_POINTS = 8; // 渠道积分兑换
export const ORDER_TYPE2 = {
[ORDER_TYPE2_INQUIRY]: '询价采购',
[ORDER_TYPE2_DEMAND]: '需求采购',
[ORDER_TYPE2_SPOT]: '现货采购',
[ORDER_TYPE2_CENTRALIZED]: '集采',
[ORDER_TYPE2_POINTS]: '积分兑换',
[ORDER_TYPE2_CHANNEL_DIRECT]: '渠道直采',
[ORDER_TYPE2_CHANNEL_SPOT]: '渠道现货',
[ORDER_TYPE2_CHANNEL_POINTS]: '渠道积分兑换',
};
\ No newline at end of file
src/pages/member/memberImport/index.tsx
View file @ 91f5d509
......@@ -158,7 +158,7 @@ const MemberMaintain: React.FC<[]> = () => {
type="link"
onClick={() => handleCommit(record.memberId, record.validateId)}
>
提交审核
提交平台审核
</Button>
</>
)}
......@@ -179,7 +179,10 @@ const MemberMaintain: React.FC<[]> = () => {
</>
)}
{/* 外部审核状态不等于 审核通过 可进行删除操作 */}
{record.outerStatus !== MEMBER_OUTER_STATUS_SUCCESS && (
{(
record.outerStatus === MEMBER_OUTER_STATUS_UNCOMMITTED ||
record.outerStatus === MEMBER_OUTER_STATUS_FAILED
) && (
<Popconfirm
title="确定要删除吗？"
okText="是"
......
src/pages/transaction/stockSellStorage/bills/addBills.tsx
View file @ 91f5d509
......@@ -13,7 +13,9 @@ import NiceForm from '@/components/NiceForm';
import ModalTable from '@/components/ModalTable';
import Search from '@/components/NiceForm/components/Search';
import Submit from '@/components/NiceForm/components/Submit';
import DateSelect from '@/components/NiceForm/components/DateSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ORDER_TYPE2 } from '@/constants';
import { getBillsDetailSchema, orderBillSchema } from './schema';
const addSchemaAction = createFormActions();
......@@ -33,37 +35,32 @@ const AddBills: React.FC<{}> = (props: any) => {
title: '订单号',
align: 'center',
dataIndex: 'orderNo',
key: 'orderNo',
},
{
title: '订单商品摘要',
align: 'center',
dataIndex: 'invoicesAbstract',
key: 'invoicesAbstract',
dataIndex: 'orderThe',
},
{
title: '会员名称',
align: 'center',
dataIndex: 'memberName',
key: 'memberName',
dataIndex: 'supplyMembersName',
},
{
title: '下单时间',
align: 'center',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '订单类型',
align: 'center',
dataIndex: 'orderType',
key: 'orderType',
dataIndex: 'type',
render: text => ORDER_TYPE2[text],
},
{
title: '订单状态',
align: 'center',
dataIndex: 'state',
key: 'state',
dataIndex: 'externalState',
},
];
......@@ -218,7 +215,8 @@ const AddBills: React.FC<{}> = (props: any) => {
// 关联单据弹窗 confirm
const handleConfirmRelation = () => {
console.log('relationRowCtl.selectRow', relationRowCtl.selectRow);
setVisibleRelation(false);
};
// 获取关联类型列表数据
......@@ -296,21 +294,27 @@ const AddBills: React.FC<{}> = (props: any) => {
cancel={() => setVisibleRelation(false)}
visible={visibleRelation}
columns={orderColumns}
width={960}
rowSelection={relationRowSelection}
fetchTableData={params => fetchRelationList(params)}
formilyProps={
{
ctx: {
schema: orderBillSchema,
components: { Search, Submit } ,
components: {
Search,
Submit,
DateSelect,
},
effects: ($, actions) => {
useStateFilterSearchLinkageEffect(
$,
actions,
'name',
'search',
FORM_FILTER_PATH,
);
}
},
inline: false,
}
}
}
......@@ -318,8 +322,8 @@ const AddBills: React.FC<{}> = (props: any) => {
rowKey: 'id',
onRow: (record) => ({
onClick: () => {
// productRowCtl.setSelectRow([record]);
// productRowCtl.setSelectedRowKeys([record.id]);
relationRowCtl.setSelectRow([record]);
relationRowCtl.setSelectedRowKeys([record.id]);
},
})
}}
......
src/pages/transaction/stockSellStorage/bills/schema/index.tsx
View file @ 91f5d509
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import {
ORDER_TYPE2_INQUIRY,
ORDER_TYPE2_DEMAND,
ORDER_TYPE2_SPOT,
ORDER_TYPE2_CENTRALIZED,
ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_DIRECT,
ORDER_TYPE2_CHANNEL_SPOT,
ORDER_TYPE2_CHANNEL_POINTS,
ORDER_TYPE2,
} from '@/constants';
export const billsSchema: ISchema = {
type: 'object',
......@@ -468,50 +479,58 @@ export const orderBillSchema: ISchema = {
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'Mega-Layout',
visible: false,
'x-component-props': {
inline: true,
grid: true,
full: true,
autoRow: true,
columns: 3,
},
properties: {
orderNo: {
type: 'string',
'x-component-props': {
placeholder: '订单号(全部)',
allowClear: true,
},
},
invoicesAbstract: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '订单摘要(全部)',
allowClear: true,
},
},
memberName: {
supplyMembersName: {
type: 'string',
'x-component-props': {
placeholder: '会员名称(全部)',
allowClear: true,
},
},
time: {
'[startCreateTime, endCreateTime]': {
type: 'string',
'x-component': 'DateSelect',
'x-component-props': {
placeholder: '下单时间(全部)',
placeholder: '下单时间(全部)',
allowClear: true,
},
enum: [
{ label: '今天', value: 1 },
{ label: '一周内', value: 2 },
{ label: '一个月内', value: 3 },
{ label: '三个月内', value: 4 },
{ label: '六个月内', value: 5 },
{ label: '一年内', value: 6 },
{ label: '一年前', value: 7 },
],
},
state: {
type: {
type: 'string',
'x-component-props': {
placeholder: '单据状态(全部)',
placeholder: '订单类型(全部)',
allowClear: true,
},
enum: [],
enum: [
{ label: ORDER_TYPE2[ORDER_TYPE2_INQUIRY], value: ORDER_TYPE2_INQUIRY },
{ label: ORDER_TYPE2[ORDER_TYPE2_DEMAND], value: ORDER_TYPE2_DEMAND },
{ label: ORDER_TYPE2[ORDER_TYPE2_SPOT], value: ORDER_TYPE2_SPOT },
{ label: ORDER_TYPE2[ORDER_TYPE2_CENTRALIZED], value: ORDER_TYPE2_CENTRALIZED },
{ label: ORDER_TYPE2[ORDER_TYPE2_POINTS], value: ORDER_TYPE2_POINTS },
{ label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_DIRECT], value: ORDER_TYPE2_CHANNEL_DIRECT },
{ label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_SPOT], value: ORDER_TYPE2_CHANNEL_SPOT },
{ label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_POINTS], value: ORDER_TYPE2_CHANNEL_POINTS },
],
},
submit: {
'x-component': 'Submit',
......
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