From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 15:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/salesManagement/invoiceRegistration/index.vue |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index bfd84f3..f5c293c 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -125,36 +125,48 @@
           label="閿�鍞悎鍚屽彿"
           prop="salesContractNo"
           show-overflow-tooltip
+          width="200"
         />
         <el-table-column
           label="瀹㈡埛鍚堝悓鍙�"
           prop="customerContractNo"
+          width="200"
           show-overflow-tooltip
         />
         <el-table-column
           label="瀹㈡埛鍚嶇О"
           prop="customerName"
           show-overflow-tooltip
+          width="240"
         />
         <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip />
         <el-table-column
           label="椤圭洰鍚嶇О"
           prop="projectName"
           show-overflow-tooltip
+          width="200"
         />
         <el-table-column
           label="鍚堝悓閲戦(鍏�)"
           prop="contractAmount"
           show-overflow-tooltip
           :formatter="formattedNumber"
+					width="220"
+
         />
         <el-table-column
           label="宸插紑绁ㄩ噾棰�(鍏�)"
           prop="invoiceTotal"
           show-overflow-tooltip
           :formatter="formattedNumber"
+          width="120"
         />
-        <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" show-overflow-tooltip>
+        <el-table-column
+          label="鏈紑绁ㄩ噾棰�(鍏�)"
+          prop="noInvoiceAmountTotal"
+          show-overflow-tooltip
+          width="120"
+        >
           <template #default="{ row, column }">
             <el-text type="danger">
               {{ formattedNumber(row, column, row.noInvoiceAmountTotal) }}
@@ -285,16 +297,18 @@
           />
           <el-table-column label="鍗曚綅" prop="unit" />
           <el-table-column label="鏁伴噺" prop="quantity" width="70" />
-          <el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
+          <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" />
           <el-table-column
             label="鍚◣鍗曚环(鍏�)"
             prop="taxInclusiveUnitPrice"
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="鍚◣鎬讳环(鍏�)"
             prop="taxInclusiveTotalPrice"
             :formatter="formattedNumber"
+						width="200"
           />
           <el-table-column
             label="涓嶅惈绋庢�讳环(鍏�)"
@@ -302,33 +316,27 @@
             :formatter="formattedNumber"
             width="150"
           />
-          <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum">
+          <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="180">
             <template #default="scope">
-              <el-input
-                type="number"
-                :step="0.1"
-                min="0"
+              <el-input-number :step="0.1" :min="0" style="width: 100%"
                 v-model="scope.row.currentInvoiceNum"
-                @blur="invoiceNumBlur(scope.row)"
-              ></el-input>
+                @change="invoiceNumBlur(scope.row)"
+              ></el-input-number>
             </template>
           </el-table-column>
           <el-table-column
             label="鏈寮�绁ㄩ噾棰�(鍏�)"
             prop="currentInvoiceAmount"
-            width="150"
+            width="180"
           >
             <template #default="scope">
-              <el-input
-                type="number"
-                :step="0.01"
-                min="0"
+              <el-input-number :step="0.01" :min="0" style="width: 100%"
                 v-model="scope.row.currentInvoiceAmount"
-                @blur="invoiceAmountBlur(scope.row)"
-              ></el-input>
+                @change="invoiceAmountBlur(scope.row)"
+              ></el-input-number>
             </template>
           </el-table-column>
-          <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum">
+          <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" width="120">
             <template #default="scope">
               <el-input
                 type="number"
@@ -341,7 +349,7 @@
           <el-table-column
             label="鏈紑绁ㄩ噾棰�(鍏�)"
             prop="noInvoiceAmount"
-            width="150"
+            width="200"
           >
             <template #default="scope">
               <el-input
@@ -356,12 +364,16 @@
             </template>
           </el-table-column>
           <el-table-column label="鐧昏浜�" prop="register" width="100">
-            <template #default="{ row }">
-              <el-input v-model="row.register" placeholder="璇疯緭鍏ョ櫥璁颁汉" />
-            </template>
+            <!-- <template #default="{ row }">
+              <el-input
+                v-model="row.register"
+                placeholder="璇疯緭鍏ョ櫥璁颁汉"
+                disabled
+              />
+            </template> -->
           </el-table-column>
           <el-table-column label="鐧昏鏃ユ湡" prop="registerDate" width="150">
-            <template #default="{ row }">
+            <!-- <template #default="{ row }">
               <el-date-picker
                 style="width: 100%"
                 v-model="row.registerDate"
@@ -372,7 +384,7 @@
                 clearable
                 disabled
               />
-            </template>
+            </template> -->
           </el-table-column>
         </el-table>
       </el-form>
@@ -512,8 +524,8 @@
 const summarizeMainTable = (param) => {
   return proxy.summarizeTable(param, [
     "contractAmount",
-    "noInvoiceAmountTotal",
     "invoiceTotal",
+    "noInvoiceAmountTotal",
   ]);
 };
 // 瀛愯〃鍚堣鏂规硶
@@ -527,6 +539,7 @@
     "currentInvoiceAmount",
     "noInvoiceNum",
     "noInvoiceAmount",
+    "currentInvoiceNum",
   ]);
 };
 // 鎵撳紑寮规

--
Gitblit v1.9.3