diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index 4b51b84..63e6ad3 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -139,11 +139,31 @@ export interface ContractInfoVO {
*/
projectContractCode: string;
+ /**
+ * 交付启动期限
+ */
+ deliveryStart: number;
+
/**
* 质保期(天)
*/
warrantyPeriod: number;
+ /**
+ * 质保期描述
+ */
+ warrantyPeriodDescription: string;
+
+ /**
+ * 交货地点
+ */
+ deliveryLocation: string;
+
+ /**
+ * 运输方式
+ */
+ shipMethod: string;
+
/**
* 合同税率(预留)
*/
@@ -332,11 +352,31 @@ export interface ContractInfoForm extends BaseEntity {
*/
projectContractCode?: string;
+ /**
+ * 交付启动期限
+ */
+ deliveryStart?: number;
+
/**
* 质保期(天)
*/
warrantyPeriod?: number;
+ /**
+ * 质保期描述
+ */
+ warrantyPeriodDescription?: string;
+
+ /**
+ * 交货地点
+ */
+ deliveryLocation?: string;
+
+ /**
+ * 运输方式
+ */
+ shipMethod?: string;
+
/**
* 合同税率(预留)
*/
@@ -523,6 +563,11 @@ export interface ContractInfoQuery extends PageQuery {
*/
projectContractCode?: string;
+ /**
+ * 交付启动期限
+ */
+ deliveryStart?: number;
+
/**
* 质保期(天)
*/
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index b334aa6..b3d69b5 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -88,8 +88,13 @@
-
-
+
+
+
+
@@ -187,16 +192,6 @@
-->
-
-
-
-
-
-
-
@@ -204,6 +199,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -624,6 +681,14 @@ const {
proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'account_type', 'contract_status', 'material_flag', 'contract_template_flag')
);
+/** 付款方式下拉选项(存储中文) */
+const paymentMethodOptions = [
+ '电汇',
+ '银行承兑(6个月内)',
+ '电汇/银行承兑(6个月内)',
+ '商业承兑'
+];
+
const buttonLoading = ref(false);
const contractInfoFormRef = ref();
@@ -903,7 +968,11 @@ const initFormData: ContractInfoFormEx = {
contractPaymentMethodList: [],
file: undefined,
signingPlace: undefined,
- materialRemark: undefined
+ materialRemark: undefined,
+ warrantyPeriodDescription: undefined,
+ deliveryLocation: undefined,
+ shipMethod: undefined,
+ deliveryStart: undefined
} as any;
const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
@@ -1197,6 +1266,13 @@ const handleEditPaymentMethod = (row: any, rowIndex: number) => {
resetPaymentMethodForm();
editingPaymentMethodIndex.value = rowIndex;
paymentMethodForm.value = { ...row };
+ // 根据当前行的付款节点恢复条款模板,使编辑时修改支付期限等字段能联动刷新付款条款
+ const stage = paymentStageList.value.find(
+ (s) => s.paymentStageId === row.paymentStageId || String(s.paymentStageId) === String(row.paymentStageId)
+ );
+ if (stage?.paymentTemplate) {
+ paymentMethodTemplateRaw.value = stage.paymentTemplate;
+ }
paymentMethodDialog.visible = true;
paymentMethodDialog.title = '编辑付款方式';
};
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index e96b409..795694e 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -331,7 +331,7 @@ const columns = ref([
{ key: 18, label: `流程状态`, visible: false },
{ key: 19, label: `合同模板ID`, visible: false },
{ key: 20, label: `附件ID`, visible: false },
- { key: 21, label: `付款方式`, visible: true },
+ { key: 21, label: `付款方式`, visible: false },
{ key: 22, label: `签字合同附件`, visible: false },
{ key: 23, label: `合同税率(预留)`, visible: false },
{ key: 24, label: `备注`, visible: true },