Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-28 14:47:35
+ * @LastEditTime: 2025-08-15 09:38:15
 -->
 <template>
   <div class="app-container">
@@ -127,8 +127,8 @@
           <p class="mb20 mt20"></p>
 
           <!-- 表2：合同回款计划  -->
-          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.amount"
-            :taskName="taskName" @update:paymentList="updatePaymentList"></payment-table>
+          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.amount" :taskName="taskName"
+            @update:paymentList="updatePaymentList"></payment-table>
 
           <el-form-item label="合同备注" prop="remark">
             <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注"
@@ -937,7 +937,7 @@ export default {
             for (let projectId of this.projectContractForm.projectIds) {
               await addProjectContract({ projectId: projectId, contractId: this.form.contractId });
             }
-            this.initForm();
+            this.formTotal = 1
           } else {
             this.$message.error("新增失败，请确认合同编码是否唯一");
           }

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-15 11:27:31
+ * @LastEditTime: 2025-08-15 09:49:17
 -->
 <template>
   <div class="app-container">
@@ -856,7 +856,7 @@ export default {
           this.$modal.msgSuccess("表单新增成功");
           this.open = false;
           this.getList();
-          this.initForm();
+          this.formTotal = 1;
         });
         const subContractId = this.form.subContractId;
         this.chooseProjectList.forEach(item => {