Commit 38f3cb90 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:新增订单外部状态

parent d2a39371
...@@ -542,7 +542,22 @@ export enum PurchaseOrderOutWorkState { ...@@ -542,7 +542,22 @@ export enum PurchaseOrderOutWorkState {
/** /**
* 货品数量还没有全部发货重新发货 * 货品数量还没有全部发货重新发货
*/ */
PRODUCT_ACOUNT_NOT_SEND PRODUCT_ACOUNT_NOT_SEND,
/**
* 待支付尾款
*/
NOT_PAYMENT_FINAL,
/**
* 待确认支付结果
*/
NOT_CONFIRM_PAYMENT_RESULT,
/**
* 确认未到账
*/
CONFIRM_WITHOUT_ARRIVED_ACCOUNT
} }
// 采购订单内部工作流状态 // 采购订单内部工作流状态
...@@ -787,7 +802,10 @@ export const PurchaseOrderOutWorkStateTexts = { ...@@ -787,7 +802,10 @@ export const PurchaseOrderOutWorkStateTexts = {
14: '完成订单', 14: '完成订单',
20: '不接受订单', 20: '不接受订单',
21: '确认没到账', 21: '确认没到账',
22: '货品未全部发货' 22: '货品未全部发货',
23: '待支付尾款',
24: '待确认支付结果',
25: '确认未到账',
} }
// 采购订单内部 // 采购订单内部
......
...@@ -125,13 +125,14 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn ...@@ -125,13 +125,14 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
state.props.enum = state.props.enum.map(v => { state.props.enum = state.props.enum.map(v => {
const assign: any = Object.assign({}, v) const assign: any = Object.assign({}, v)
// 过滤服务提供者 // 过滤服务提供者
if (auth.memberRoleType === 2) { if (auth.memberRoleType === 2) { // 采购商
// 企业+个人 // 企业+个人
if ((auth.memberType === 1 || auth.memberType === 2) && assign.value > 9) { // if ((auth.memberType === 1 || auth.memberType === 2) && (assign.value > 9 && assign.value !== 24)) {
if ((auth.memberType === 1 || auth.memberType === 2) && assign.value > 9) {
assign.disabled = true assign.disabled = true
} }
// 渠道(企业+个人) // 渠道(企业+个人)
if ((auth.memberType === 3 || auth.memberType === 4) && assign.value < 10) { if ((auth.memberType === 3 || auth.memberType === 4) && assign.value < 10) {
assign.disabled = true assign.disabled = true
} }
// 商城下单 // 商城下单
......
...@@ -153,7 +153,12 @@ export const useSelfTable = (props) => { ...@@ -153,7 +153,12 @@ export const useSelfTable = (props) => {
render: (text, record) => <> render: (text, record) => <>
{ {
record.currentPayments !== record.sum && record.currentPayments !== record.sum &&
(record.externalState === PurchaseOrderOutWorkState.PAY_ORDER || record.externalState === PurchaseOrderOutWorkState.CONFIRM_NOT_ARRIVED_ACCOUNT) && (
record.externalState === PurchaseOrderOutWorkState.PAY_ORDER ||
record.externalState === PurchaseOrderOutWorkState.CONFIRM_NOT_ARRIVED_ACCOUNT ||
record.externalState === PurchaseOrderOutWorkState.NOT_PAYMENT_FINAL ||
record.externalState === PurchaseOrderOutWorkState.CONFIRM_WITHOUT_ARRIVED_ACCOUNT
) &&
<Link to={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.id}`}>去支付</Link> <Link to={`/memberCenter/tranactionAbility/purchaseOrder/readyPayOrder/detail?id=${record.id}`}>去支付</Link>
} }
{ {
......
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