From 7470fbdaec61d1cc3d569f76f8c663dd8aa4dfe4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 29 十月 2025 14:00:35 +0800
Subject: [PATCH] 项目利润添加合计

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

diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index e9dd49e..dcabab7 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search_form">
       <el-form :inline="true" :model="searchForm">
-        <el-form-item label="寮�绁ㄧ櫥璁�">
+        <el-form-item label="瀹㈡埛鍚嶇О">
           <el-input
             v-model="searchForm.customerName"
             style="width: 240px"
@@ -32,6 +32,12 @@
             label="涓嶆樉绀烘湭寮�绁ㄩ噾棰濅负0"
             @change="handleQuery"
           />
+        </el-form-item>
+        <br/>
+        <el-form-item label="鍚堝悓褰曞叆鏃ユ湡">
+          <el-date-picker style="width: 240px" v-model="searchForm.commonDate" value-format="YYYY-MM-DD"
+                          format="YYYY-MM-DD" type="daterange" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" clearable
+                          @change="changeDateRange" @clear="clearRange" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
@@ -81,7 +87,7 @@
               />
               <el-table-column label="鍗曚綅" prop="unit" width="70" />
               <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"
@@ -121,6 +127,7 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <el-table-column label="鍚堝悓褰曞叆鏃ユ湡" prop="entryDate" width="120" />
         <el-table-column
           label="閿�鍞悎鍚屽彿"
           prop="salesContractNo"
@@ -139,7 +146,7 @@
           show-overflow-tooltip
           width="240"
         />
-        <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip />
+        <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip width="90"/>
         <el-table-column
           label="椤圭洰鍚嶇О"
           prop="projectName"
@@ -319,8 +326,9 @@
           <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="180">
             <template #default="scope">
               <el-input-number :step="0.1" :min="0" style="width: 100%"
+															 :precision="2"
                 v-model="scope.row.currentInvoiceNum"
-                @blur="invoiceNumBlur(scope.row)"
+                @change="invoiceNumBlur(scope.row)"
               ></el-input-number>
             </template>
           </el-table-column>
@@ -331,8 +339,9 @@
           >
             <template #default="scope">
               <el-input-number :step="0.01" :min="0" style="width: 100%"
+															 :precision="2"
                 v-model="scope.row.currentInvoiceAmount"
-                @blur="invoiceAmountBlur(scope.row)"
+                @change="invoiceAmountBlur(scope.row)"
               ></el-input-number>
             </template>
           </el-table-column>
@@ -452,12 +461,28 @@
     salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     createUer: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }],
     issueDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    invoiceNo: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
     createTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
   },
 });
 const { form, rules } = toRefs(data);
 const { form: searchForm, resetForm } = useFormData(data.searchForm);
 
+
+const changeDateRange = (date) => {
+  if (date) {
+    searchForm.entryDateStart = date[0];
+    searchForm.entryDateEnd = date[1];
+    getList();
+  }
+};
+
+const clearRange = () => {
+  searchForm.commonDate = [];
+  searchForm.entryDateStart = undefined;
+  searchForm.entryDateEnd = undefined;
+  getList();
+};
 const formattedNumber = (row, column, cellValue) => {
   if (cellValue == 0) {
     return parseFloat(cellValue).toFixed(2);
@@ -539,6 +564,7 @@
     "currentInvoiceAmount",
     "noInvoiceNum",
     "noInvoiceAmount",
+    "currentInvoiceNum",
   ]);
 };
 // 鎵撳紑寮规
@@ -553,6 +579,7 @@
   getSalesLedgerWithProducts({ id: selectedRows.value[0].id }).then((res) => {
     form.value = { ...res };
     form.value.createTime = dayjs().format("YYYY-MM-DD");
+    form.value.issueDate = dayjs().format("YYYY-MM-DD");
     form.value.createUer = userStore.nickName;
     productData.value = form.value.productData.map((item) => {
       return item;

--
Gitblit v1.9.3