|
@@ -352,8 +352,8 @@ export function canPrintSlipCommand(
|
|
|
|
|
|
|
|
export type PlPlanTypeTab = 'all' | 'inbound' | 'outbound' | 'direct'
|
|
export type PlPlanTypeTab = 'all' | 'inbound' | 'outbound' | 'direct'
|
|
|
|
|
|
|
|
-/** 运输计划列表 Tab(单据类型前增加「待安排」「草稿中」) */
|
|
|
|
|
-export type PlPlanListTab = PlPlanTypeTab | 'pending_arrange' | 'drafting'
|
|
|
|
|
|
|
+/** 运输计划列表 Tab(单据类型前增加「待安排」「已安排」「草稿中」) */
|
|
|
|
|
+export type PlPlanListTab = PlPlanTypeTab | 'pending_arrange' | 'arranged' | 'drafting'
|
|
|
|
|
|
|
|
/** 危化品证上传页 Tab(在单据类型后增加「未上传证书」) */
|
|
/** 危化品证上传页 Tab(在单据类型后增加「未上传证书」) */
|
|
|
export type PlPlanCertTab = PlPlanTypeTab | 'cert_incomplete'
|
|
export type PlPlanCertTab = PlPlanTypeTab | 'cert_incomplete'
|
|
@@ -367,6 +367,7 @@ export const PL_PLAN_TYPE_TABS: { label: string; name: PlPlanTypeTab }[] = [
|
|
|
|
|
|
|
|
export const PL_PLAN_LIST_TABS: { label: string; name: PlPlanListTab }[] = [
|
|
export const PL_PLAN_LIST_TABS: { label: string; name: PlPlanListTab }[] = [
|
|
|
{ label: '待安排', name: 'pending_arrange' },
|
|
{ label: '待安排', name: 'pending_arrange' },
|
|
|
|
|
+ { label: '已安排', name: 'arranged' },
|
|
|
{ label: '草稿中', name: 'drafting' },
|
|
{ label: '草稿中', name: 'drafting' },
|
|
|
...PL_PLAN_TYPE_TABS
|
|
...PL_PLAN_TYPE_TABS
|
|
|
]
|
|
]
|
|
@@ -378,8 +379,8 @@ export const PL_PLAN_CERT_TABS: { label: string; name: PlPlanCertTab }[] = [
|
|
|
|
|
|
|
|
export function isPlPlanFollowStatusListTab(
|
|
export function isPlPlanFollowStatusListTab(
|
|
|
tab: PlPlanListTab | string
|
|
tab: PlPlanListTab | string
|
|
|
-): tab is 'pending_arrange' | 'drafting' {
|
|
|
|
|
- return tab === 'pending_arrange' || tab === 'drafting'
|
|
|
|
|
|
|
+): tab is 'pending_arrange' | 'arranged' | 'drafting' {
|
|
|
|
|
+ return tab === 'pending_arrange' || tab === 'arranged' || tab === 'drafting'
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
export function plPlanTypeTabToFilter(tab: PlPlanTypeTab): string {
|
|
export function plPlanTypeTabToFilter(tab: PlPlanTypeTab): string {
|
|
@@ -393,6 +394,9 @@ export function plPlanListTabToFilters(tab: PlPlanListTab): {
|
|
|
if (tab === 'pending_arrange') {
|
|
if (tab === 'pending_arrange') {
|
|
|
return { planType: '', followStatus: 'pending_arrange' }
|
|
return { planType: '', followStatus: 'pending_arrange' }
|
|
|
}
|
|
}
|
|
|
|
|
+ if (tab === 'arranged') {
|
|
|
|
|
+ return { planType: '', followStatus: 'arranged' }
|
|
|
|
|
+ }
|
|
|
if (tab === 'drafting') {
|
|
if (tab === 'drafting') {
|
|
|
return { planType: '', followStatus: 'drafting' }
|
|
return { planType: '', followStatus: 'drafting' }
|
|
|
}
|
|
}
|