From 648003a577ef7a03046269c77fc5cc64199945e7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 17:06:47 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

---
 src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
index 6048e18..c317a13 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
@@ -53,10 +53,10 @@
             <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.unitPrice" @change="() => calculateTotalPrice(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column 
-           label="鎬讳环(鍏�)" 
-           prop="totalPrice" 
-           width="150" 
+        <el-table-column
+           label="鎬讳环(鍏�)"
+           prop="totalPrice"
+           width="150"
          >
         </el-table-column>
         <el-table-column label="鎿嶄綔" width="80" v-if="operationType === 'add'">
@@ -81,6 +81,7 @@
 import {
 	addStockInCustom, updateProduct
 } from "@/api/inventoryManagement/stockIn.js";
+import { getCurrentDate } from "@/utils/index.js";
 
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
@@ -185,7 +186,7 @@
 const submitForm = async () => {
   try {
     await proxy.$refs.formRef.validate()
-    
+
     if (!productList.value.length) {
       proxy.$modal.msgError('璇疯嚦灏戞坊鍔犱竴鏉′骇鍝佹暟鎹�')
       return

--
Gitblit v1.9.3