From e03b2546f020327bf9fd414d8869a9ccd2270c2d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 17 六月 2025 17:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev

---
 src/views/salesManagement/salesLedger/index.vue |  276 +++++++++++++++++++++++-------------------------------
 1 files changed, 119 insertions(+), 157 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index d474bad..0e0a1fe 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -3,14 +3,8 @@
     <div class="search_form">
       <div>
         <span class="search_title">瀹㈡埛鍚嶇О锛�</span>
-        <el-input
-            v-model="searchForm.customerName"
-            style="width: 240px"
-            placeholder="璇疯緭鍏�"
-            @change="handleQuery"
-            clearable
-            prefix-icon="Search"
-        />
+        <el-input v-model="searchForm.customerName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
+          clearable prefix-icon="Search" />
         <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
       </div>
       <div>
@@ -20,63 +14,59 @@
       </div>
     </div>
     <div class="table_list">
-      <el-table :data="tableData" border v-loading="tableLoading"
-                @selection-change="handleSelectionChange"
-                :expand-row-keys="expandedRowKeys"
-                :row-key="row => row.id"
-                show-summary
-                :summary-method="summarizeMainTable"
-                @expand-change="expandChange"
-                height="calc(100vh - 18.5em)">
+      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+        :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
+        :summary-method="summarizeMainTable" @expand-change="expandChange" height="calc(100vh - 18.5em)">
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column type="expand">
           <template #default="props">
-            <el-table :data="props.row.children" border
-                      show-summary
-                      :summary-method="summarizeChildrenTable">
+            <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
               <el-table-column align="center" label="搴忓彿" type="index" width="60" />
               <el-table-column label="浜у搧澶х被" prop="productCategory" />
               <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
               <el-table-column label="鍗曚綅" prop="unit" />
               <el-table-column label="鏁伴噺" prop="quantity" />
               <el-table-column label="绋庣巼(%)" prop="taxRate" />
-              <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" />
-              <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
-              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+              <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+              <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+              <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
             </el-table>
           </template>
         </el-table-column>
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
-        <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" show-overflow-tooltip/>
-        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
-        <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
-        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
-        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
-        <el-table-column label="褰曞叆浜�" prop="entryPersonName" show-overflow-tooltip/>
-        <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
-        <el-table-column label="褰曞叆鏃ユ湡" prop="executionDate" show-overflow-tooltip/>
+        <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
+        <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" width="180" show-overflow-tooltip />
+        <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip />
+        <el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip />
+        <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
+        <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="180" show-overflow-tooltip
+          :formatter="formattedNumber" />
+        <el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
+        <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
+        <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
         <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
-                  :limit="page.size" @pagination="paginationChange" />
+      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+        :page="page.current" :limit="page.size" @pagination="paginationChange" />
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" width="70%" @close="closeDia">
+    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" width="70%"
+      @close="closeDia">
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
-              <el-input v-model="form.salesContractNo" placeholder="鑷姩鐢熸垚" clearable disabled/>
+              <el-input v-model="form.salesContractNo" placeholder="鑷姩鐢熸垚" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="涓氬姟鍛橈細" prop="salesman">
               <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+                  :value="item.nickName" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -84,14 +74,14 @@
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="瀹㈡埛鍚堝悓鍙凤細" prop="customerContractNo">
-              <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable/>
+              <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
               <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable>
                 <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
-                  {{item.customerName + '鈥斺��' + item.taxpayerIdentificationNumber}}
+                  {{ item.customerName + '鈥斺��' + item.taxpayerIdentificationNumber }}
                 </el-option>
               </el-select>
             </el-form-item>
@@ -100,13 +90,13 @@
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
-              <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable/>
+              <el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="褰曞叆浜猴細" prop="entryPerson">
               <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs" disabled>
-                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -114,29 +104,14 @@
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="褰曞叆鏃ユ湡锛�" prop="entryDate">
-              <el-date-picker
-                  style="width: 100%"
-                  v-model="form.entryDate"
-                  value-format="YYYY-MM-DD"
-                  format="YYYY-MM-DD"
-                  type="date"
-                  placeholder="璇烽�夋嫨"
-                  clearable
-                  disabled
-              />
+              <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+                type="date" placeholder="璇烽�夋嫨" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
-              <el-date-picker
-                  style="width: 100%"
-                  v-model="form.executionDate"
-                  value-format="YYYY-MM-DD"
-                  format="YYYY-MM-DD"
-                  type="date"
-                  placeholder="璇烽�夋嫨"
-                  clearable
-              />
+              <el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -146,7 +121,8 @@
             <el-button plain type="danger" @click="deleteProduct">鍒犻櫎</el-button>
           </el-form-item>
         </el-row>
-        <el-table :data="productData" border @selection-change="productSelected"   show-summary :summary-method="summarizeMainTable">
+        <el-table :data="productData" border @selection-change="productSelected" show-summary
+          :summary-method="summarizeMainTable">
           <el-table-column align="center" type="selection" width="55" />
           <el-table-column align="center" label="搴忓彿" type="index" width="60" />
           <el-table-column label="浜у搧澶х被" prop="productCategory" />
@@ -154,9 +130,9 @@
           <el-table-column label="鍗曚綅" prop="unit" />
           <el-table-column label="鏁伴噺" prop="quantity" />
           <el-table-column label="绋庣巼(%)" prop="taxRate" />
-          <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" />
-          <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
-          <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+          <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+          <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+          <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
           <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row);">缂栬緫</el-button>
@@ -166,25 +142,16 @@
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="澶囨敞路锛�" prop="remark">
-              <el-input v-model="form.remark" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2"/>
+              <el-input v-model="form.remark" placeholder="璇疯緭鍏�" clearable type="textarea" :rows="2" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
-              <el-upload
-                  v-model:file-list="fileList"
-                  :action="upload.url"
-                  multiple
-                  ref="fileUpload"
-                  auto-upload
-                  :headers="upload.headers"
-                  :before-upload="handleBeforeUpload"
-                  :on-error="handleUploadError"
-                  :on-success="handleUploadSuccess"
-                  :on-remove="handleRemove"
-              >
+              <el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
+                :headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
+                :on-success="handleUploadSuccess" :on-remove="handleRemove">
                 <el-button type="primary">涓婁紶</el-button>
                 <template #tip>
                   <div class="el-upload__tip">
@@ -203,27 +170,17 @@
         </div>
       </template>
     </el-dialog>
-    <el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%" @close="closeProductDia">
-      <el-form :model="productForm"
-               label-width="140px"
-               label-position="top"
-               :rules="productRules"
-               ref="productFormRef">
+    <el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%"
+      @close="closeProductDia">
+      <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
               <!-- <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
                 <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
               </el-select> -->
-              <el-tree-select
-                  v-model="productForm.productCategory"
-                  placeholder="璇烽�夋嫨" clearable
-                  check-strictly
-                  @change="getModels"
-                  :data="productOptions"
-                  :render-after-expand="false"
-                  style="width: 100%"
-              />
+              <el-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable check-strictly
+                @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
 
             </el-form-item>
           </el-col>
@@ -232,7 +189,7 @@
           <el-col :span="24">
             <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
               <el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
-                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id"/>
+                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -240,12 +197,13 @@
         <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鍗曚綅锛�" prop="unit">
-              <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable/>
+              <el-input v-model="productForm.unit" placeholder="璇疯緭鍏�" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="鏁伴噺锛�" prop="quantity">
-              <el-input v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable @change="mathNum" />
+              <el-input type="number" :step="0.1" :min="0" v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable
+                @change="mathNum" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -257,10 +215,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="绋庣巼(%)锛�" prop="taxRate">
-              <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable  @change="mathNum">
-                <el-option label="1" value="1"/>
-                <el-option label="6" value="6"/>
-                <el-option label="13" value="13"/>
+              <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="mathNum">
+                <el-option label="1" value="1" />
+                <el-option label="6" value="6" />
+                <el-option label="13" value="13" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -281,8 +239,8 @@
           <el-col :span="12">
             <el-form-item label="鍙戠エ绫诲瀷锛�" prop="invoiceType">
               <el-select v-model="productForm.invoiceType" placeholder="璇烽�夋嫨" clearable>
-                <el-option label="澧炴櫘绁�" value="澧炴櫘绁�"/>
-                <el-option label="澧炰笓绁�" value="澧炰笓绁�"/>
+                <el-option label="澧炴櫘绁�" value="澧炴櫘绁�" />
+                <el-option label="澧炰笓绁�" value="澧炰笓绁�" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -302,17 +260,17 @@
 import { getToken } from "@/utils/auth"
 import pagination from '@/components/PIMTable/Pagination.vue'
 import { ref } from 'vue'
-import {ElMessageBox } from "element-plus";
+import { ElMessageBox } from "element-plus";
 import useUserStore from '@/store/modules/user'
-import {userListNoPage} from "@/api/system/user.js";
+import { userListNoPage } from "@/api/system/user.js";
 import {
-  ledgerList,
+  ledgerListPage,
   productList,
   customerList,
   addOrUpdateSalesLedger,
   getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct, delLedgerFile
 } from "@/api/salesManagement/salesLedger.js";
-import {modelList, productTreeList} from "@/api/basicData/product.js";
+import { modelList, productTreeList } from "@/api/basicData/product.js";
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
 const tableData = ref([])
@@ -326,7 +284,7 @@
 const tableLoading = ref(false)
 const page = reactive({
   current: 1,
-  size: 10,
+  size: 100,
 })
 const total = ref(0)
 const fileList = ref([])
@@ -348,7 +306,7 @@
     entryDate: '',
     maintenanceTime: '',
     productData: [],
-    executionDate:''
+    executionDate: ''
   },
   rules: {
     salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -403,16 +361,16 @@
   page.current = 1
   getList()
 }
-const paginationChange = ({ current, limit }) => {
-  page.current = current;
-  page.size = limit;
+const paginationChange = (obj) => {
+  page.current = obj.page;
+  page.size = obj.limit;
   getList()
 }
 const getList = () => {
   tableLoading.value = true
-  ledgerList({...searchForm.value, ...page}).then(res => {
+  ledgerListPage({ ...searchForm.value, ...page }).then(res => {
     tableLoading.value = false
-    tableData.value = res.rows
+    tableData.value = res.records
     tableData.value.map(item => {
       item.children = []
     })
@@ -427,19 +385,25 @@
     productOptions.value = convertIdToValue(res)
   })
 }
+const formattedNumber = (row, column, cellValue) => {
+  return parseFloat(cellValue).toFixed(2);
+};
 // 鑾峰彇tree瀛愭暟鎹�
-const getModels =(value) => {
+const getModels = (value) => {
   productForm.value.productCategory = findNodeById(productOptions.value, value)
-  modelList({id: value}).then(res => {
+  modelList({ id: value }).then(res => {
     modelOptions.value = res
   })
 }
-const getProductModel =(value) => {
+const getProductModel = (value) => {
+  console.log('value', value)
   const index = modelOptions.value.findIndex(item => item.id === value);
   if (index !== -1) {
     productForm.value.specificationModel = modelOptions.value[index].model;
+    productForm.value.unit = modelOptions.value[index].unit;
   } else {
     productForm.value.specificationModel = null;
+    productForm.value.unit = null;
   }
 }
 const findNodeById = (nodes, productId) => {
@@ -475,7 +439,7 @@
 
   // 杩囨护鎺夊瓙鏁版嵁
   selectedRows.value = selection.filter(item => item.children !== undefined);
-  console.log('selection',selectedRows.value)
+  console.log('selection', selectedRows.value)
 }
 const productSelected = (selectedRows) => {
   productSelectedRows.value = selectedRows
@@ -486,13 +450,13 @@
   if (expandedRows.length > 0) {
     expandedRowKeys.value = []
     try {
-      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;
-      }
-      expandedRowKeys.value.push(row.id)
-    })
+      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;
+        }
+        expandedRowKeys.value.push(row.id)
+      })
     } catch (error) {
       console.log(error)
     }
@@ -502,7 +466,7 @@
 }
 // 涓昏〃鍚堣鏂规硶
 const summarizeMainTable = (param) => {
-  return proxy.summarizeTable(param, ['contractAmount','taxInclusiveTotalPrice','taxExclusiveTotalPrice']);
+  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
 };
 // 瀛愯〃鍚堣鏂规硶
 const summarizeChildrenTable = (param) => {
@@ -518,12 +482,12 @@
   customerList().then(res => {
     customerOption.value = res
   })
-  console.log('userStore.id',userStore.id)
+  console.log('userStore.id', userStore.id)
   form.value.entryPerson = userStore.id
   if (type === 'edit') {
     currentId.value = row.id;
-    getSalesLedgerWithProducts({id: row.id, type: 1}).then(res => {
-      form.value = {...res}
+    getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
+      form.value = { ...res }
       form.value.entryPerson = Number(res.entryPerson)
       productData.value = form.value.productData
       fileList.value = form.value.salesLedgerFiles
@@ -538,7 +502,7 @@
   form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
   dialogFormVisible.value = true
 }
-function changs(val){
+function changs(val) {
   console.log(val);
 }
 // 涓婁紶鍓嶆牎妫�
@@ -568,7 +532,7 @@
   }
 }
 // 绉婚櫎鏂囦欢
-function handleRemove (file) {
+function handleRemove(file) {
   if (operationType.value === 'edit') {
     let ids = []
     ids.push(file.id)
@@ -612,7 +576,7 @@
   productForm.value = {}
   proxy.resetForm("productFormRef")
   if (type === 'edit') {
-    productForm.value = {...row}
+    productForm.value = { ...row }
   }
   productFormVisible.value = true
   getProductOptions()
@@ -624,7 +588,7 @@
       if (operationType.value === "edit") {
         submitProductEdit()
       } else {
-        productData.value.push({...productForm.value})
+        productData.value.push({ ...productForm.value })
         closeProductDia()
       }
     }
@@ -635,7 +599,7 @@
   addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
     proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
     closeProductDia()
-    getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
+    getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then(res => {
       productData.value = res.productData
     })
   })
@@ -659,17 +623,17 @@
       ids = productSelectedRows.value.map(item => item.id);
     }
     ElMessageBox.confirm(
-        '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-        '瀵煎嚭', {
-          confirmButtonText: '纭',
-          cancelButtonText: '鍙栨秷',
-          type: 'warning',
-        }
+      '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
+      '瀵煎嚭', {
+      confirmButtonText: '纭',
+      cancelButtonText: '鍙栨秷',
+      type: 'warning',
+    }
     ).then(() => {
       delProduct(ids).then(res => {
         proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
         closeProductDia()
-        getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
+        getSalesLedgerWithProducts({ id: currentId.value, type: 1 }).then(res => {
           productData.value = res.productData
         })
       })
@@ -687,12 +651,12 @@
 // 瀵煎嚭
 const handleOut = () => {
   ElMessageBox.confirm(
-      '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
-      '瀵煎嚭', {
-        confirmButtonText: '纭',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning',
-      }
+    '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+    '瀵煎嚭', {
+    confirmButtonText: '纭',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning',
+  }
   ).then(() => {
     proxy.download("/sales/ledger/export", {}, '閿�鍞彴璐�.xlsx')
   }).catch(() => {
@@ -709,12 +673,12 @@
     return
   }
   ElMessageBox.confirm(
-      '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-      '瀵煎嚭', {
-        confirmButtonText: '纭',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning',
-      }
+    '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
+    '瀵煎嚭', {
+    confirmButtonText: '纭',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning',
+  }
   ).then(() => {
     delLedger(ids).then(res => {
       proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
@@ -734,16 +698,16 @@
 }
 
 const mathNum = () => {
-  console.log('productForm.value',productForm.value)
-  if(!productForm.value.taxInclusiveUnitPrice){
+  console.log('productForm.value', productForm.value)
+  if (!productForm.value.taxInclusiveUnitPrice) {
     return
   }
-  if(!productForm.value.quantity){
+  if (!productForm.value.quantity) {
     return
   }
   // 鍚◣鎬讳环璁$畻
   productForm.value.taxInclusiveTotalPrice = proxy.calculateTaxIncludeTotalPrice(productForm.value.taxInclusiveUnitPrice, productForm.value.quantity)
-  if(productForm.value.taxRate){
+  if (productForm.value.taxRate) {
     // 涓嶅惈绋庢�讳环璁$畻
     productForm.value.taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(productForm.value.taxInclusiveTotalPrice, productForm.value.taxRate)
   }
@@ -751,6 +715,4 @@
 getList()
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

--
Gitblit v1.9.3