diff --git a/src/api/oa/erp/projectInfo/types.ts b/src/api/oa/erp/projectInfo/types.ts index ee68741..2b5fbf1 100644 --- a/src/api/oa/erp/projectInfo/types.ts +++ b/src/api/oa/erp/projectInfo/types.ts @@ -89,6 +89,26 @@ export interface ProjectInfoVO { */ flowStatus: string; + /** + * 采购状态(1未采购 2采购中 3部分采购 4已采购) + */ + orderPurchaseStatus?: string; + + /** + * 发货状态(1未发货 2部分发货 3已发货) + */ + orderDeliveryStatus?: string; + + /** + * 开票状态(1未开票 2部分开票 3已开票) + */ + orderInvoiceStatus?: string; + + /** + * 回款百分比(0-100) + */ + orderPaymentRate?: number; + /** * 排序号 */ @@ -119,6 +139,11 @@ export interface ProjectInfoVO { */ ossId?: string | number; + /** + * 创建人用户ID(后端 Long,列表接口可能返回) + */ + createBy?: string | number; + deptName?: string; managerName?: string; @@ -229,6 +254,26 @@ export interface ProjectInfoForm extends BaseEntity { */ flowStatus?: string; + /** + * 采购状态(1未采购 2采购中 3部分采购 4已采购) + */ + orderPurchaseStatus?: string; + + /** + * 发货状态(1未发货 2部分发货 3已发货) + */ + orderDeliveryStatus?: string; + + /** + * 开票状态(1未开票 2部分开票 3已开票) + */ + orderInvoiceStatus?: string; + + /** + * 回款百分比(0-100) + */ + orderPaymentRate?: number; + /** * 排序号 */ @@ -384,6 +429,26 @@ export interface ProjectInfoQuery extends PageQuery { */ flowStatus?: string; + /** + * 采购状态(1未采购 2采购中 3部分采购 4已采购) + */ + orderPurchaseStatus?: string; + + /** + * 发货状态(1未发货 2部分发货 3已发货) + */ + orderDeliveryStatus?: string; + + /** + * 开票状态(1未开票 2部分开票 3已开票) + */ + orderInvoiceStatus?: string; + + /** + * 回款百分比(0-100) + */ + orderPaymentRate?: number; + /** * 排序号 */ @@ -426,4 +491,9 @@ export interface ProjectInfoQuery extends PageQuery { * 合同名称 */ contractName?: string; + + /** + * 创建人用户ID + */ + createBy?: string | number; } diff --git a/src/views/oa/erp/contractInfo/contractOrderIndex.vue b/src/views/oa/erp/contractInfo/contractOrderIndex.vue index f8dad1a..0a2a999 100644 --- a/src/views/oa/erp/contractInfo/contractOrderIndex.vue +++ b/src/views/oa/erp/contractInfo/contractOrderIndex.vue @@ -139,6 +139,26 @@ + + + + + + + + + + + + @@ -185,8 +205,8 @@ import ApprovalRecord from '@/components/Process/approvalRecord.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const route = useRoute(); const router = useRouter(); -const { business_direction, project_status, active_flag, contract_flag, project_category, spare_flag, wf_business_status } = toRefs( - proxy?.useDict('business_direction', 'project_status', 'active_flag', 'contract_flag', 'project_category', 'spare_flag', 'wf_business_status') +const { business_direction, project_status, active_flag, contract_flag, project_category, spare_flag, wf_business_status, order_purchase_status, order_delivery_status, order_invoice_status } = toRefs( + proxy?.useDict('business_direction', 'project_status', 'active_flag', 'contract_flag', 'project_category', 'spare_flag', 'wf_business_status', 'order_purchase_status', 'order_delivery_status', 'order_invoice_status') ); const approvalRecordRef = ref>(); @@ -231,7 +251,11 @@ const columns = ref([ { key: 26, label: `更新人`, visible: false }, { key: 27, label: `更新时间`, visible: false }, { key: 28, label: `合同编号`, visible: true }, - { key: 29, label: `合同名称`, visible: true } + { key: 29, label: `合同名称`, visible: true }, + { key: 30, label: `采购状态`, visible: true }, + { key: 31, label: `发货状态`, visible: true }, + { key: 32, label: `开票状态`, visible: true }, + { key: 33, label: `回款百分比`, visible: true } ]); const data = reactive<{ queryParams: ProjectInfoQuery }>({ diff --git a/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue new file mode 100644 index 0000000..18d5ad3 --- /dev/null +++ b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue @@ -0,0 +1,351 @@ + + + + + +