feat(金额显示): 统一金额单位为万元并优化产品内容处理

refactor(产品内容): 提取产品内容处理逻辑到独立工具类
style(合同表单): 调整技术附件和商务附件顺序

klp-ui/src/views/crm/components/OrderDetail.vue

@@ -143,6 +143,12 @@ import { listOrderItem, getOrderItem } from "@/api/crm/orderItem";
 import { actions, ORDER_ACTIONS } from "../js/actions";
 import { getOrder, updateOrder } from "@/api/crm/order";
 import OrderPrinter from "./OrderPrinter.vue";
+import {
+  parseProductContent,
+  stringifyProductContent,
+  convertOrderItemToProduct,
+  addProduct
+} from '@/utils/productContent';
 
 export default {
   name: "OrderItem",
@@ -284,113 +290,14 @@ export default {
         this.orderLoading = false;
       });
     },
-    // 计算大写金额
-      totalAmountInWords(amountStr) {
-        const amount = parseFloat(amountStr);
-        if (isNaN(amount)) return '无效的金额格式';
-        
-        if (amount === 0) return '零元整';
-        
-        const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-        const units = ['', '拾', '佰', '仟'];
-        const bigUnits = ['', '万', '亿'];
-        
-        let integerPart = Math.floor(amount);
-        let decimalPart = Math.round((amount - integerPart) * 100);
-        
-        let result = '';
-        
-        // 处理整数部分
-        if (integerPart > 0) {
-          let unitIndex = 0;
-          let bigUnitIndex = 0;
-          
-          while (integerPart > 0) {
-            let section = integerPart % 10000;
-            if (section > 0) {
-              let sectionResult = '';
-              let temp = section;
-              let unitIndexInSection = 0;
-              
-              while (temp > 0) {
-                let digit = temp % 10;
-                if (digit > 0) {
-                  sectionResult = digits[digit] + units[unitIndexInSection] + sectionResult;
-                } else {
-                  // 避免连续的零
-                  if (sectionResult && !sectionResult.startsWith('零')) {
-                    sectionResult = '零' + sectionResult;
-                  }
-                }
-                temp = Math.floor(temp / 10);
-                unitIndexInSection++;
-              }
-              
-              result = sectionResult + bigUnits[bigUnitIndex] + result;
-            }
-            
-            integerPart = Math.floor(integerPart / 10000);
-            bigUnitIndex++;
-          }
-          
-          result += '元';
-        }
-        
-        // 处理小数部分
-        if (decimalPart === 0) {
-          result += '整';
-        } else {
-          if (decimalPart >= 10) {
-            result += digits[Math.floor(decimalPart / 10)] + '角';
-          }
-          if (decimalPart % 10 > 0) {
-            result += digits[decimalPart % 10] + '分';
-          }
-        }
-        
-        return result;
-      },
     async handleWriteToContract(row) {
       const { data } = await getOrder(this.orderId);
-      let productContent = data.productContent;
       try {
-        if (!productContent) {
-          productContent = {
-            productName: '',
-            products: [{
-              spec: row.finishedProductSpec || '',
-              material: row.material || '',
-              quantity: parseFloat(row.weight) || 0,
-              taxPrice: parseFloat(row.contractPrice) || 0,
-              noTaxPrice: parseFloat(row.itemAmount) || 0,
-              taxTotal: parseFloat(row.contractPrice) || 0 * (parseFloat(row.weight) || 0),
-              remark: row.remark || ''
-            }],
-            remark: '',
-            totalQuantity: parseFloat(row.weight) || 0,
-            totalTaxTotal: parseFloat(row.contractPrice) || 0 * (parseFloat(row.weight) || 0),
-            totalAmountInWords: this.totalAmountInWords(parseFloat(row.contractPrice) || 0 * (parseFloat(row.weight) || 0)).toString()
-          };
-        } else {
-          productContent = JSON.parse(productContent);
-          productContent.products.push({
-            spec: row.finishedProductSpec || '',
-            material: row.material || '',
-            quantity: parseFloat(row.weight) || 0,
-            taxPrice: parseFloat(row.contractPrice) || 0,
-            noTaxPrice: parseFloat(row.itemAmount) || 0,
-            taxTotal: parseFloat(row.contractPrice) || 0 * (parseFloat(row.weight) || 0),
-            remark: row.remark || ''
-          });
-          // 将现有的全部加和计算
-          productContent.totalQuantity = productContent.products.reduce((acc, cur) => acc + (parseFloat(cur.quantity) || 0), 0);
-          console.log(productContent.totalQuantity);
-          productContent.totalTaxTotal = productContent.products.reduce((acc, cur) => acc + (parseFloat(cur.taxTotal) || 0), 0);
-          productContent.totalAmountInWords = this.totalAmountInWords(productContent.totalTaxTotal).toString();
-        }
-        console.log(productContent);
-        const jsonContent = JSON.stringify(productContent, null, 2);
-        console.log(jsonContent);
+        let content = parseProductContent(data.productContent);
+        const product = convertOrderItemToProduct(row);
+        content = addProduct(content, product);
+        
+        const jsonContent = stringifyProductContent(content);
         updateOrder({
           ...this.orderContent,
           productContent: jsonContent
@@ -402,8 +309,6 @@ export default {
         this.$modal.msgError("产品内容格式错误");
         return;
       }
-
-      console.log(productContent.products);
     },
     printOrder() {
       this.$refs["printer"].print();

klp-ui/src/views/crm/components/ReceiveTable.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-descriptions :column="3" title="财务状态" border>
-      <el-descriptions-item label="订单总金额">{{ order.orderAmount }}</el-descriptions-item>
-      <el-descriptions-item label="已收款金额">{{ receivedAmount }}</el-descriptions-item>
-      <el-descriptions-item label="未收款金额">{{ unreceivedAmount }}</el-descriptions-item>
+      <el-descriptions-item label="订单总金额">{{ order.orderAmount }}万元</el-descriptions-item>
+      <el-descriptions-item label="已收款金额">{{ receivedAmount }}万元</el-descriptions-item>
+      <el-descriptions-item label="未收款金额">{{ unreceivedAmount }}万元</el-descriptions-item>
     </el-descriptions>
 
     <el-descriptions title="收款明细"></el-descriptions>

klp-ui/src/views/crm/contract/components/ContractList.vue

@@ -127,6 +127,10 @@
 import { listOrder, updateOrder } from "@/api/crm/order";
 import * as ExcelJS from 'exceljs';
 import { saveAs } from 'file-saver';
+import {
+  parseProductContent,
+  convertToChinese
+} from '@/utils/productContent';
 
 export default {
   name: "ContractList",
@@ -213,62 +217,7 @@ export default {
       this.showMoreFilter = !this.showMoreFilter;
     },
     convertToChinese(amount) {
-      if (amount === 0) return '零元整'
-      
-      const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-      const units = ['', '拾', '佰', '仟']
-      const bigUnits = ['', '万', '亿']
-      
-      let integerPart = Math.floor(amount)
-      let decimalPart = Math.round((amount - integerPart) * 100)
-      
-      let result = ''
-      let unitIndex = 0
-      let bigUnitIndex = 0
-      
-      if (integerPart === 0) {
-        result = '零'
-      } else {
-        while (integerPart > 0) {
-          let section = integerPart % 10000
-          if (section > 0) {
-            let sectionResult = ''
-            let sectionUnitIndex = 0
-            
-            while (section > 0) {
-              let digit = section % 10
-              if (digit > 0) {
-                sectionResult = digits[digit] + units[sectionUnitIndex] + sectionResult
-              } else if (sectionResult && !sectionResult.startsWith('零')) {
-                sectionResult = '零' + sectionResult
-              }
-              section = Math.floor(section / 10)
-              sectionUnitIndex++
-            }
-            
-            result = sectionResult + bigUnits[bigUnitIndex] + result
-          }
-          integerPart = Math.floor(integerPart / 10000)
-          bigUnitIndex++
-        }
-      }
-      
-      result += '元'
-      
-      if (decimalPart === 0) {
-        result += '整'
-      } else {
-        const jiao = Math.floor(decimalPart / 10)
-        const fen = decimalPart % 10
-        if (jiao > 0) {
-          result += digits[jiao] + '角'
-        }
-        if (fen > 0) {
-          result += digits[fen] + '分'
-        }
-      }
-      
-      return result
+      return convertToChinese(amount);
     },
     /** 导出合同 */
     async handleExport(row) {
@@ -413,21 +362,9 @@ export default {
 
       // 产品表格数据， 来源于一个json字符串（productContent，json结构参考ProductContent.vue）
       // 解析产品内容
-      let productData = {
-        products: [],
-        productName: row.productName || '冷硬钢卷',
-        remark: '',
-        totalQuantity: 0,
-        totalTaxTotal: 0,
-        totalAmountInWords: '零元整'
-      };
-
-      if (row.productContent) {
-        try {
-          productData = JSON.parse(row.productContent);
-        } catch (error) {
-          console.error('解析产品内容失败:', error);
-        }
+      let productData = parseProductContent(row.productContent);
+      if (!productData.productName && row.productName) {
+        productData.productName = row.productName;
       }
 
       // if (orderItems) {

klp-ui/src/views/crm/contract/components/ProductContent.vue

@@ -18,9 +18,10 @@
         <div class="table-cell">规格（mm）</div>
         <div class="table-cell">材质</div>
         <div class="table-cell">数量（吨）</div>
-        <div class="table-cell">含税单价（元/吨）</div>
+        <div class="table-cell" v-if="false">含税单价（元/吨）</div>
         <div class="table-cell">不含税单价（元/吨）</div>
         <div class="table-cell">含税总额（元）</div>
+        <div class="table-cell">不含税总额（元）</div>
         <div class="table-cell">
           备注
           <el-button 
@@ -82,7 +83,7 @@
             @change="calculateTotals"
           />
         </div>
-        <div class="table-cell">
+        <div class="table-cell" v-if="false">
           <el-input 
             v-model.number="item.taxPrice" 
             placeholder="请输入含税单价" 
@@ -111,6 +112,15 @@
             size="small"
           />
         </div>
+        <div class="table-cell">
+          <el-input 
+            :value="((item.taxTotal || 0) / 1.13).toFixed(2)" 
+            placeholder="不含税总额" 
+            type="number" 
+            :readonly="true"
+            size="small"
+          />
+        </div>
         <div class="table-cell">
           <el-input 
             v-model="item.remark" 
@@ -125,9 +135,10 @@
       <div class="table-row table-total-row">
         <div class="table-cell" colspan="3">合计</div>
         <div class="table-cell">{{ totalQuantity }}</div>
-        <div class="table-cell"></div>
+        <div class="table-cell" v-if="false"></div>
         <div class="table-cell"></div>
         <div class="table-cell">{{ totalTaxTotal }}</div>
+        <div class="table-cell">{{ ((totalTaxTotal || 0) / 1.13).toFixed(2) }}</div>
         <div class="table-cell"></div>
       </div>
       
@@ -157,164 +168,93 @@
 </template>
 
 <script>
-  export default {
-    name: 'ProductContent',
-    props: {
-      value: {
-        // 一个json字符串
-        type: String,
-        required: true,
-      },
-      readonly: {
-        type: Boolean,
-        default: false
-      }
+import {
+  parseProductContent,
+  calculateTotalQuantity,
+  calculateTotalTaxTotal,
+  calculateProductTaxTotal,
+  convertToChinese
+} from '@/utils/productContent';
+
+export default {
+  name: 'ProductContent',
+  props: {
+    value: {
+      // 一个json字符串
+      type: String,
+      required: true,
     },
-    data() {
-      return {
-        loading: false,
-        products: [],
-        remark: '',
-        productName: '',
-      }
-    },
-    computed: {
-      // 计算总数量
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      products: [],
+      remark: '',
+      productName: '',
+    }
+  },
+  computed: {
+    // 计算总数量
       totalQuantity() {
-        return this.products.reduce((total, item) => {
-          return total + (parseFloat(item.quantity) || 0);
-        }, 0);
+        return calculateTotalQuantity(this.products);
       },
       // 计算总含税总额
       totalTaxTotal() {
-        return this.products.reduce((total, item) => {
-          return total + (parseFloat(item.taxTotal) || 0);
-        }, 0);
+        return calculateTotalTaxTotal(this.products);
       },
       // 计算大写金额
       totalAmountInWords() {
-        const amount = this.totalTaxTotal;
-        if (amount === 0) return '零元整';
-        
-        const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-        const units = ['', '拾', '佰', '仟'];
-        const bigUnits = ['', '万', '亿'];
-        
-        let integerPart = Math.floor(amount);
-        let decimalPart = Math.round((amount - integerPart) * 100);
-        
-        let result = '';
-        
-        // 处理整数部分
-        if (integerPart > 0) {
-          let unitIndex = 0;
-          let bigUnitIndex = 0;
-          
-          while (integerPart > 0) {
-            let section = integerPart % 10000;
-            if (section > 0) {
-              let sectionResult = '';
-              let temp = section;
-              let unitIndexInSection = 0;
-              
-              while (temp > 0) {
-                let digit = temp % 10;
-                if (digit > 0) {
-                  sectionResult = digits[digit] + units[unitIndexInSection] + sectionResult;
-                } else {
-                  // 避免连续的零
-                  if (sectionResult && !sectionResult.startsWith('零')) {
-                    sectionResult = '零' + sectionResult;
-                  }
-                }
-                temp = Math.floor(temp / 10);
-                unitIndexInSection++;
-              }
-              
-              result = sectionResult + bigUnits[bigUnitIndex] + result;
-            }
-            
-            integerPart = Math.floor(integerPart / 10000);
-            bigUnitIndex++;
-          }
-          
-          result += '元';
-        }
-        
-        // 处理小数部分
-        if (decimalPart === 0) {
-          result += '整';
-        } else {
-          if (decimalPart >= 10) {
-            result += digits[Math.floor(decimalPart / 10)] + '角';
-          }
-          if (decimalPart % 10 > 0) {
-            result += digits[decimalPart % 10] + '分';
-          }
-        }
-        
-        return result;
-      },
-      // 生成JSON字符串
-      jsonContent() {
-        // 只存储非空行
-        const nonEmptyProducts = this.products.filter(item => {
-          return item.spec || item.material || item.quantity || item.taxPrice || item.noTaxPrice || item.remark;
-        });
-        const data = {
-          products: nonEmptyProducts,
-          productName: this.productName,
-          remark: this.remark,
-          totalQuantity: this.totalQuantity,
-          totalTaxTotal: this.totalTaxTotal,
-          totalAmountInWords: this.totalAmountInWords
-        };
-        return JSON.stringify(data, null, 2);
+        return convertToChinese(this.totalTaxTotal);
       },
+    // 生成JSON字符串
+    jsonContent() {
+      // 只存储非空行
+      const nonEmptyProducts = this.products.filter(item => {
+        return item.spec || item.material || item.quantity || item.taxPrice || item.noTaxPrice || item.remark;
+      });
+      const data = {
+        products: nonEmptyProducts,
+        productName: this.productName,
+        remark: this.remark,
+        totalQuantity: this.totalQuantity,
+        totalTaxTotal: this.totalTaxTotal,
+        totalAmountInWords: this.totalAmountInWords
+      };
+      return JSON.stringify(data, null, 2);
     },
-    watch: {
-      // 监听jsonContent变化，触发update事件
-      jsonContent: {
-        handler(newValue) {
-          this.$emit('input', newValue);
-        },
-        deep: true
+  },
+  watch: {
+    // 监听jsonContent变化，触发update事件
+    jsonContent: {
+      handler(newValue) {
+        this.$emit('input', newValue);
       },
-      // 监听value变化，更新内部数据
-      value: {
-        handler(newValue) {
-          if (!newValue) {
-            this.products = [{}];
-            this.remark = '';
-            this.productName = '';
-            return;
-          }
-          this.parseContent(newValue);
-        },
-        immediate: true
-      }
+      deep: true
     },
-    methods: {
-      // 解析content字符串
+    // 监听value变化，更新内部数据
+    value: {
+      handler(newValue) {
+        if (!newValue) {
+          this.products = [{}];
+          this.remark = '';
+          this.productName = '';
+          return;
+        }
+        this.parseContent(newValue);
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    // 解析content字符串
       parseContent(content) {
         try {
-          if (!content) {
-            return {
-              productName: '',
-              products: [{
-                _isEmpty: true,
-                spec: '',
-                material: '',
-                quantity: '',
-                taxPrice: '',
-                noTaxPrice: '',
-                remark: ''
-              }],
-              remark: ''
-            }
-          }
-          const data = JSON.parse(content);
-          this.products = data.products || [{}];
+          const data = parseProductContent(content);
+          this.products = data.products.length > 0 ? data.products : [{}];
           this.remark = data.remark || '';
           this.productName = data.productName || '';
         } catch (error) {
@@ -326,32 +266,28 @@
       // 计算金额
       calculateTotals() {
         this.products.forEach(item => {
-          if (item.quantity && item.taxPrice) {
-            item.taxTotal = item.quantity * item.taxPrice;
-          } else {
-            item.taxTotal = 0;
-          }
+          item.taxTotal = calculateProductTaxTotal(item);
         });
       },
-      // 添加产品行
-      addProduct() {
-        this.products.push({});
-      },
-      // 删除产品行
-      removeProduct(index) {
-        if (this.products.length > 1) {
-          this.products.splice(index, 1);
-          this.calculateTotals();
-        }
-      }
+    // 添加产品行
+    addProduct() {
+      this.products.push({});
     },
-    mounted() {
-      // 确保至少有一个空行
-      if (this.products.length === 0) {
-        this.products.push({});
+    // 删除产品行
+    removeProduct(index) {
+      if (this.products.length > 1) {
+        this.products.splice(index, 1);
+        this.calculateTotals();
       }
     }
+  },
+  mounted() {
+    // 确保至少有一个空行
+    if (this.products.length === 0) {
+      this.products.push({});
+    }
   }
+}
 </script>
 
 <style scoped>
@@ -374,7 +310,7 @@
   
   .table-row {
     display: grid;
-    grid-template-columns: 80px 150px 120px 100px 140px 150px 120px 1fr;
+    grid-template-columns: 80px 150px 120px 100px 160px 120px 140px 1fr;
     border-bottom: 1px solid #e4e7ed;
   }
   
@@ -414,6 +350,9 @@
   .table-cell[colspan="8"] {
     grid-column: span 8;
   }
+  .table-cell[colspan="9"] {
+    grid-column: span 9;
+  }
   
   .serial-number {
     position: relative;

klp-ui/src/views/crm/contract/index.vue

@@ -147,12 +147,12 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="技术附件" prop="techAnnex">
-          <file-upload v-model="form.techAnnex" :fileType="['pdf', 'jpeg', 'jpg', 'png', 'webp']"></file-upload>
-        </el-form-item>
         <el-form-item label="商务附件" prop="businessAnnex">
           <file-upload v-model="form.businessAnnex" :fileType="['pdf', 'jpeg', 'jpg', 'png', 'webp']"></file-upload>
         </el-form-item>
+        <el-form-item label="技术附件" prop="techAnnex">
+          <file-upload v-model="form.techAnnex" :fileType="['pdf', 'jpeg', 'jpg', 'png', 'webp']"></file-upload>
+        </el-form-item>
         <el-form-item label="排产函" prop="productionSchedule">
           <file-upload v-model="form.productionSchedule"
             :fileType="['pdf', 'jpeg', 'jpg', 'png', 'webp']"></file-upload>

klp-ui/src/views/crm/report/CustomerLevelChart.vue

@@ -94,7 +94,7 @@ export default {
       const option = {
         tooltip: {
           trigger: "item",
-          formatter: "{b}<br/>销售金额：{c} 元<br/>占比：{d}%"
+          formatter: "{b}<br/>销售金额：{c} 万元<br/>占比：{d}%"
         },
         legend: {
           orient: "vertical",

klp-ui/src/views/crm/report/SalesReportOrderDetail.vue

@@ -26,7 +26,7 @@
           <el-table-column prop="contactPerson" label="联系人" min-width="80"></el-table-column>
           <el-table-column prop="customerLevel" label="客户等级" min-width="100"></el-table-column>
           <el-table-column prop="industry" label="所属行业" min-width="120"></el-table-column>
-          <el-table-column prop="orderAmount" label="订单金额">
+          <el-table-column prop="orderAmount" label="订单金额(万元)">
             <template #default="scope">
               {{ formatAmount(scope.row.orderAmount) }}
             </template>
@@ -50,7 +50,7 @@
               <el-tag v-else type="danger">未结款</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="unpaidAmount" label="未结金额" min-width="100">
+          <el-table-column prop="unpaidAmount" label="未结金额(万元)" min-width="100">
             <template #default="scope">
               {{ formatAmount(scope.row.unpaidAmount) }}
             </template>
@@ -79,7 +79,7 @@
           <el-table-column prop="productName" label="产品名称" min-width="150"></el-table-column>
           <el-table-column prop="specification" label="产品规格" min-width="120"></el-table-column>
           <el-table-column prop="productCount" label="产品数量" min-width="80"></el-table-column>
-          <el-table-column prop="unitPrice" label="单价（元）" min-width="100">
+          <el-table-column prop="unitPrice" label="单价（元 / 吨）" min-width="100">
             <template #default="scope">
               {{ formatAmount(scope.row.unitPrice) }}
             </template>
@@ -115,7 +115,7 @@
                 <span class="customer-info">客户编码：{{ customer.customerCode }}</span>
                 <span class="customer-info">客户等级：{{ customer.customerLevel }}</span>
                 <span class="customer-info">所属行业：{{ customer.industry }}</span>
-                <span class="summary-info">总订单金额：{{ formatAmount(customer.totalOrderAmount) }} 元</span>
+                <span class="summary-info">总订单金额：{{ formatAmount(customer.totalOrderAmount) }} 万元</span>
                 <span class="summary-info">订单数量：{{ customer.orderCount }} 单</span>
               </div>
             </template>
@@ -130,7 +130,7 @@
                 empty-text="该客户暂无订单数据"
               >
                 <el-table-column prop="orderCode" label="订单编号" min-width="120"></el-table-column>
-                <el-table-column prop="orderAmount" label="订单金额（元）" min-width="120">
+                <el-table-column prop="orderAmount" label="订单金额（万元）" min-width="120">
                   <template #default="scope">
                     {{ formatAmount(scope.row.orderAmount) }}
                   </template>
@@ -154,7 +154,7 @@
                     <el-tag v-else type="danger">未结款</el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column prop="unpaidAmount" label="未结金额（元）" min-width="120">
+                <el-table-column prop="unpaidAmount" label="未结金额（万元）" min-width="120">
                   <template #default="scope">
                     {{ formatAmount(scope.row.unpaidAmount) }}
                   </template>

klp-ui/src/views/crm/report/SalesReportSummaryCard.vue

@@ -7,7 +7,7 @@
           <span class="item-value">{{ summaryData.totalOrderCount || 0 }}</span>
         </div>
         <div class="summary-item">
-          <span class="item-label">总销售金额(元)</span>
+          <span class="item-label">总销售金额(万元)</span>
           <span class="item-value">{{ formatAmount(summaryData.totalSalesAmount) }}</span>
         </div>
         <div class="summary-item">
@@ -15,15 +15,15 @@
           <span class="item-value">{{ summaryData.completedOrderCount || 0 }}</span>
         </div>
         <div class="summary-item">
-          <span class="item-label">已完成销售金额(元)</span>
+          <span class="item-label">已完成销售金额(万元)</span>
           <span class="item-value">{{ formatAmount(summaryData.completedSalesAmount) }}</span>
         </div>
         <div class="summary-item">
-          <span class="item-label">未结款总金额(元)</span>
+          <span class="item-label">未结款总金额(万元)</span>
           <span class="item-value">{{ formatAmount(summaryData.totalUnpaidAmount) }}</span>
         </div>
         <div class="summary-item">
-          <span class="item-label">平均订单金额(元)</span>
+          <span class="item-label">平均订单金额(万元)</span>
           <span class="item-value">{{ formatAmount(summaryData.avgOrderAmount) }}</span>
         </div>
       </div>