diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index 567a7f7..d70ee81 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -45,7 +45,7 @@ export interface ContractInfoVO {
contractDeptId: string | number;
/**
- * 合同时间
+ * 合同签订日期
*/
contractDate: string;
@@ -124,6 +124,31 @@ export interface ContractInfoVO {
*/
twoDate: string;
+ /**
+ * 乙方公司名称(关联查询)
+ */
+ twoCustomerName?: string;
+
+ /**
+ * 付款方式明细
+ */
+ paymentMethodDetails?: string;
+
+ /**
+ * 付款账户信息
+ */
+ paymentAccountInfo?: string;
+
+ /**
+ * 甲方办公地(详细地址)
+ */
+ detailedAddress?: string;
+
+ /**
+ * 部门名称(关联查询)
+ */
+ deptName?: string;
+
/**
* 合同状态(1暂存 2审批中 3可用)
*/
@@ -160,22 +185,22 @@ export interface ContractInfoVO {
signatureAppendix: number;
/**
- * 内部合同号
+ * 海威SAP订单号(后端 erp_contract_info.internal_contract_code)
*/
internalContractCode: string;
/**
- * 外部合同号
+ * 海威合同归档编号(后端 external_contract_code)
*/
externalContractCode: string;
/**
- * 订单号
+ * 软控SAP订单号(后端 order_contract_code)
*/
orderContractCode: string;
/**
- * 项目号
+ * 软控SAP项目号(后端 project_contract_code)
*/
projectContractCode: string;
diff --git a/src/views/oa/erp/contractInfo/contractOrderIndex.vue b/src/views/oa/erp/contractInfo/contractOrderIndex.vue
index 2c2be4e..ca772e6 100644
--- a/src/views/oa/erp/contractInfo/contractOrderIndex.vue
+++ b/src/views/oa/erp/contractInfo/contractOrderIndex.vue
@@ -104,8 +104,8 @@
-
-
+
+
@@ -132,41 +132,40 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
{{ scope.row.orderPaymentRate ?? 0 }}%
-
-
-
-
+
+
+
+
@@ -253,25 +252,24 @@ const columns = ref([
{ key: 12, label: `部门负责人`, visible: false },
{ key: 13, label: `分管副总`, visible: false },
{ key: 14, label: `抄送人员`, visible: false },
- { key: 15, label: `金额`, visible: true },
- { key: 16, label: `订单状态`, visible: true },
- { key: 17, label: `流程状态`, visible: true },
- { key: 18, label: `排序号`, visible: false },
- { key: 19, label: `合同ID(预留)`, visible: false },
- { key: 20, label: `备注`, visible: true },
- { key: 21, label: `激活标识`, visible: false },
- { key: 22, label: `删除标志`, visible: false },
- { key: 23, label: `创建部门`, visible: false },
- { key: 24, label: `创建人`, visible: false },
- { key: 25, label: `创建时间`, visible: false },
- { key: 26, label: `更新人`, visible: false },
- { key: 27, label: `更新时间`, visible: false },
- { key: 28, 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 }
+ { key: 15, label: `订单状态`, visible: true },
+ { key: 16, label: `流程状态`, visible: true },
+ { key: 17, label: `排序号`, visible: false },
+ { key: 18, label: `合同ID(预留)`, visible: false },
+ { key: 19, label: `备注`, visible: true },
+ { key: 20, label: `激活标识`, visible: false },
+ { key: 21, label: `删除标志`, visible: false },
+ { key: 22, label: `创建部门`, visible: false },
+ { key: 23, label: `创建人`, visible: false },
+ { key: 24, label: `创建时间`, visible: false },
+ { key: 25, label: `更新人`, visible: false },
+ { key: 26, label: `更新时间`, visible: false },
+ { key: 27, label: `合同编号`, visible: true },
+ { key: 28, label: `合同名称`, visible: true },
+ { key: 29, label: `采购状态`, visible: true },
+ { key: 30, label: `发货状态`, visible: true },
+ { key: 31, label: `开票状态`, visible: true },
+ { key: 32, label: `回款百分比`, visible: true }
]);
const data = reactive<{ queryParams: ProjectInfoQuery }>({
diff --git a/src/views/oa/erp/orderLedger/index.vue b/src/views/oa/erp/orderLedger/index.vue
index 9891e7f..bbab85c 100644
--- a/src/views/oa/erp/orderLedger/index.vue
+++ b/src/views/oa/erp/orderLedger/index.vue
@@ -11,61 +11,144 @@
-
-
- {{ contractInfo?.contractCode || '-' }}
-
-
- {{ contractInfo?.contractName || '-' }}
-
- {{ contractInfo?.customerContractCode || '-' }}
- {{ contractInfo?.internalContractCode || '-' }}
- {{ contractInfo?.externalContractCode || '-' }}
- {{ contractInfo?.orderContractCode || '-' }}
- {{ contractInfo?.projectContractCode || '-' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ orderInfo?.orderPaymentRate ?? 0 }}%
-
- {{ contractInfo?.contractDate || '-' }}
-
-
- {{ contractInfo?.totalPrice ? formatNumber(contractInfo.totalPrice) + ' 元' : '-' }}
-
-
- {{ contractInfo?.paymentMethod || '-' }}
- {{ contractInfo?.deliveryLocation || '-' }}
- {{ contractInfo?.shipMethod || '-' }}
- {{
- contractInfo?.deliveryStart || '-'
- }}
- {{
- contractInfo?.warrantyPeriod ? contractInfo.warrantyPeriod + ' 天' : '-'
- }}
- {{ contractInfo?.warrantyPeriodDescription || '-' }}
- {{ contractInfo?.signingPlace || '-' }}
- {{ contractInfo?.remark || '-' }}
-
+
+
+
基础信息
+
+
+ {{ contractInfo.contractCode || '-' }}
+
+
+ {{ contractInfo.contractName || '-' }}
+
+ {{ contractInfo.contractManagerName || '-' }}
+
+ {{ contractInfo.contractDate ? parseTime(contractInfo.contractDate, '{y}-{m}-{d}') : '-' }}
+
+ {{ contractInfo.signingPlace || '-' }}
+ {{ contractInfo.detailedAddress || '-' }}
+
+
+
+
+
编号与外部系统
+
+ {{ contractInfo.internalContractCode || '-' }}
+ {{ contractInfo.externalContractCode || '-' }}
+ {{ contractInfo.orderContractCode || '-' }}
+ {{ contractInfo.projectContractCode || '-' }}
+
+
+
+
+
分类与合同状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ contractInfo.effectiveCustomerOrderFlag === '1'
+ ? '是'
+ : contractInfo.effectiveCustomerOrderFlag === '0'
+ ? '否'
+ : '-'
+ }}
+
+
+
+
+
+
本订单执行状态
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderInfo?.orderPaymentRate ?? 0 }}%
+
+
+
+
+
+
属地与结算
+
+
+
+
+
+
+
+
+
+
+ {{ formatExchangeRate(contractInfo.rmbExchangeRate) }}
+
+
+
+
+
签约主体
+
+ {{ contractInfo.finalCustomerName || '-' }}
+ {{ contractInfo.oneCustomerName || '-' }}
+ {{ contractInfo.oneRepresent || '-' }}
+
+ {{ contractInfo.oneDate ? parseTime(contractInfo.oneDate, '{y}-{m}-{d}') : '-' }}
+
+ {{ contractInfo.twoCustomerName || '-' }}
+ {{ contractInfo.twoRepresent || '-' }}
+
+ {{ contractInfo.twoDate ? parseTime(contractInfo.twoDate, '{y}-{m}-{d}') : '-' }}
+
+
+
+
+
+
商务与交付
+
+ {{ contractInfo.paymentMethod || '-' }}
+ {{ contractInfo.paymentAccountInfo || '-' }}
+ {{ contractInfo.deliveryLocation || '-' }}
+ {{ contractInfo.shipMethod || '-' }}
+ {{ contractInfo.deliveryStart || '-' }}
+ {{ contractInfo.warrantyPeriodDescription || '-' }}
+ {{ contractInfo.capitalizedAmount || '-' }}
+
+
+
+
+
框架合同
+
+ {{ contractInfo.frameworkContractCode || '-' }}
+ {{ contractInfo.frameworkContractName || '-' }}
+
+ {{ contractInfo.frameworkValidPeriod ? parseTime(contractInfo.frameworkValidPeriod, '{y}-{m}-{d}') : '-' }}
+
+
+
+
+
+
其他
+
+ {{ contractInfo.remark || '-' }}
+
+
+
@@ -246,8 +329,8 @@
-
-
+
+