From 19f2e3bdbe04e7ea79c6a0bdc8c7318d4837b189 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:36:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_pro_山西_晋和园

---
 src/views/financialManagement/payable/paymentApply.vue |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/views/financialManagement/payable/paymentApply.vue b/src/views/financialManagement/payable/paymentApply.vue
index 3937e96..e34793f 100644
--- a/src/views/financialManagement/payable/paymentApply.vue
+++ b/src/views/financialManagement/payable/paymentApply.vue
@@ -97,7 +97,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="鐢宠鍗曞彿" prop="invoiceApplicationNo">
-              <el-input v-model="form.invoiceApplicationNo" placeholder="绯荤粺鑷姩鐢熸垚" disabled />
+              <el-input v-model="form.invoiceApplicationNo" placeholder="淇濆瓨鍚庤嚜鍔ㄧ敓鎴�" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -158,6 +158,18 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
+            <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+              <el-date-picker
+                v-model="formCreateTimeDate"
+                type="date"
+                placeholder="閫夋嫨鏃ユ湡"
+                value-format="YYYY-MM-DD"
+                style="width: 100%;"
+                :disabled="isView"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="浠樻閲戦" prop="paymentAmount">
               <el-input-number
                 v-model="form.paymentAmount"
@@ -217,7 +229,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="浠樻鍗曞彿" prop="paymentNumber">
-              <el-input v-model="paymentForm.paymentNumber" placeholder="绯荤粺鑷姩鐢熸垚" disabled />
+              <el-input v-model="paymentForm.paymentNumber" placeholder="淇濆瓨鍚庤嚜鍔ㄧ敓鎴�" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -245,6 +257,17 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+              <el-date-picker
+                v-model="paymentFormCreateTimeDate"
+                type="date"
+                placeholder="閫夋嫨鏃ユ湡"
+                value-format="YYYY-MM-DD"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="浠樻閲戦" prop="paymentAmount">
               <el-input-number
@@ -330,6 +353,7 @@
 
 <script setup>
 import { ref, reactive, computed, onMounted, nextTick, getCurrentInstance } from "vue";
+import dayjs from "dayjs";
 import { ElMessage, ElMessageBox } from "element-plus";
 import FormDialog from "@/components/Dialog/FormDialog.vue";
 import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
@@ -407,6 +431,7 @@
   bankAccount: "",
   bankName: "",
   remark: "",
+  createTime: "",
 });
 
 const paymentRules = {
@@ -429,6 +454,19 @@
   stockInRecordIds: [],
   inboundBatches: "",
   status: 0,
+  createTime: "",
+});
+const formCreateTimeDate = computed({
+  get: () => (form.createTime ? String(form.createTime).split(" ")[0] : ""),
+  set: (value) => {
+    form.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+  },
+});
+const paymentFormCreateTimeDate = computed({
+  get: () => (paymentForm.createTime ? String(paymentForm.createTime).split(" ")[0] : ""),
+  set: (value) => {
+    paymentForm.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+  },
 });
 
 const rules = {
@@ -563,6 +601,7 @@
     stockInRecordIds,
     inboundBatches: formatInboundBatches(row.inboundBatches),
     status: normalizeStatus(row.status),
+    createTime: row.createTime ?? "",
   });
 };
 
@@ -580,6 +619,7 @@
   remark: row.remark ?? "",
   status: statusOverride !== undefined ? statusOverride : normalizeStatus(row.status),
   paymentAmount: Number(row.paymentAmount ?? row.amount ?? 0),
+  createTime: row.createTime,
 });
 
 const buildSubmitPayload = (forUpdate = false) => {
@@ -593,6 +633,7 @@
     remark: form.remark || "",
     status: 0,
     paymentAmount: form.paymentAmount,
+    createTime: form.createTime,
   };
   if (forUpdate) {
     payload.id = currentId.value;
@@ -703,6 +744,7 @@
     stockInRecordIds: [],
     inboundBatches: "",
     status: 0,
+    createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
   });
   inboundBatchList.value = [];
   inboundBatchOptions.value = [];
@@ -781,6 +823,7 @@
     bankAccount: row.bankAccountNum ?? row.bankAccount ?? "",
     bankName: row.bankAccountName ?? row.bankName ?? "",
     remark: "",
+    createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
   });
   paymentDialogVisible.value = true;
   nextTick(() => {
@@ -800,6 +843,7 @@
       paymentAmount: paymentForm.paymentAmount,
       paymentNumber: paymentForm.paymentNumber || "",
       remark: paymentForm.remark || "",
+      createTime: paymentForm.createTime,
     })
       .then((res) => {
         if (res.code === 200) {

--
Gitblit v1.9.3