From 71e2067aa3e4844f7c129047fcee0dbba60718bb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 26 May 2025 14:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=99=BB=E8=AE=B0=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20=E6=98=AF=E5=90=A6=E9=AA=8C=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/paymentRegistration.vue        | 29 +++++++++++++++++--
 vue.config.js                                 |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 1eadb08..6e771b3 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -63,7 +63,7 @@
         <div class="xy-table-item">
           <div class="xy-table-item-label">实付日期</div>
           <div class="xy-table-item-content">
-            <el-date-picker v-model="paymentRegistrationForm.act_date" value-format="yyyy-MM-dd" style="width: 150px;">
+            <el-date-picker type="date" v-model="paymentRegistrationForm.act_date" value-format="yyyy-MM-dd" style="width: 150px;">
             </el-date-picker>
           </div>
         </div>
@@ -137,6 +137,25 @@
           </div>
         </div>
       </template>
+      <template v-slot:end_time v-if="currentStep === 1">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">项目完成时间</div>
+          <div class="xy-table-item-content">
+            <el-date-picker type="date" v-model="paymentRegistrationForm.end_time" value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:isCheck v-if="currentStep === 1">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>是否验收
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="paymentRegistrationForm.isCheck" />
+          </div>
+        </div>
+      </template>
 
       <template v-slot:extraFormBottom>
         <div v-if="currentStep === 2" class="payment-table-section">
@@ -271,6 +290,8 @@
           act_date: '',
           type: "",
           isLast: false,
+          end_time:'',
+          isCheck:false,
           plan: [],
           remark: ""
         },
@@ -409,12 +430,12 @@
         if (this.contract.contract_template) {
           this.contractTemplate = this.contract.contract_template.template;
           this.forms = this.contract.forms;
-          
+
           // 确保 contract_template_fields 存在
           if (!this.contract.contract_template.contract_template_fields) {
             this.contract.contract_template.contract_template_fields = this.contract.other_data || [];
           }
-          
+
           console.log('Contract template fields:', this.contract.contract_template.contract_template_fields);
         }
       },
@@ -463,6 +484,8 @@
           is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
           remark: this.paymentRegistrationForm.remark,
           audit_money: this.paymentRegistrationForm.audit_money,
+          end_time:this.paymentRegistrationForm.end_time,
+          is_check:this.paymentRegistrationForm.isCheck ? 1 : 0,
           // 提交更新后的HTML和字段数据
           forms: this.forms,
           other_data: this.contract.contract_template?.contract_template_fields || []
diff --git a/vue.config.js b/vue.config.js
index e9eea1d..3ee03fa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2025/h-苏州河道处/h-河道合同/contract-business-service/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2025/h-苏州河道处/h-河道合同/contract-business-service/public/admin_test',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,