Bladeren bron

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

lamphua 2 weken geleden
bovenliggende
commit
17aeaa0f48

+ 4
- 4
oa-ui/src/views/flowable/form/business/contractForm.vue Bestand weergeven

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

+ 2
- 2
oa-ui/src/views/flowable/form/business/subContract.vue Bestand weergeven

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

Laden…
Annuleren
Opslaan