From d83860d6839daaf7dccda5cbd68e865ba7e679ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 17:48:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/salesManagement/invoiceRegistration/index.vue |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 752c6ee..f229f81 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -74,7 +74,11 @@
                 width="60"
               />
               <el-table-column label="浜у搧澶х被" prop="productCategory" />
-              <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+              <el-table-column
+                label="瑙勬牸鍨嬪彿"
+                prop="specificationModel"
+                width="150"
+              />
               <el-table-column label="鍗曚綅" prop="unit" width="70" />
               <el-table-column label="鏁伴噺" prop="quantity" width="70" />
               <el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
@@ -150,7 +154,11 @@
           show-overflow-tooltip
           :formatter="formattedNumber"
         />
-        <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" show-overflow-tooltip>
+        <el-table-column
+          label="鏈紑绁ㄩ噾棰�(鍏�)"
+          prop="noInvoiceAmountTotal"
+          show-overflow-tooltip
+        >
           <template #default="{ row, column }">
             <el-text type="danger">
               {{ formattedNumber(row, column, row.noInvoiceAmountTotal) }}
@@ -274,7 +282,11 @@
             width="60"
           />
           <el-table-column label="浜у搧澶х被" prop="productCategory" />
-          <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+          <el-table-column
+            label="瑙勬牸鍨嬪彿"
+            prop="specificationModel"
+            width="150"
+          />
           <el-table-column label="鍗曚綅" prop="unit" />
           <el-table-column label="鏁伴噺" prop="quantity" width="70" />
           <el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
@@ -320,7 +332,7 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum">
+          <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" width="100">
             <template #default="scope">
               <el-input
                 type="number"
@@ -347,13 +359,17 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="鐧昏浜�" prop="register">
-            <template #default="{ row }">
-              <el-input v-model="row.register" placeholder="璇疯緭鍏ョ櫥璁颁汉" />
-            </template>
+          <el-table-column label="鐧昏浜�" prop="register" width="100">
+            <!-- <template #default="{ row }">
+              <el-input
+                v-model="row.register"
+                placeholder="璇疯緭鍏ョ櫥璁颁汉"
+                disabled
+              />
+            </template> -->
           </el-table-column>
-          <el-table-column label="鐧昏鏃ユ湡" prop="registerDate">
-            <template #default="{ row }">
+          <el-table-column label="鐧昏鏃ユ湡" prop="registerDate" width="150">
+            <!-- <template #default="{ row }">
               <el-date-picker
                 style="width: 100%"
                 v-model="row.registerDate"
@@ -362,8 +378,9 @@
                 type="date"
                 placeholder="璇烽�夋嫨"
                 clearable
+                disabled
               />
-            </template>
+            </template> -->
           </el-table-column>
         </el-table>
       </el-form>
@@ -449,7 +466,7 @@
 };
 
 const formattedInputNumber = (value) => {
-  return parseFloat(value).toFixed(2);
+  return value ? parseFloat(value).toFixed(2) : 0;
 };
 
 // 鏌ヨ鍒楄〃
@@ -488,7 +505,7 @@
       productList({ salesLedgerId: row.id, type: 1 }).then((res) => {
         const index = tableData.value.findIndex((item) => item.id === row.id);
         if (index > -1) {
-          tableData.value[index].children = res;
+          tableData.value[index].children = res.data;
         }
         expandedRowKeys.value.push(row.id);
       });
@@ -503,8 +520,8 @@
 const summarizeMainTable = (param) => {
   return proxy.summarizeTable(param, [
     "contractAmount",
-    "noInvoiceAmountTotal",
     "invoiceTotal",
+    "noInvoiceAmountTotal",
   ]);
 };
 // 瀛愯〃鍚堣鏂规硶
@@ -531,6 +548,8 @@
   productData.value = [];
   getSalesLedgerWithProducts({ id: selectedRows.value[0].id }).then((res) => {
     form.value = { ...res };
+    form.value.createTime = dayjs().format("YYYY-MM-DD");
+    form.value.createUer = userStore.nickName;
     productData.value = form.value.productData.map((item) => {
       return item;
     });

--
Gitblit v1.9.3