diff --git a/src/api/oa/erp/contractChangeInfo/types.ts b/src/api/oa/erp/contractChangeInfo/types.ts
index 009372d..9082f3d 100644
--- a/src/api/oa/erp/contractChangeInfo/types.ts
+++ b/src/api/oa/erp/contractChangeInfo/types.ts
@@ -145,7 +145,7 @@ export interface ContractChangeInfoVO {
projectContractCode: string;
/**
- * 交付启动期限
+ * 发货/交货期
*/
deliveryStart: number;
@@ -343,7 +343,7 @@ export interface ContractChangeInfoForm extends BaseEntity {
projectContractCode?: string;
/**
- * 交付启动期限
+ * 发货/交货期
*/
deliveryStart?: number;
@@ -537,7 +537,7 @@ export interface ContractChangeInfoQuery extends PageQuery {
projectContractCode?: string;
/**
- * 交付启动期限
+ * 发货/交货期
*/
deliveryStart?: number;
diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index b2ee1c2..c850dad 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -155,9 +155,9 @@ export interface ContractInfoVO {
mesnacContractPrice: number;
/**
- * 交付启动期限
+ * 发货/交货期
*/
- deliveryStart: number;
+ deliveryStart: string;
/**
* 质保期(天)
@@ -383,9 +383,9 @@ export interface ContractInfoForm extends BaseEntity {
mesnacContractPrice?: number;
/**
- * 交付启动期限
+ * 发货/交货期
*/
- deliveryStart?: number;
+ deliveryStart?: string;
/**
* 质保期(天)
@@ -604,9 +604,9 @@ export interface ContractInfoQuery extends PageQuery {
projectContractCode?: string;
/**
- * 交付启动期限
+ * 发货/交货期
*/
- deliveryStart?: number;
+ deliveryStart?: string;
/**
* 质保期(天)
diff --git a/src/api/oa/erp/contractLedgerReport/index.ts b/src/api/oa/erp/contractLedgerReport/index.ts
index 83f80ed..a867bef 100644
--- a/src/api/oa/erp/contractLedgerReport/index.ts
+++ b/src/api/oa/erp/contractLedgerReport/index.ts
@@ -25,7 +25,7 @@ export interface ContractLedgerReportVO {
mesnacContractPrice: number;
totalPrice: number;
paymentMethod: string;
- deliveryStart: number;
+ deliveryStart: string;
warrantyPeriod: number;
contractManagerName: string;
contractDeptName: string;
diff --git a/src/views/oa/erp/contractChange/edit.vue b/src/views/oa/erp/contractChange/edit.vue
index 1c7b09b..a2c5e04 100644
--- a/src/views/oa/erp/contractChange/edit.vue
+++ b/src/views/oa/erp/contractChange/edit.vue
@@ -247,7 +247,7 @@
-
+
diff --git a/src/views/oa/erp/contractChangeInfo/index.vue b/src/views/oa/erp/contractChangeInfo/index.vue
index e163bba..5f16c5b 100644
--- a/src/views/oa/erp/contractChangeInfo/index.vue
+++ b/src/views/oa/erp/contractChangeInfo/index.vue
@@ -85,8 +85,8 @@
-
-
+
+
@@ -193,7 +193,7 @@
-
+
@@ -310,8 +310,8 @@
-
-
+
+
@@ -412,7 +412,7 @@ const columns = ref([
{ key: 27, label: `外部合同号`, visible: true },
{ key: 28, label: `订单号`, visible: true },
{ key: 29, label: `项目号`, visible: true },
- { key: 30, label: `交付启动期限`, visible: true },
+ { key: 30, label: `发货/交货期`, visible: true },
{ key: 31, label: `质保期描述`, visible: true },
{ key: 32, label: `交货地点`, visible: true },
{ key: 33, label: `运输方式`, visible: true },
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 560e5e0..b6e6b1b 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -225,7 +225,7 @@
@@ -248,44 +248,26 @@
/>
-
-
-
-
-
-
-
+
-
-
+ />
-
+
@@ -310,10 +292,26 @@
合同付款方式
-
+
新增付款方式
+
+
+
+
+
@@ -1021,7 +1019,7 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
}
});
-// 判断表单是否禁用(查看或审批模式)
+// 判断表单是否禁用(查看或审批模式;reapprove 为审批通过未激活后修改重提,可编辑)
const isFormDisabled = computed(() => {
return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
});
@@ -1460,7 +1458,13 @@ onMounted(async () => {
routeParams.value = route.query;
loadSelectOptions();
const id = routeParams.value.id as string | number;
- if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
+ if (
+ id &&
+ (routeParams.value.type === 'update' ||
+ routeParams.value.type === 'reapprove' ||
+ routeParams.value.type === 'view' ||
+ routeParams.value.type === 'approval')
+ ) {
proxy?.$modal.loading('正在加载数据,请稍后...');
const res = await getContractInfo(id);
Object.assign(form.value, res.data);
diff --git a/src/views/oa/erp/contractLedgerReport/index.vue b/src/views/oa/erp/contractLedgerReport/index.vue
index a073b2d..d3c0472 100644
--- a/src/views/oa/erp/contractLedgerReport/index.vue
+++ b/src/views/oa/erp/contractLedgerReport/index.vue
@@ -72,7 +72,7 @@
- {{ scope.row.deliveryStart != null ? scope.row.deliveryStart + '天' : '-' }}
+ {{ scope.row.deliveryStart || '-' }}
diff --git a/src/views/oa/erp/orderLedger/index.vue b/src/views/oa/erp/orderLedger/index.vue
index 21e66a5..0898a33 100644
--- a/src/views/oa/erp/orderLedger/index.vue
+++ b/src/views/oa/erp/orderLedger/index.vue
@@ -56,8 +56,8 @@
{{ contractInfo?.paymentMethod || '-' }}
{{ contractInfo?.deliveryLocation || '-' }}
{{ contractInfo?.shipMethod || '-' }}
- {{
- contractInfo?.deliveryStart ? contractInfo.deliveryStart + ' 天' : '-'
+ {{
+ contractInfo?.deliveryStart || '-'
}}
{{
contractInfo?.warrantyPeriod ? contractInfo.warrantyPeriod + ' 天' : '-'