diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue
index e53ad3b..b5ccffb 100644
--- a/src/components/Process/approvalButton.vue
+++ b/src/components/Process/approvalButton.vue
@@ -40,6 +40,7 @@ const handleApprovalRecord = () => {
const submitButtonShow = computed(() => {
return (
props.pageType === 'add' ||
+ props.pageType === 'reapprove' ||
(props.pageType === 'update' && props.status && (props.status === 'draft' || props.status === 'cancel' || props.status === 'back'))
);
});
diff --git a/src/views/oa/crm/customerInfo/index.vue b/src/views/oa/crm/customerInfo/index.vue
index dde29ec..ae939ad 100644
--- a/src/views/oa/crm/customerInfo/index.vue
+++ b/src/views/oa/crm/customerInfo/index.vue
@@ -257,11 +257,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index 02dc0cc..44a6d52 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -201,7 +201,7 @@
{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
@@ -209,10 +209,19 @@
+
+
+
-
+
@@ -575,6 +584,24 @@ const handleUpdate = (row?: ContractInfoVO) => {
});
};
+/** 合同状态为可用（审批通过，contract_status=3）：可进入编辑修改并重新发起审批 */
+const canReapproveAfterApproved = (row: ContractInfoVO) => {
+ return String(row.contractStatus) === '3';
+};
+
+const handleReapprove = (row: ContractInfoVO) => {
+ const _contractId = row?.contractId;
+ if (!_contractId) return;
+ proxy.$tab.closePage(route);
+ router.push({
+ path: '/contract/contractInfo/edit',
+ query: {
+ id: _contractId,
+ type: 'reapprove'
+ }
+ });
+};
+
const handleView = (row?: ContractInfoVO) => {
const _contractId = row?.contractId;
proxy.$tab.closePage(route);
diff --git a/src/views/oa/erp/orderLedger/index.vue b/src/views/oa/erp/orderLedger/index.vue
index c10e72f..21e66a5 100644
--- a/src/views/oa/erp/orderLedger/index.vue
+++ b/src/views/oa/erp/orderLedger/index.vue
@@ -76,7 +76,7 @@