From 32bc76b2cb0d1cba8c73b434d000f658bbdf14bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 12 Aug 2025 15:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=A2=9E=E5=8A=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=9B=B8=E5=85=B3=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/KLPService/CustomerSelect/index.vue   |  2 +-
 klp-ui/src/views/wms/order/index.vue                 | 12 +++++++++++-
 klp-ui/src/views/wms/order/panels/detail.vue         | 12 +++++++++++-
 klp-ui/src/views/wms/order/pre.vue                   | 12 +++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/klp-ui/src/components/KLPService/CustomerSelect/index.vue b/klp-ui/src/components/KLPService/CustomerSelect/index.vue
index 8372ef6e..ed1dafc8 100644
--- a/klp-ui/src/components/KLPService/CustomerSelect/index.vue
+++ b/klp-ui/src/components/KLPService/CustomerSelect/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-select filterable v-model="_customerId" remote remote-method="remoteSearchCustomer" :loading="customerLoading" placeholder="请选择客户">
+  <el-select filterable v-model="_customerId" remote :remote-method="remoteSearchCustomer" :loading="customerLoading" placeholder="请选择客户">
     <el-option v-for="item in customerList" :key="item.customerId" :label="item.name" :value="item.customerId" />
   </el-select>
 </template>
diff --git a/klp-ui/src/views/wms/order/index.vue b/klp-ui/src/views/wms/order/index.vue
index 91a75819..7a744e6d 100644
--- a/klp-ui/src/views/wms/order/index.vue
+++ b/klp-ui/src/views/wms/order/index.vue
@@ -87,6 +87,8 @@
       <el-table-column label="订单编号" align="center" prop="orderCode" />
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="销售经理" align="center" prop="salesManager" />
+      <el-table-column label="含税金额" align="center" prop="taxAmount" />
+      <el-table-column label="无税金额" align="center" prop="noTaxAmount" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <el-select v-model="scope.row.orderStatus" @change="handleOrderStatusChange(scope.row)">
@@ -150,6 +152,12 @@
         <el-form-item label="销售经理" prop="salesManager">
           <el-input v-model="form.salesManager" placeholder="请输入销售经理" />
         </el-form-item>
+        <el-form-item label="含税金额" prop="taxAmount">
+          <el-input-number v-model="form.taxAmount" placeholder="请输入含税金额" />
+        </el-form-item>
+        <el-form-item label="无税金额" prop="noTaxAmount">
+          <el-input-number v-model="form.noTaxAmount" placeholder="请输入无税金额" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -274,7 +282,9 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        taxAmount: undefined,
+        noTaxAmount: undefined,
       };
       this.resetForm("form");
     },
diff --git a/klp-ui/src/views/wms/order/panels/detail.vue b/klp-ui/src/views/wms/order/panels/detail.vue
index 76bce271..4c10d177 100644
--- a/klp-ui/src/views/wms/order/panels/detail.vue
+++ b/klp-ui/src/views/wms/order/panels/detail.vue
@@ -75,6 +75,8 @@
       </el-table-column>
       <el-table-column label="产品数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="含税单价" align="center" prop="taxPrice" />
+      <el-table-column label="无税单价" align="center" prop="noTaxPrice" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -119,6 +121,12 @@
         <el-form-item label="单位" prop="unit">
           <el-input v-model="form.unit" placeholder="单位" :disabled="true" />
         </el-form-item>
+        <el-form-item label="含税单价" prop="taxPrice">
+          <el-input-number v-model="form.taxPrice" placeholder="请输入含税单价" />
+        </el-form-item>
+        <el-form-item label="无税单价" prop="noTaxPrice">
+          <el-input-number v-model="form.noTaxPrice" placeholder="请输入无税单价" :min="0" :max="form.taxPrice" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -242,13 +250,15 @@ export default {
         orderId: this.orderId,
         productId: undefined,
         quantity: undefined,
+        taxPrice: undefined,
+        noTaxPrice: undefined,
         unit: undefined,
         remark: undefined,
         delFlag: undefined,
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
       };
       this.resetForm && this.resetForm("form");
     },
diff --git a/klp-ui/src/views/wms/order/pre.vue b/klp-ui/src/views/wms/order/pre.vue
index 45cfbb44..ef7e147d 100644
--- a/klp-ui/src/views/wms/order/pre.vue
+++ b/klp-ui/src/views/wms/order/pre.vue
@@ -85,6 +85,8 @@
       <el-table-column label="订单编号" align="center" prop="orderCode" />
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="销售经理" align="center" prop="salesManager" />
+      <el-table-column label="含税金额" align="center" prop="taxAmount" />
+      <el-table-column label="无税金额" align="center" prop="noTaxAmount" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -147,6 +149,12 @@
         <el-form-item label="销售经理" prop="salesManager">
           <el-input v-model="form.salesManager" placeholder="请输入销售经理" />
         </el-form-item>
+        <el-form-item label="含税金额" prop="taxAmount">
+          <el-input-number v-model="form.taxAmount" placeholder="请输入含税金额" />
+        </el-form-item>
+        <el-form-item label="无税金额" prop="noTaxAmount">
+          <el-input-number v-model="form.noTaxAmount" placeholder="请输入无税金额" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -266,7 +274,9 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        taxAmount: undefined,
+        noTaxAmount: undefined,
       };
       this.resetForm("form");
     },