fleat: product update 1

get_product_info.php

@@ -37,20 +37,65 @@ if (isset($_GET['search'])) {
     exit;
 }
 
+// Get product specifications
+if (isset($_GET['product_id'])) {
+    $productId = (int)$_GET['product_id'];
+    
+    // Get product base information
+    $productSql = "SELECT id, ProductName, unit FROM products WHERE id = $productId";
+    $productResult = mysqli_query($conn, $productSql);
+    $product = mysqli_fetch_assoc($productResult);
+    
+    if (!$product) {
+        echo json_encode(['error' => 'Product not found']);
+        exit;
+    }
+    
+    // Get specifications for the product
+    $specSql = "SELECT id, spec_name, spec_value, price, min_order_quantity, spec_code 
+                FROM product_specifications 
+                WHERE product_id = $productId 
+                ORDER BY sort_order, spec_name";
+    $specResult = mysqli_query($conn, $specSql);
+    
+    $specifications = [];
+    while ($row = mysqli_fetch_assoc($specResult)) {
+        $specifications[] = $row;
+    }
+    
+    echo json_encode([
+        'product' => $product,
+        'specifications' => $specifications
+    ]);
+    exit;
+}
+
 // Original get product info functionality
 $id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
 
-$sql = "SELECT p.unit, pr.price 
+// Modified to include specification information
+$sql = "SELECT p.unit 
         FROM products p 
-        LEFT JOIN price pr ON p.id = pr.productId AND pr.AreaId = 0 
-        WHERE p.id = $id ORDER BY pr.num ASC LIMIT 1";
+        WHERE p.id = $id";
 
 $result = mysqli_query($conn, $sql);
 
 if ($row = mysqli_fetch_assoc($result)) {
+    // Get specifications
+    $specSql = "SELECT id, spec_name, spec_value, price, min_order_quantity, spec_code 
+                FROM product_specifications 
+                WHERE product_id = $id 
+                ORDER BY sort_order, spec_name";
+    $specResult = mysqli_query($conn, $specSql);
+    
+    $specifications = [];
+    while ($spec = mysqli_fetch_assoc($specResult)) {
+        $specifications[] = $spec;
+    }
+    
     echo json_encode([
         'unit' => $row['unit'],
-        'price' => $row['price'] ?? '0.00'
+        'specifications' => $specifications
     ]);
 } else {
     echo json_encode(['error' => 'Product not found']);

order.php

@@ -104,10 +104,10 @@ $sqlStr .= " $fliterStr ORDER BY {$ordStr}o.created_at DESC";
         
         .col2 { width: 5%; text-align: center; }
         .col3 { width: 15%; }
-        .col4 { width: 12%; }
-        .col5 { width: 18%; }
+        .col4 { width: 18%; }
+        .col5 { width: 22%; }
         .col6 { width: 12%; }
-        .col7 { width: 12%; }
+        .col7 { width: 14%; }
         .col9 { width: 10%; text-align: right; }
         .col10 { width: 16%; text-align: center; }
         

order_add.php

@@ -50,26 +50,132 @@ if ($customerId > 0) {
             margin-left: 0;
         }
         .product-row {
-            border: 1px solid #ddd;
-            padding: 10px;
-            margin-bottom: 10px;
-            background-color: #f9f9f9;
             position: relative;
+            padding: 12px 15px;
+            padding-right: 40px; /* Add right padding to make room for delete button */
+            margin-bottom: 8px;
+            border-radius: 4px;
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            background-color: #f9f9f9;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
         .delete-product {
             position: absolute;
             right: 10px;
-            top: 10px;
-            color: red;
+            top: 50%;
+            transform: translateY(-50%);
+            color: #e74c3c;
+            font-weight: bold;
+            font-size: 18px;
             cursor: pointer;
+            width: 24px;
+            height: 24px;
+            line-height: 24px;
+            text-align: center;
+            border-radius: 50%;
+            z-index: 5;
+        }
+        .delete-product:hover {
+            background-color: #e74c3c;
+            color: white;
+        }
+        .product-info {
+            flex: 2;
+            min-width: 200px;
+        }
+        .product-spec {
+            flex: 2;
+            min-width: 200px;
+        }
+        .product-quantity {
+            flex: 1;
+            min-width: 80px;
+        }
+        .product-unit {
+            flex: 0.5;
+            min-width: 60px;
+        }
+        .product-price {
+            flex: 1;
+            min-width: 100px;
+        }
+        .product-total {
+            flex: 1;
+            min-width: 100px;
+            font-weight: bold;
+        }
+        .product-row input[type="number"] {
+            width: 80px;
+            padding: 5px;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+        }
+        .product-row select {
+            width: 100%;
+            padding: 5px;
+        }
+        .selected-product-info {
+            font-weight: bold;
+            margin-bottom: 3px;
+        }
+        .row-section {
+            display: flex;
+            flex-direction: column;
+        }
+        .row-section-label {
+            font-size: 12px;
+            color: #666;
+            margin-bottom: 3px;
+        }
+        .row-section-label span {
+            display: none; /* 在大屏幕上隐藏标签文本 */
+        }
+        .spec-info {
+            margin-top: 2px;
+            font-size: 12px;
+            color: #666;
+        }
+        
+        /* 在小屏幕上的响应式布局 */
+        @media (max-width: 768px) {
+            .product-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+            .product-info, .product-spec, .product-quantity, 
+            .product-unit, .product-price, .product-total {
+                width: 100%;
+                min-width: 100%;
+                margin-bottom: 8px;
+            }
+            .row-section-label span {
+                display: inline; /* 在小屏幕上显示标签文本 */
+            }
+            .product-list-header {
+                display: none !important; /* 在小屏幕上隐藏表头 */
+            }
         }
         .add-product-btn {
             background-color: #4CAF50;
             color: white;
-            padding: 8px 12px;
+            padding: 10px 15px;
             border: none;
+            border-radius: 4px;
             cursor: pointer;
             margin-bottom: 15px;
+            font-size: 14px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            gap: 8px;
+            transition: background-color 0.2s;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+        }
+        .add-product-btn:hover {
+            background-color: #45a049;
         }
         .total-section {
             margin-top: 20px;
@@ -89,7 +195,10 @@ if ($customerId > 0) {
             overflow-y: auto;
             width: 100%;
             z-index: 1000;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
+            box-shadow: 0 3px 8px rgba(0,0,0,0.25);
+            border-radius: 0 0 4px 4px;
+            top: 100%;
+            left: 0;
         }
         .productlist ul {
             list-style: none;
@@ -97,12 +206,16 @@ if ($customerId > 0) {
             margin: 0;
         }
         .productlist li {
-            padding: 8px 10px;
+            padding: 10px 12px;
             cursor: pointer;
             border-bottom: 1px solid #eee;
+            transition: background-color 0.2s;
         }
         .productlist li:hover {
-            background-color: #f5f5f5;
+            background-color: #f0f0f0;
+        }
+        .productlist li:last-child {
+            border-bottom: none;
         }
         .productinput {
             position: relative;
@@ -113,6 +226,22 @@ if ($customerId > 0) {
             font-style: italic;
             margin-left: 5px;
         }
+        /* Specification select styling */
+        .spec-select {
+            width: 100%;
+            padding: 6px;
+            margin-top: 5px;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+        }
+        .spec-select:disabled {
+            background-color: #f9f9f9;
+        }
+        .spec-price {
+            font-weight: bold;
+            color: #d9534f;
+        }
+        /* 产品行样式优化 - 单行布局 */
     </style>
 </head>
 <body>
@@ -158,28 +287,31 @@ if ($customerId > 0) {
             <tr>
                 <th width="8%" valign="top">产品列表</th>
                 <td>
+                    <button type="button" id="add-product-btn" class="add-product-btn">添加产品</button>
+                    
+                    <div class="product-list-header" style="display: flex; background-color: #eee; padding: 8px 15px; margin-bottom: 10px; border-radius: 4px; font-weight: bold; color: #555; font-size: 13px; gap: 8px;">
+                        <div style="flex: 2; min-width: 200px;">产品</div>
+                        <div style="flex: 2; min-width: 200px;">规格</div>
+                        <div style="flex: 1; min-width: 80px;">数量</div>
+                        <div style="flex: 0.5; min-width: 60px;">单位</div>
+                        <div style="flex: 1; min-width: 100px;">单价</div>
+                        <div style="flex: 1; min-width: 100px;">总价</div>
+                    </div>
+                    
                     <div id="product-container">
-                        <!-- 产品行将通过搜索添加 -->
-                        <div id="no-products-message" style="padding: 20px; text-align: center; color: #777; background-color: #f9f9f9; border: 1px dashed #ddd; display: block;">
-                            请使用下方的产品搜索框添加产品
+                        <!-- 产品行将通过添加按钮添加 -->
+                        <div id="no-products-message" style="padding: 15px; text-align: center; color: #777; background-color: #f5f5f5; border: 1px dashed #ddd; border-radius: 4px; margin-bottom: 15px; display: block;">
+                            <i class="fa fa-info-circle"></i> 请点击"添加产品"按钮添加产品
                         </div>
                     </div>
-                    <div class="total-section">
-                        <div>
-                            <label>订单总额：</label>
-                            <span id="total-amount">0.00</span>
+                    <div class="total-section" style="margin-top: 20px; padding: 15px; background-color: #f5f5f5; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
+                        <div style="display: flex; justify-content: flex-end; align-items: center;">
+                            <label style="font-size: 16px; margin-right: 10px;">订单总额：</label>
+                            <span id="total-amount" style="font-size: 18px; font-weight: bold; color: #e74c3c;">0.00</span>
                             <input type="hidden" name="total_amount" id="total-amount-input" value="0.00">
                             <input type="hidden" name="subtotal" id="subtotal-input" value="0.00">
                         </div>
                     </div>
-                    
-                    <div style="margin-top: 15px; border-top: 1px dashed #ccc; padding-top: 15px;">
-                        <div class="productinput" style="position: relative; width: 60%;">
-                            <label>产品搜索：</label>
-                            <input type="text" id="product-search-single" class="fastsearch" placeholder="输入产品名称搜索并添加..." style="width: 100%;">
-                            <div id="product-list-single" class="productlist" style="width: 100%;"><ul></ul></div>
-                        </div>
-                    </div>
                 </td>
             </tr>
             <tr>
@@ -211,6 +343,16 @@ if ($customerId > 0) {
                 $('.product-row').first().remove();
             }
             
+            // 添加默认的产品行
+            addEmptyProductRow();
+            updateNoProductsMessage();
+            
+            // 添加产品行按钮点击事件
+            $('#add-product-btn').on('click', function() {
+                addEmptyProductRow();
+                updateNoProductsMessage();
+            });
+            
             // 删除产品行
             $(document).on('click', '.delete-product', function() {
                 if ($('.product-row').length > 1) {
@@ -291,15 +433,29 @@ if ($customerId > 0) {
                 loadCustomerContacts(customerId);
             });
 
-            // 单一产品搜索功能 - 使用防抖动以减少请求数量
-            var productSearchTimeout = null;
-            $(document).on('keyup', '#product-search-single', function() {
+            // 产品搜索框聚焦时显示搜索提示
+            $(document).on('focus', '.product-search', function() {
+                // 隐藏所有已打开的产品搜索列表
+                $('.productlist').hide();
+                
+                // 当前搜索框的值
+                var searchTerm = $(this).val().trim();
+                if (searchTerm.length >= 2) {
+                    // 找到当前行的产品列表并显示
+                    $(this).siblings('.productlist').show();
+                }
+            });
+            
+            // 产品搜索功能 - 行内搜索
+            var productSearchTimeouts = {};
+            $(document).on('keyup', '.product-search', function() {
                 var $this = $(this);
+                var rowIndex = $this.closest('.product-row').data('index');
                 var searchTerm = $this.val().trim();
-                var productList = $('#product-list-single');
+                var productList = $this.siblings('.productlist');
                 
                 // 清除之前的超时
-                clearTimeout(productSearchTimeout);
+                clearTimeout(productSearchTimeouts[rowIndex]);
                 
                 // 隐藏之前的结果
                 productList.hide();
@@ -310,7 +466,7 @@ if ($customerId > 0) {
                 }
                 
                 // 设置一个300毫秒的超时，以减少请求数量
-                productSearchTimeout = setTimeout(function() {
+                productSearchTimeouts[rowIndex] = setTimeout(function() {
                     $.ajax({
                         url: 'get_product_info.php',
                         type: 'GET',
@@ -337,78 +493,197 @@ if ($customerId > 0) {
                 }, 300);
             });
             
-            // 点击选择产品 - 从单一搜索框
-            $(document).on('click', '#product-list-single li', function() {
+            // 点击选择产品 - 行内搜索结果
+            $(document).on('click', '.productlist li', function() {
                 var $this = $(this);
                 var productId = $this.data('id');
                 var productName = $this.text(); // 这会包含分类名，需要清理
                 var categoryTag = $this.find('.category-tag').text();
+                var row = $this.closest('.product-row');
                 
                 // 清理产品名称，移除分类信息
                 if (categoryTag) {
                     productName = productName.replace(categoryTag, '').trim();
                 }
                 
-                // 检查产品是否已经添加
-                var isDuplicate = false;
-                $('.product-id-input').each(function() {
-                    if ($(this).val() == productId) {
-                        isDuplicate = true;
-                        return false; // 跳出循环
-                    }
-                });
+                // 设置产品ID和名称
+                row.find('.product-id-input').val(productId);
+                row.find('.product-search').hide();
                 
-                if (isDuplicate) {
-                    alert('该产品已添加，不能重复添加');
-                    $('#product-search-single').val('');
-                    $('#product-list-single').hide();
-                    return;
+                // 显示包含分类的完整产品信息
+                var displayName = productName;
+                if (categoryTag) {
+                    displayName += ' <span class="category-tag">' + categoryTag + '</span>';
                 }
+                row.find('.selected-product-info').html(displayName).show();
                 
-                // 添加产品行
-                addProductRowWithProduct(productId, productName, categoryTag);
+                // 隐藏产品搜索结果
+                row.find('.productlist').hide();
                 
-                // 清空搜索框并隐藏结果
-                $('#product-search-single').val('');
-                $('#product-list-single').hide();
+                // 获取产品规格信息
+                getProductSpecifications(productId, row);
+            });
+            
+            // 规格选择改变事件
+            $(document).on('change', '.spec-select', function() {
+                var $this = $(this);
+                var row = $this.closest('.product-row');
+                var specId = $this.val();
+                var specData = $this.find('option:selected').data();
+                
+                if (specId) {
+                    // 检查是否已存在相同的产品规格组合
+                    var isDuplicate = false;
+                    $('.spec-select').not($this).each(function() {
+                        if ($(this).val() == specId) {
+                            isDuplicate = true;
+                            return false; // 跳出循环
+                        }
+                    });
+                    
+                    if (isDuplicate) {
+                        alert('该产品规格已添加，不能重复添加');
+                        $this.val(''); // 重置选择
+                        return;
+                    }
+                    
+                    // 设置规格ID到隐藏字段
+                    row.find('.spec-id-input').val(specId);
+                    
+                    // 不再自动设置价格信息
+                    // if (specData.price) {
+                    //     row.find('.price-input').val(specData.price);
+                    // } else {
+                    //     row.find('.price-input').val('');
+                    // }
+                    
+                    // 存储规格价格作为最低价格限制
+                    var minPrice = specData.price || 0;
+                    var priceInput = row.find('.price-input');
+                    priceInput.attr('data-min-price', minPrice);
+                    if (minPrice > 0) {
+                        priceInput.attr('placeholder', '输入单价');
+                    } else {
+                        priceInput.attr('placeholder', '输入单价');
+                    }
+                    
+                    // 设置最小订购数量
+                    var minQty = specData.minQty || 1;
+                    var qtyInput = row.find('.quantity-input');
+                    if (parseInt(qtyInput.val()) < minQty) {
+                        qtyInput.val(minQty);
+                    }
+                    qtyInput.attr('min', minQty);
+                    
+                    // 更新规格信息显示
+                    // var specInfoHtml = '';
+                    // if (specData.code) {
+                    //     specInfoHtml += '<span>编码: ' + specData.code + '</span>';
+                    // }
+                    // if (specData.minQty > 1) {
+                    //     specInfoHtml += ' <span>最小订购量: ' + specData.minQty + '</span>';
+                    // }
+                    // if (specData.price) {
+                    //     specInfoHtml += ' <span>参考价格: ¥' + specData.price + '</span>';
+                    // }
+                    // row.find('.spec-info').html(specInfoHtml);
+                    
+                    // 重新计算总价
+                    calculateItemTotal(row.find('.price-input')[0]);
+                } else {
+                    // 清除规格相关信息
+                    row.find('.spec-id-input').val('');
+                    // 不再清除价格
+                    // row.find('.price-input').val('');
+                    row.find('.price-input').attr('data-min-price', '0').attr('placeholder', '输入单价');
+                    row.find('.spec-info').html('');
+                    calculateItemTotal(row.find('.price-input')[0]);
+                }
             });
             
             // 点击其他地方隐藏下拉列表
             $(document).on('click', function(e) {
-                if (!$(e.target).closest('#product-search-single').length) {
-                    $('#product-list-single').hide();
+                if (!$(e.target).closest('.product-search').length && !$(e.target).closest('.productlist').length) {
+                    $('.productlist').hide();
                 }
                 if (!$(e.target).closest('.customerinput').length) {
                     $('.customerlist').hide();
                 }
             });
+            
+            // 点击已选产品名显示的标签时，切换回搜索模式
+            $(document).on('click', '.selected-product-info', function() {
+                var row = $(this).closest('.product-row');
+                var productId = row.find('.product-id-input').val();
+                
+                // 只有当已经选择了产品时才允许重新选择
+                if (productId) {
+                    if (confirm('确定要重新选择产品吗？这将清除当前选择的产品及其规格信息。')) {
+                        // 清空产品ID和选择的规格
+                        row.find('.product-id-input').val('');
+                        row.find('.spec-id-input').val('');
+                        
+                        // 隐藏产品信息，显示搜索框
+                        $(this).hide();
+                        row.find('.product-search').val('').show();
+                        
+                        // 隐藏并清空规格选择
+                        row.find('.spec-select').hide().empty();
+                        row.find('.spec-info').html('');
+                        
+                        // 清除单位信息
+                        row.find('.unit-input').val('');
+                        row.find('.unit-label').text('');
+                        
+                        // 清除价格信息并重新计算总额
+                        row.find('.price-input').val('');
+                        calculateItemTotal(row.find('.price-input')[0]);
+                    }
+                }
+            });
         });
 
         function addEmptyProductRow() {
             var html = `
             <div class="product-row" data-index="${productIndex}">
                 <span class="delete-product">×</span>
-                <div>
-                    <label>产品：</label>
-                    <div style="display: inline-block; width: 60%;">
-                        <input type="hidden" name="items[${productIndex}][product_id]" class="product-id-input" value="">
-                        <div class="selected-product-info" style="margin-top: 5px; font-weight: bold;"></div>
-                    </div>
+                
+                <div class="row-section product-info">
+                    <div class="row-section-label"><span>产品</span></div>
+                    <input type="hidden" name="items[${productIndex}][product_id]" class="product-id-input" value="">
+                    <input type="text" class="product-search" placeholder="输入产品名称搜索..." style="width: 100%; padding: 5px; border: 1px solid #ddd; border-radius: 4px;">
+                    <div class="productlist" style="width: 100%; max-height: 200px;"><ul></ul></div>
+                    <div class="selected-product-info" style="cursor: pointer; display: none;" title="点击重新选择产品"></div>
+                </div>
+                
+                <div class="row-section product-spec">
+                    <div class="row-section-label"><span>规格</span></div>
+                    <input type="hidden" name="items[${productIndex}][spec_id]" class="spec-id-input" value="">
+                    <select class="spec-select" name="items[${productIndex}][spec_select]" style="display: none;">
+                        <option value="">请选择规格</option>
+                    </select>
+                    <div class="spec-info"></div>
                 </div>
-                <div style="margin-top: 5px;">
-                    <label>数量：</label>
+                
+                <div class="row-section product-quantity">
+                    <div class="row-section-label"><span>数量</span></div>
                     <input type="number" name="items[${productIndex}][quantity]" value="1" min="1" class="quantity-input" onchange="calculateItemTotal(this)">
-
-                    <label style="margin-left: 10px;">单位：</label>
+                </div>
+                
+                <div class="row-section product-unit">
+                    <div class="row-section-label"><span>单位</span></div>
                     <span class="unit-label" style="display: inline-block; padding: 2px 5px; min-width: 30px;"></span>
                     <input type="hidden" name="items[${productIndex}][unit]" class="unit-input" value="">
-
-                    <label style="margin-left: 10px;">单价：</label>
-                    <input type="number" step="0.01" name="items[${productIndex}][unit_price]" value="" class="price-input" placeholder="请输入单价" onchange="calculateItemTotal(this)">
-                    
-                    <label style="margin-left: 10px;">总价：</label>
-                    <span class="total-price-display" style="display: inline-block; background-color: #f0f0f0; border: 1px solid #ddd; padding: 2px 8px; min-width: 60px; text-align: right; font-weight: bold;">0.00</span>
-
+                </div>
+                
+                <div class="row-section product-price">
+                    <div class="row-section-label"><span>单价</span></div>
+                    <input type="number" step="0.01" name="items[${productIndex}][unit_price]" value="" class="price-input" placeholder="输入单价" onchange="calculateItemTotal(this)">
+                </div>
+                
+                <div class="row-section product-total">
+                    <div class="row-section-label"><span>总价</span></div>
+                    <span class="total-price-display" style="display: inline-block; background-color: #f0f0f0; border: 1px solid #ddd; padding: 2px 8px; min-width: 60px; text-align: right;">0.00</span>
                     <input type="hidden" name="items[${productIndex}][total_price]" value="0.00" class="total-price-input">
                 </div>
             </div>
@@ -419,26 +694,72 @@ if ($customerId > 0) {
             return productIndex - 1; // 返回新添加行的索引
         }
         
-        function addProductRowWithProduct(productId, productName, categoryTag) {
-            // 添加空行
-            var rowIndex = addEmptyProductRow();
-            var row = $('.product-row[data-index="' + rowIndex + '"]');
-            
-            // 设置产品ID和名称
-            row.find('.product-id-input').val(productId);
-            
-            // 显示包含分类的完整产品信息
-            var displayName = productName;
-            if (categoryTag) {
-                displayName += ' <span class="category-tag">' + categoryTag + '</span>';
-            }
-            row.find('.selected-product-info').html(displayName);
-            
-            // 获取产品信息
-            getProductInfo(productId, row);
+        function getProductSpecifications(productId, row) {
+            if (!productId) return;
             
-            // 更新无产品消息显示
-            updateNoProductsMessage();
+            $.ajax({
+                url: 'get_product_info.php',
+                type: 'GET',
+                data: {product_id: productId},
+                dataType: 'json',
+                success: function(data) {
+                    if (data && data.product && data.specifications) {
+                        // 恢复设置单位信息
+                        if (data.product.unit) {
+                            row.find('.unit-input').val(data.product.unit);
+                            row.find('.unit-label').text(data.product.unit);
+                        }
+                        
+                        // 处理规格信息
+                        var specifications = data.specifications;
+                        if (specifications.length === 0) {
+                            alert('此产品没有规格信息，请添加规格后再选择');
+                            // 重置产品选择
+                            row.find('.product-id-input').val('');
+                            row.find('.selected-product-info').hide();
+                            row.find('.product-search').val('').show();
+                            return;
+                        }
+                        
+                        // 填充规格选择下拉框
+                        var specSelect = row.find('.spec-select');
+                        specSelect.empty();
+                        specSelect.append('<option value="">请选择规格</option>');
+                        
+                        $.each(specifications, function(i, spec) {
+                            var displayText = spec.spec_name + ': ' + spec.spec_value;
+                            if (spec.price) {
+                                displayText += ' (¥' + spec.price + ')';
+                            }
+                            
+                            var option = $('<option></option>')
+                                .attr('value', spec.id)
+                                .text(displayText)
+                                .data('price', spec.price)
+                                .data('minQty', spec.min_order_quantity)
+                                .data('code', spec.spec_code);
+                            
+                            specSelect.append(option);
+                        });
+                        
+                        // 显示规格选择下拉框
+                        specSelect.show();
+                    } else {
+                        alert('获取产品规格失败');
+                        // 重置产品选择
+                        row.find('.product-id-input').val('');
+                        row.find('.selected-product-info').hide();
+                        row.find('.product-search').val('').show();
+                    }
+                },
+                error: function() {
+                    alert('获取产品规格失败，请重试');
+                    // 重置产品选择
+                    row.find('.product-id-input').val('');
+                    row.find('.selected-product-info').hide();
+                    row.find('.product-search').val('').show();
+                }
+            });
         }
 
         function reindexProductRows() {
@@ -455,38 +776,20 @@ if ($customerId > 0) {
             productIndex = $('.product-row').length;
         }
 
-        function getProductInfo(productId, row) {
-            if (!productId) return;
-            
-            $.ajax({
-                url: 'get_product_info.php',
-                type: 'GET',
-                data: {id: productId},
-                dataType: 'json',
-                success: function(data) {
-                    if (data) {
-                        // 设置单位到隐藏输入框和显示标签
-                        row.find('.unit-input').val(data.unit);
-                        row.find('.unit-label').text(data.unit || '');
-
-                        // 只有当数据库中有价格信息时才设置价格
-                        if (data.price && data.price !== '0' && data.price !== '0.00') {
-                            //默认不设置单价
-                            //row.find('.price-input').val(data.price);
-
-                        }
-                        calculateItemTotal(row.find('.price-input')[0]);
-                    }
-                }
-            });
-        }
-
         function calculateItemTotal(element) {
             var row = $(element).closest('.product-row');
             var quantity = parseInt(row.find('.quantity-input').val()) || 0;
             var priceInput = row.find('.price-input');
             var priceValue = priceInput.val().trim();
             var price = (priceValue === '') ? 0 : (parseFloat(priceValue) || 0);
+            var minPrice = parseFloat(priceInput.attr('data-min-price')) || 0;
+
+            // 检查价格是否低于规格最低价
+            if (price > 0 && minPrice > 0 && price < minPrice) {
+                priceInput.css('color', 'red');
+            } else {
+                priceInput.css('color', '');
+            }
 
             var total = quantity * price;
             if (total < 0) total = 0;
@@ -532,23 +835,59 @@ if ($customerId > 0) {
             var customerId = $('#customer_id').val();
             var customerName = $('.customer-search').val();
             var hasProducts = false;
+            var allSpecsSelected = true;
             var allPricesValid = true;
-            var firstEmptyPriceField = null;
+            var allPricesHighEnough = true;
+            var firstInvalidField = null;
 
-            $('.product-id-input').each(function() {
-                if ($(this).val()) {
-                    hasProducts = true;
-                    
-                    // 检查该产品的单价是否已填写
-                    var row = $(this).closest('.product-row');
-                    var priceInput = row.find('.price-input');
-                    var priceValue = priceInput.val().trim();
-                    
-                    if (priceValue === '' || isNaN(parseFloat(priceValue))) {
-                        allPricesValid = false;
-                        if (!firstEmptyPriceField) {
-                            firstEmptyPriceField = priceInput;
-                        }
+            // 检查是否有产品行
+            if ($('.product-row').length === 0) {
+                alert('请至少添加一个产品');
+                $('#add-product-btn').focus();
+                return false;
+            }
+
+            $('.product-row').each(function() {
+                var productId = $(this).find('.product-id-input').val();
+                var specId = $(this).find('.spec-id-input').val();
+                var priceInput = $(this).find('.price-input');
+                var priceValue = priceInput.val().trim();
+                var price = parseFloat(priceValue) || 0;
+                var minPrice = parseFloat(priceInput.attr('data-min-price')) || 0;
+                var specSelect = $(this).find('.spec-select');
+                var productSearch = $(this).find('.product-search');
+                
+                // 检查产品是否已选择
+                if (!productId) {
+                    if (!firstInvalidField) {
+                        firstInvalidField = productSearch;
+                    }
+                    return true; // continue
+                }
+                
+                hasProducts = true;
+                
+                // 检查规格是否已选择
+                if (!specId && specSelect.is(':visible')) {
+                    allSpecsSelected = false;
+                    if (!firstInvalidField) {
+                        firstInvalidField = specSelect;
+                    }
+                }
+                
+                // 检查单价是否有效
+                if (priceValue === '' || isNaN(parseFloat(priceValue))) {
+                    allPricesValid = false;
+                    if (!firstInvalidField) {
+                        firstInvalidField = priceInput;
+                    }
+                }
+                
+                // 检查单价是否大于等于规格价格
+                if (minPrice > 0 && price < minPrice) {
+                    allPricesHighEnough = false;
+                    if (!firstInvalidField) {
+                        firstInvalidField = priceInput;
                     }
                 }
             });
@@ -573,19 +912,39 @@ if ($customerId > 0) {
             }
             
             if (!hasProducts) {
-                alert('请至少添加一个产品');
-                $('#product-search-single').focus();
+                alert('请至少添加一个有效的产品');
+                if (firstInvalidField) {
+                    firstInvalidField.focus();
+                } else {
+                    $('#add-product-btn').focus();
+                }
+                return false;
+            }
+            
+            if (!allSpecsSelected) {
+                alert('请为所有产品选择规格');
+                if (firstInvalidField) {
+                    firstInvalidField.focus();
+                }
                 return false;
             }
             
             if (!allPricesValid) {
                 alert('请为所有产品输入有效的单价');
-                if (firstEmptyPriceField) {
-                    firstEmptyPriceField.focus();
+                if (firstInvalidField) {
+                    firstInvalidField.focus();
                 }
                 return false;
             }
-
+            
+            if (!allPricesHighEnough) {
+                alert('单价不能低于规格设定的参考价格');
+                if (firstInvalidField) {
+                    firstInvalidField.focus();
+                }
+                return false;
+            }
+            
             return true;
         }
 

order_details.php

@@ -25,9 +25,10 @@ if (!empty($id) && is_numeric($id)) {
     }
 
     // 获取订单项信息
-    $sql = "SELECT oi.*, p.ProductName 
+    $sql = "SELECT oi.*, p.ProductName,ps.spec_name
             FROM order_items oi 
             LEFT JOIN products p ON oi.product_id = p.id 
+            LEFT JOIN product_specifications ps ON oi.specification_id = ps.id
             WHERE oi.order_id = $id";
 
     $itemsResult = mysqli_query($conn, $sql);
@@ -64,6 +65,8 @@ if (!empty($id) && is_numeric($id)) {
             padding: 15px;
             margin-bottom: 20px;
             background-color: #f9f9f9;
+            border-radius: 4px;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
         .order-info h2 {
             margin-top: 0;
@@ -78,31 +81,101 @@ if (!empty($id) && is_numeric($id)) {
             display: inline-block;
             width: 120px;
         }
-        .products-table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
+        
+        /* 产品行样式 - 从order_add.php采用 */
+        .product-row {
+            position: relative;
+            padding: 12px 15px;
+            margin-bottom: 8px;
+            border-radius: 4px;
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            background-color: #f9f9f9;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
-        .products-table th, .products-table td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
+        .product-info {
+            flex: 2;
+            min-width: 200px;
+        }
+        .product-spec {
+            flex: 2;
+            min-width: 200px;
         }
-        .products-table th {
-            background-color: #f2f2f2;
+        .product-quantity {
+            flex: 1;
+            min-width: 80px;
         }
-        /* 移除徽章式样，使用普通文本显示 */
-        .order-status {
+        .product-unit {
+            flex: 0.5;
+            min-width: 60px;
+        }
+        .product-price {
+            flex: 1;
+            min-width: 100px;
+        }
+        .product-total {
+            flex: 1;
+            min-width: 100px;
             font-weight: bold;
         }
-        .payment-status {
+        .product-discount {
+            flex: 1;
+            min-width: 100px;
+        }
+        .product-notes {
+            flex: 2;
+            min-width: 200px;
+        }
+        .row-section {
+            display: flex;
+            flex-direction: column;
+        }
+        .row-section-label {
+            font-size: 12px;
+            color: #666;
+            margin-bottom: 3px;
+        }
+        .product-list-header {
+            display: flex;
+            background-color: #eee;
+            padding: 8px 15px;
+            margin-bottom: 10px;
+            border-radius: 4px;
             font-weight: bold;
+            color: #555;
+            font-size: 13px;
+            gap: 8px;
         }
-
+        
+        /* 响应式设计 */
+        @media (max-width: 768px) {
+            .product-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+            .product-info, .product-spec, .product-quantity, 
+            .product-unit, .product-price, .product-total,
+            .product-discount, .product-notes {
+                width: 100%;
+                min-width: 100%;
+                margin-bottom: 8px;
+            }
+            .product-list-header {
+                display: none !important;
+            }
+            .row-section-label span {
+                display: inline;
+            }
+        }
+        
         .notes-section {
             border: 1px solid #ddd;
             padding: 15px;
             margin-bottom: 20px;
+            border-radius: 4px;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
         .total-section {
             text-align: right;
@@ -110,6 +183,10 @@ if (!empty($id) && is_numeric($id)) {
             margin-top: 10px;
             border-top: 1px solid #ddd;
             padding-top: 10px;
+            background-color: #f5f5f5;
+            border-radius: 4px;
+            padding: 15px;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
     </style>
 </head>
@@ -132,9 +209,9 @@ if (!empty($id) && is_numeric($id)) {
             <?php endif; ?>
             <?= htmlspecialcharsFix($order['cs_company']) ?>
         </div>
-        <div class="info-row">
-            <span class="info-label">联系人:</span> <?= htmlspecialcharsFix($order['contact_name']) ?>
-        </div>
+<!--        <div class="info-row">-->
+<!--            <span class="info-label">联系人:</span> --><?php //= htmlspecialcharsFix($order['contact_name']) ?>
+<!--        </div>-->
         <div class="info-row">
             <span class="info-label">订单日期:</span> <?= date('Y-m-d', strtotime($order['order_date'])) ?>
         </div>
@@ -150,51 +227,67 @@ if (!empty($id) && is_numeric($id)) {
     </div>
 
     <h2>订单产品</h2>
-    <table class="products-table">
-        <thead>
-        <tr>
-            <th>序号</th>
-            <th>产品名称</th>
-            <th>数量</th>
-            <th>单位</th>
-            <th>单价</th>
-            <th>折扣</th>
-            <th>总价</th>
-            <th>备注</th>
-        </tr>
-        </thead>
-        <tbody>
+    
+    <!-- 产品表头 -->
+    <div class="product-list-header">
+        <div style="flex: 2; min-width: 200px;">产品</div>
+        <div style="flex: 2; min-width: 200px;">规格</div>
+        <div style="flex: 1; min-width: 80px;">数量</div>
+        <div style="flex: 0.5; min-width: 60px;">单位</div>
+        <div style="flex: 1; min-width: 100px;">单价</div>
+
+        <div style="flex: 1; min-width: 100px;">总价</div>
+
+    </div>
+    
+    <!-- 产品列表 -->
+    <div id="product-container">
         <?php foreach ($orderItems as $index => $item): ?>
-            <tr>
-                <td><?= $index + 1 ?></td>
-                <td><?= htmlspecialcharsFix($item['ProductName']) ?></td>
-                <td><?= $item['quantity'] ?></td>
-                <td><?= htmlspecialcharsFix($item['unit']) ?></td>
-                <td><?= number_format($item['unit_price'], 2) ?></td>
-                <td>
-                    <?php if ($item['discount_amount'] > 0): ?>
-                        <?= number_format($item['discount_amount'], 2) ?>
-                        (<?= number_format($item['discount_percent'], 2) ?>%)
-                    <?php else: ?>
-                        -
-                    <?php endif; ?>
-                </td>
-                <td><?= number_format($item['total_price'], 2) ?></td>
-                <td><?= htmlspecialcharsFix($item['notes']) ?></td>
-            </tr>
+            <div class="product-row">
+                <!-- 产品名称 -->
+                <div class="row-section product-info">
+
+                    <div class="selected-product-info"><?= htmlspecialcharsFix($item['ProductName']) ?></div>
+                </div>
+                
+                <!-- 规格 -->
+                <div class="row-section product-spec">
+
+                    <div><?= $item['spec_name'] ?></div>
+                </div>
+                
+                <!-- 数量 -->
+                <div class="row-section product-quantity">
+
+                    <div><?= $item['quantity'] ?></div>
+                </div>
+                
+                <!-- 单位 -->
+                <div class="row-section product-unit">
+
+                    <div><?= htmlspecialcharsFix($item['unit']) ?></div>
+                </div>
+                
+                <!-- 单价 -->
+                <div class="row-section product-price">
+
+                    <div><?= number_format($item['unit_price'], 2) ?></div>
+                </div>
+                
+
+                
+                <!-- 总价 -->
+                <div class="row-section product-total">
+
+                    <div><?= number_format($item['total_price'], 2) ?></div>
+                </div>
+                
+
+            </div>
         <?php endforeach; ?>
-        </tbody>
-    </table>
+    </div>
 
     <div class="total-section">
-<!--        <div>-->
-<!--            <strong>订单小计:</strong> --><?php //= number_format($order['subtotal'], 2) ?>
-<!--        </div>-->
-<!--        --><?php //if(isset($order['discount_amount']) && $order['discount_amount'] > 0): ?>
-<!--        <div>-->
-<!--            <strong>订单折扣:</strong> --><?php //= number_format($order['discount_amount'], 2) ?>
-<!--        </div>-->
-<!--        --><?php //endif; ?>
         <div style="font-size: 1.2em; margin-top: 5px;">
             <strong>订单总额:</strong> <?= number_format($order['total_amount'], 2) ?>
         </div>
@@ -204,7 +297,6 @@ if (!empty($id) && is_numeric($id)) {
         <div class="notes-section">
             <h2>订单备注</h2>
             <div>
-             
                 <p><?= nl2br(htmlspecialcharsFix($order['notes'])) ?></p>
             </div>
         </div>

order_edit.php

@@ -64,26 +64,132 @@ if (!empty($id) && is_numeric($id)) {
             margin-left: 0;
         }
         .product-row {
-            border: 1px solid #ddd;
-            padding: 10px;
-            margin-bottom: 10px;
-            background-color: #f9f9f9;
             position: relative;
+            padding: 12px 15px;
+            padding-right: 40px; /* Add right padding to make room for delete button */
+            margin-bottom: 8px;
+            border-radius: 4px;
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            background-color: #f9f9f9;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
         }
         .delete-product {
             position: absolute;
             right: 10px;
-            top: 10px;
-            color: red;
+            top: 50%;
+            transform: translateY(-50%);
+            color: #e74c3c;
+            font-weight: bold;
+            font-size: 18px;
             cursor: pointer;
+            width: 24px;
+            height: 24px;
+            line-height: 24px;
+            text-align: center;
+            border-radius: 50%;
+            z-index: 5;
+        }
+        .delete-product:hover {
+            background-color: #e74c3c;
+            color: white;
+        }
+        .product-info {
+            flex: 2;
+            min-width: 200px;
+        }
+        .product-spec {
+            flex: 2;
+            min-width: 200px;
+        }
+        .product-quantity {
+            flex: 1;
+            min-width: 80px;
+        }
+        .product-unit {
+            flex: 0.5;
+            min-width: 60px;
+        }
+        .product-price {
+            flex: 1;
+            min-width: 100px;
+        }
+        .product-total {
+            flex: 1;
+            min-width: 100px;
+            font-weight: bold;
+        }
+        .product-row input[type="number"] {
+            width: 80px;
+            padding: 5px;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+        }
+        .product-row select {
+            width: 100%;
+            padding: 5px;
+        }
+        .selected-product-info {
+            font-weight: bold;
+            margin-bottom: 3px;
+        }
+        .row-section {
+            display: flex;
+            flex-direction: column;
+        }
+        .row-section-label {
+            font-size: 12px;
+            color: #666;
+            margin-bottom: 3px;
+        }
+        .row-section-label span {
+            display: none; /* 在大屏幕上隐藏标签文本 */
+        }
+        .spec-info {
+            margin-top: 2px;
+            font-size: 12px;
+            color: #666;
+        }
+        
+        /* 在小屏幕上的响应式布局 */
+        @media (max-width: 768px) {
+            .product-row {
+                flex-direction: column;
+                align-items: flex-start;
+            }
+            .product-info, .product-spec, .product-quantity, 
+            .product-unit, .product-price, .product-total {
+                width: 100%;
+                min-width: 100%;
+                margin-bottom: 8px;
+            }
+            .row-section-label span {
+                display: inline; /* 在小屏幕上显示标签文本 */
+            }
+            .product-list-header {
+                display: none !important; /* 在小屏幕上隐藏表头 */
+            }
         }
         .add-product-btn {
             background-color: #4CAF50;
             color: white;
-            padding: 8px 12px;
+            padding: 10px 15px;
             border: none;
+            border-radius: 4px;
             cursor: pointer;
             margin-bottom: 15px;
+            font-size: 14px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            gap: 8px;
+            transition: background-color 0.2s;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+        }
+        .add-product-btn:hover {
+            background-color: #45a049;
         }
         .total-section {
             margin-top: 20px;
@@ -103,7 +209,10 @@ if (!empty($id) && is_numeric($id)) {
             overflow-y: auto;
             width: 100%;
             z-index: 1000;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
+            box-shadow: 0 3px 8px rgba(0,0,0,0.25);
+            border-radius: 0 0 4px 4px;
+            top: 100%;
+            left: 0;
         }
         .productlist ul {
             list-style: none;
@@ -111,40 +220,40 @@ if (!empty($id) && is_numeric($id)) {
             margin: 0;
         }
         .productlist li {
-            padding: 8px 10px;
+            padding: 10px 12px;
             cursor: pointer;
             border-bottom: 1px solid #eee;
+            transition: background-color 0.2s;
         }
         .productlist li:hover {
-            background-color: #f5f5f5;
+            background-color: #f0f0f0;
+        }
+        .productlist li:last-child {
+            border-bottom: none;
         }
         .productinput {
             position: relative;
         }
-        .customerlist ul {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-        }
-        .customerlist li {
-            padding: 8px 10px;
-            cursor: pointer;
-            border-bottom: 1px solid #eee;
-        }
-        .customerlist li:hover {
-            background-color: #f5f5f5;
-        }
         .productlist li .category-tag {
             color: #777;
             font-size: 12px;
             font-style: italic;
             margin-left: 5px;
         }
-        .selected-product-info .category-tag {
-            color: #777;
-            font-size: 12px;
-            font-style: italic;
-            margin-left: 5px;
+        /* Specification select styling */
+        .spec-select {
+            width: 100%;
+            padding: 6px;
+            margin-top: 5px;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+        }
+        .spec-select:disabled {
+            background-color: #f9f9f9;
+        }
+        .spec-price {
+            font-weight: bold;
+            color: #d9534f;
         }
     </style>
 </head>
@@ -173,24 +282,6 @@ if (!empty($id) && is_numeric($id)) {
                     </div>
                 </td>
             </tr>
-            <tr>
-                <th width="8%">联系人</th>
-                <td>
-                    <select id="contact_id" name="contact_id">
-                        <option value="">请选择联系人</option>
-                        <?php
-                        if ($order['customer_id']) {
-                            $contactSql = "SELECT id, contact_name FROM customer_contact WHERE customer_id = " . $order['customer_id'];
-                            $contactResult = mysqli_query($conn, $contactSql);
-                            while ($contactRow = mysqli_fetch_assoc($contactResult)) {
-                                $selected = ($order['contact_id'] == $contactRow['id']) ? ' selected' : '';
-                                echo "<option value=\"{$contactRow['id']}\"$selected>" . htmlspecialcharsFix($contactRow['contact_name']) . "</option>";
-                            }
-                        }
-                        ?>
-                    </select>
-                </td>
-            </tr>
             <tr>
                 <th width="8%">订单日期</th>
                 <td>
@@ -200,38 +291,57 @@ if (!empty($id) && is_numeric($id)) {
             <tr>
                 <th width="8%" valign="top">产品列表</th>
                 <td>
+                    <button type="button" id="add-product-btn" class="add-product-btn">添加产品</button>
+                    
+                    <div class="product-list-header" style="display: flex; background-color: #eee; padding: 8px 15px; margin-bottom: 10px; border-radius: 4px; font-weight: bold; color: #555; font-size: 13px; gap: 8px;">
+                        <div style="flex: 2; min-width: 200px;">产品</div>
+                        <div style="flex: 1; min-width: 80px;">数量</div>
+                        <div style="flex: 0.5; min-width: 60px;">单位</div>
+                        <div style="flex: 1; min-width: 100px;">单价</div>
+                        <div style="flex: 1; min-width: 100px;">总价</div>
+                        <div style="flex: 2; min-width: 200px;">备注</div>
+                    </div>
+                    
                     <div id="product-container">
                         <?php foreach ($orderItems as $index => $item): ?>
                             <div class="product-row" data-index="<?= $index ?>">
                                 <span class="delete-product">×</span>
-                                <div>
-                                    <label>产品：</label>
-                                    <div style="display: inline-block; width: 60%;">
+                                
+                                <div class="row-section product-info">
+                                    <div class="row-section-label"><span>产品</span></div>
                                         <input type="hidden" name="items[<?= $index ?>][product_id]" class="product-id-input" value="<?= $item['product_id'] ?>">
-                                        <div class="selected-product-info" style="margin-top: 5px; font-weight: bold;">
+                                    <div class="selected-product-info" style="cursor: pointer;" title="点击重新选择产品">
                                             <?= htmlspecialcharsFix($item['ProductName'] ?? '') ?>
                                             <?php if (!empty($item['category_name'])): ?>
                                             <span class="category-tag">(<?= htmlspecialcharsFix($item['category_name']) ?>)</span>
                                             <?php endif; ?>
                                         </div>
                                     </div>
-                                </div>
-                                <div style="margin-top: 5px;">
-                                    <label>数量：</label>
+                                
+                                <div class="row-section product-quantity">
+                                    <div class="row-section-label"><span>数量</span></div>
                                     <input type="number" name="items[<?= $index ?>][quantity]" value="<?= $item['quantity'] ?>" min="1" class="quantity-input" onchange="calculateItemTotal(this)">
+                                </div>
 
-                                    <label style="margin-left: 10px;">单位：</label>
+                                <div class="row-section product-unit">
+                                    <div class="row-section-label"><span>单位</span></div>
                                     <input type="text" name="items[<?= $index ?>][unit]" value="<?= htmlspecialcharsFix($item['unit']) ?>" class="unit-input">
-
-                                    <label style="margin-left: 10px;">单价：</label>
-                                    <input type="number" step="0.01" name="items[<?= $index ?>][unit_price]" value="<?= $item['unit_price'] ?>" class="price-input" placeholder="请输入单价" onchange="calculateItemTotal(this)">
-                                    
-                                    <label style="margin-left: 10px;">总价：</label>
-                                    <input type="number" step="0.01" name="items[<?= $index ?>][total_price]" value="<?= $item['total_price'] ?>" class="total-price-input" readonly>
                                 </div>
-                                <div style="margin-top: 5px;">
-                                    <label>备注：</label>
-                                    <input type="text" name="items[<?= $index ?>][notes]" value="<?= htmlspecialcharsFix($item['notes']) ?>" style="width: 90%;">
+                                
+                                <div class="row-section product-price">
+                                    <div class="row-section-label"><span>单价</span></div>
+                                    <input type="number" step="0.01" name="items[<?= $index ?>][unit_price]" value="<?= $item['unit_price'] ?>" class="price-input" onchange="calculateItemTotal(this)">
+                    </div>
+                    
+                                <div class="row-section product-total">
+                                    <div class="row-section-label"><span>总价</span></div>
+                                    <span class="total-price-display"><?= number_format($item['total_price'], 2) ?></span>
+                                    <input type="hidden" name="items[<?= $index ?>][total_price]" value="<?= $item['total_price'] ?>" class="total-price-input">
+                                </div>
+                                
+                                <div class="row-section product-notes" style="flex: 2; min-width: 200px;">
+                                    <div class="row-section-label"><span>备注</span></div>
+                                    <input type="text" name="items[<?= $index ?>][notes]" value="<?= htmlspecialcharsFix($item['notes']) ?>" style="width: 100%;">
                                     
                                     <!-- 保留隐藏的折扣字段以便后端兼容 -->
                                     <input type="hidden" name="items[<?= $index ?>][discount_amount]" value="0" class="discount-amount-input">
@@ -241,28 +351,20 @@ if (!empty($id) && is_numeric($id)) {
                         <?php endforeach; ?>
                         <!-- 产品行将通过搜索添加 -->
                         <?php if (count($orderItems) == 0): ?>
-                        <div id="no-products-message" style="padding: 20px; text-align: center; color: #777; background-color: #f9f9f9; border: 1px dashed #ddd; display: block;">
-                            请使用下方的产品搜索框添加产品
+                        <div id="no-products-message" style="padding: 15px; text-align: center; color: #777; background-color: #f5f5f5; border: 1px dashed #ddd; border-radius: 4px; margin-bottom: 15px; display: block;">
+                            <i class="fa fa-info-circle"></i> 请点击"添加产品"按钮添加产品
                         </div>
                         <?php endif; ?>
                     </div>
-                    <div class="total-section">
-                        <div>
-                            <label>订单总额：</label>
-                            <span id="total-amount"><?= number_format($order['total_amount'], 2) ?></span>
+                    <div class="total-section" style="margin-top: 20px; padding: 15px; background-color: #f5f5f5; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
+                        <div style="display: flex; justify-content: flex-end; align-items: center;">
+                            <label style="font-size: 16px; margin-right: 10px;">订单总额：</label>
+                            <span id="total-amount" style="font-size: 18px; font-weight: bold; color: #e74c3c;"><?= number_format($order['total_amount'], 2) ?></span>
                             <input type="hidden" name="total_amount" id="total-amount-input" value="<?= $order['total_amount'] ?>">
                             <input type="hidden" name="subtotal" id="subtotal-input" value="<?= $order['subtotal'] ?>">
                             <input type="hidden" name="discount_amount" id="order-discount" value="0">
                         </div>
                     </div>
-                    
-                    <div style="margin-top: 15px; border-top: 1px dashed #ccc; padding-top: 15px;">
-                        <div class="productinput" style="position: relative; width: 60%;">
-                            <label>产品搜索：</label>
-                            <input type="text" id="product-search-single" class="fastsearch" placeholder="输入产品名称搜索并添加..." style="width: 100%;">
-                            <div id="product-list-single" class="productlist" style="width: 100%;"><ul></ul></div>
-                        </div>
-                    </div>
                 </td>
             </tr>
             <tr>
@@ -292,6 +394,12 @@ if (!empty($id) && is_numeric($id)) {
             // 初始化无产品消息
             updateNoProductsMessage();
             
+            // 添加产品行按钮点击事件
+            $('#add-product-btn').on('click', function() {
+                addEmptyProductRow();
+                updateNoProductsMessage();
+            });
+            
             // 删除产品行
             $(document).on('click', '.delete-product', function() {
                 if ($('.product-row').length > 1) {
@@ -303,10 +411,8 @@ if (!empty($id) && is_numeric($id)) {
                     // 如果只剩最后一个产品行，则清空它而不是删除
                     $(this).closest('.product-row').remove();
                     updateNoProductsMessage();
-                    calculateOrderTotal();
+                    calculateOrderTotal(); // 确保在删除最后一个产品时也更新总额
                 }
-
-
             });
 
             // 客户搜索功能
@@ -369,9 +475,6 @@ if (!empty($id) && is_numeric($id)) {
                 $('.customer-search').val(customerName);
                 $('.selected-customer-info').text(customerName);
                 $('.customerlist').hide();
-                
-                // 加载客户联系人
-                loadCustomerContacts(customerId);
             });
             
             // 单一产品搜索功能 - 使用防抖动以减少请求数量
@@ -471,29 +574,39 @@ if (!empty($id) && is_numeric($id)) {
             var html = `
             <div class="product-row" data-index="${productIndex}">
                 <span class="delete-product">×</span>
-                <div>
-                    <label>产品：</label>
-                    <div style="display: inline-block; width: 60%;">
-                        <input type="hidden" name="items[${productIndex}][product_id]" class="product-id-input" value="">
-                        <div class="selected-product-info" style="margin-top: 5px; font-weight: bold;"></div>
-                    </div>
+                
+                <div class="row-section product-info">
+                    <div class="row-section-label"><span>产品</span></div>
+                    <input type="hidden" name="items[${productIndex}][product_id]" class="product-id-input" value="">
+                    <input type="text" class="product-search" placeholder="输入产品名称搜索..." style="width: 100%; padding: 5px; border: 1px solid #ddd; border-radius: 4px;">
+                    <div class="productlist" style="width: 100%; max-height: 200px;"><ul></ul></div>
+                    <div class="selected-product-info" style="cursor: pointer; display: none;" title="点击重新选择产品"></div>
                 </div>
-                <div style="margin-top: 5px;">
-                    <label>数量：</label>
+                
+                <div class="row-section product-quantity">
+                    <div class="row-section-label"><span>数量</span></div>
                     <input type="number" name="items[${productIndex}][quantity]" value="1" min="1" class="quantity-input" onchange="calculateItemTotal(this)">
-
-                    <label style="margin-left: 10px;">单位：</label>
+                </div>
+                
+                <div class="row-section product-unit">
+                    <div class="row-section-label"><span>单位</span></div>
                     <input type="text" name="items[${productIndex}][unit]" value="" class="unit-input">
-
-                    <label style="margin-left: 10px;">单价：</label>
-                    <input type="number" step="0.01" name="items[${productIndex}][unit_price]" value="" class="price-input" placeholder="请输入单价" onchange="calculateItemTotal(this)">
-                    
-                    <label style="margin-left: 10px;">总价：</label>
-                    <input type="number" step="0.01" name="items[${productIndex}][total_price]" value="0.00" class="total-price-input" readonly>
                 </div>
-                <div style="margin-top: 5px;">
-                    <label>备注：</label>
-                    <input type="text" name="items[${productIndex}][notes]" value="" style="width: 90%;">
+                
+                <div class="row-section product-price">
+                    <div class="row-section-label"><span>单价</span></div>
+                    <input type="number" step="0.01" name="items[${productIndex}][unit_price]" value="" class="price-input" placeholder="输入单价" onchange="calculateItemTotal(this)">
+                </div>
+                
+                <div class="row-section product-total">
+                    <div class="row-section-label"><span>总价</span></div>
+                    <span class="total-price-display">0.00</span>
+                    <input type="hidden" name="items[${productIndex}][total_price]" value="0.00" class="total-price-input">
+                </div>
+                
+                <div class="row-section product-notes" style="flex: 2; min-width: 200px;">
+                    <div class="row-section-label"><span>备注</span></div>
+                    <input type="text" name="items[${productIndex}][notes]" value="" style="width: 100%;">
                     
                     <!-- 保留隐藏的折扣字段以便后端兼容 -->
                     <input type="hidden" name="items[${productIndex}][discount_amount]" value="0" class="discount-amount-input">
@@ -575,6 +688,8 @@ if (!empty($id) && is_numeric($id)) {
             var total = quantity * price;
             if (total < 0) total = 0;
 
+            // 更新显示元素和隐藏输入框
+            row.find('.total-price-display').text(total.toFixed(2));
             row.find('.total-price-input').val(total.toFixed(2));
 
             calculateOrderTotal();
@@ -592,33 +707,10 @@ if (!empty($id) && is_numeric($id)) {
             $('#subtotal-input').val(total.toFixed(2)); // 为兼容性保留
         }
 
-        function loadCustomerContacts(customerId) {
-            if (customerId) {
-                $.ajax({
-                    url: 'get_customer_contacts.php',
-                    type: 'GET',
-                    data: {customer_id: customerId},
-                    dataType: 'json',
-                    success: function(data) {
-                        var options = '<option value="">请选择联系人</option>';
-                        if (data && data.length > 0) {
-                            for (var i = 0; i < data.length; i++) {
-                                options += '<option value="' + data[i].id + '">' + data[i].contact_name + '</option>';
-                            }
-                        }
-                        $('#contact_id').html(options);
-                    }
-                });
-            } else {
-                $('#contact_id').html('<option value="">请选择联系人</option>');
-            }
-        }
-
         function validateOrderForm() {
             var orderCode = $('#order_code').val();
             var customerId = $('#customer_id').val();
             var customerName = $('.customer-search').val();
-            var contactId = $('#contact_id').val();
             var hasProducts = false;
             var allPricesValid = true;
             var firstEmptyPriceField = null;
@@ -659,12 +751,6 @@ if (!empty($id) && is_numeric($id)) {
                 return false;
             }
             
-            if (!contactId) {
-                alert('请选择联系人');
-                $('#contact_id').focus();
-                return false;
-            }
-
             if (!hasProducts) {
                 alert('请至少添加一个产品');
                 $('#product-search-single').focus();

order_save.php

@@ -191,6 +191,7 @@ if ($isedit) {
         if (empty($item['product_id'])) continue; // 跳过没有选择产品的行
 
         $product_id = (int)$item['product_id'];
+        $spec_id = isset($item['spec_id']) ? (int)$item['spec_id'] : 0; // 添加规格ID
         $quantity = (int)$item['quantity'];
         $unit = mysqli_real_escape_string($conn, htmlspecialchars($item['unit'], ENT_QUOTES, 'UTF-8'));
         $unit_price = (float)$item['unit_price'];
@@ -198,11 +199,11 @@ if ($isedit) {
         $item_notes = mysqli_real_escape_string($conn, htmlspecialchars($item['notes'] ?? '', ENT_QUOTES, 'UTF-8'));
 
         $sql = "INSERT INTO order_items (
-                order_id, product_id, quantity, unit, unit_price, 
+                order_id, product_id, specification_id, quantity, unit, unit_price, 
                 total_price, notes, 
                 created_at, updated_at
             ) VALUES (
-                $id, $product_id, $quantity, '$unit', $unit_price, 
+                $id, $product_id, $spec_id, $quantity, '$unit', $unit_price, 
                 $total_price, '$item_notes', 
                 NOW(), NOW()
             )";
@@ -294,6 +295,7 @@ if ($isedit) {
         if (empty($item['product_id'])) continue; // 跳过没有选择产品的行
 
         $product_id = (int)$item['product_id'];
+        $spec_id = isset($item['spec_id']) ? (int)$item['spec_id'] : 0; // 添加规格ID
         $quantity = (int)$item['quantity'];
         $unit = mysqli_real_escape_string($conn, htmlspecialchars($item['unit'], ENT_QUOTES, 'UTF-8'));
         $unit_price = (float)$item['unit_price'];
@@ -301,11 +303,11 @@ if ($isedit) {
         $item_notes = mysqli_real_escape_string($conn, htmlspecialchars($item['notes'] ?? '', ENT_QUOTES, 'UTF-8'));
 
         $sql = "INSERT INTO order_items (
-                order_id, product_id, quantity, unit, unit_price, 
+                order_id, product_id, specification_id, quantity, unit, unit_price, 
                 total_price, notes, 
                 created_at, updated_at
             ) VALUES (
-                $order_id, $product_id, $quantity, '$unit', $unit_price, 
+                $order_id, $product_id, $spec_id, $quantity, '$unit', $unit_price, 
                 $total_price, '$item_notes', 
                 NOW(), NOW()
             )";

system/add_product.php

@@ -32,6 +32,64 @@ if ($category_id) {
 <script type="text/javascript" src="js/js.js"></script>
 <script type="text/javascript" src="js/SearchArea.js"></script>
 <script type="text/javascript" src="xheditor-1.1.9/xheditor-1.1.9-zh-cn.min.js"></script>
+<style>
+    /* Styles for specification section */
+    .specifications {
+        margin-bottom: 10px;
+        width: 100%;
+    }
+    .specitem {
+        margin-bottom: 8px;
+        padding: 8px 10px;
+        /*background-color: #f9f9f9;*/
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        clear: both;
+        overflow: hidden;
+    }
+    .addspecitem, .delspecitem {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        text-align: center;
+        line-height: 18px;
+        border-radius: 50%;
+        font-weight: bold;
+        cursor: pointer;
+        margin-left: 10px;
+    }
+    .addspecitem {
+        background-color: #5cb85c;
+        color: white;
+    }
+    .delspecitem {
+        background-color: #d9534f;
+        color: white;
+    }
+    .spec-input {
+        width: 160px;
+        padding: 4px;
+        margin-right: 10px;
+        border: 1px solid #ccc;
+        border-radius: 3px;
+    }
+    .spec-small-input {
+        width: 80px;
+        padding: 4px;
+        margin-right: 10px;
+        border: 1px solid #ccc;
+        border-radius: 3px;
+    }
+    .spec-label {
+        display: inline-block;
+        margin-right: 5px;
+        font-weight: normal;
+    }
+    .required {
+        color: red;
+        margin-left: 2px;
+    }
+</style>
 </head>
 
 <body>
@@ -73,24 +131,31 @@ if ($category_id) {
                     <th width="8%">计价单位</th>
                     <td><input type="text" id="unit" name="unit" value="<?php echo $unit; ?>" class="txt1"/></td>
                 </tr>
+<!--                <tr>-->
+<!--                    <th width="8%">起订数量</th>-->
+<!--                    <td><input type="text" id="moq" name="moq" value="--><?php //echo $moq; ?><!--" class="txt1"/></td>-->
+<!--                </tr>-->
                 <tr>
-                    <th width="8%">起订数量</th>
-                    <td><input type="text" id="moq" name="moq" value="<?php echo $moq; ?>" class="txt1"/></td>
-                </tr>
-                <tr>
-                    <th width="8%">默认售价</th>
+                    <th width="8%">产品规格</th>
                     <td>
-                        <div class="Price">
-                            <div class="priceitem">
-                                <label>≥</label>
-                                <input type="number" class="txt3 num" name="num[]">
-                                <label class="unit"><?php echo $unit; ?></label>
-                                <label>售价</label>
-                                <input type="text" class="txt3 price" name="price[]">
-                                <label>RMB</label>
-                                <span class="additem"></span>
-                                <span class="delitem"></span>
-                                <span class="note"></span>
+                        <div class="specifications">
+                            <div class="specitem">
+                                <span class="spec-label">规格名称<span class="required">*</span>:</span>
+                                <input type="text" class="spec-input" name="spec_name[]" placeholder="如: 红色、XL" required>
+                                
+                                <span class="spec-label">起订数量<span class="required">*</span>:</span>
+                                <input type="number" class="spec-small-input" name="spec_moq[]" value="1" required>
+                                
+                                <span class="spec-label">规格价格<span class="required">*</span>:</span>
+                                <input type="text" class="spec-small-input" name="spec_price[]" placeholder="价格" required>
+                                
+                                <span class="addspecitem">+</span>
+                                <span class="delspecitem">-</span>
+                                
+                                <!-- 隐藏字段，仍然提交但不显示 -->
+                                <input type="hidden" name="spec_value[]" value="">
+                                <input type="hidden" name="spec_code[]" value="">
+                                <input type="hidden" name="spec_sort[]" value="0">
                             </div>
                         </div>
                     </td>
@@ -123,6 +188,34 @@ if ($category_id) {
         </table>
     </form>
 </div>
+
+<script>
+    $(document).ready(function(){
+        // Add specification item
+        $(document).on('click', '.addspecitem', function(){
+            var newSpecItem = $(this).closest('.specitem').clone(true);
+            newSpecItem.find('input[type="text"], input[type="hidden"]').val(''); // Clear values
+            newSpecItem.find('input[name="spec_moq[]"]').val('1'); // Reset MOQ to 1
+            newSpecItem.find('input[name="spec_sort[]"]').val('0'); // Reset sort to 0
+            $(this).closest('.specifications').append(newSpecItem);
+        });
+        
+        // Remove specification item
+        $(document).on('click', '.delspecitem', function(){
+            if($('.specitem').length > 1){
+                $(this).closest('.specitem').remove();
+            } else {
+                alert('至少需要保留一个规格项');
+            }
+        });
+        
+        // Update unit display when unit field changes
+        $('#unit').on('change keyup', function(){
+            $('.unit').text($(this).val());
+        });
+    });
+</script>
+
 </body>
 </html>
 <?php mysqli_close($conn); ?> 

system/edit_product.php

@@ -53,6 +53,64 @@ $category_id = $row['category_id'] ? intval($row['category_id']) : 0;
 <script type="text/javascript" src="js/js.js"></script>
 <script type="text/javascript" src="js/SearchArea.js"></script>
 <script type="text/javascript" src="xheditor-1.1.9/xheditor-1.1.9-zh-cn.min.js"></script>
+<style>
+    /* Styles for specification section */
+    .specifications {
+        margin-bottom: 10px;
+        width: 100%;
+    }
+    .specitem {
+        margin-bottom: 8px;
+        padding: 8px 10px;
+        /*background-color: #f9f9f9;*/
+        border: 1px solid #e0e0e0;
+        border-radius: 4px;
+        clear: both;
+        overflow: hidden;
+    }
+    .addspecitem, .delspecitem {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        text-align: center;
+        line-height: 18px;
+        border-radius: 50%;
+        font-weight: bold;
+        cursor: pointer;
+        margin-left: 10px;
+    }
+    .addspecitem {
+        background-color: #5cb85c;
+        color: white;
+    }
+    .delspecitem {
+        background-color: #d9534f;
+        color: white;
+    }
+    .spec-input {
+        width: 160px;
+        padding: 4px;
+        margin-right: 10px;
+        border: 1px solid #ccc;
+        border-radius: 3px;
+    }
+    .spec-small-input {
+        width: 80px;
+        padding: 4px;
+        margin-right: 10px;
+        border: 1px solid #ccc;
+        border-radius: 3px;
+    }
+    .spec-label {
+        display: inline-block;
+        margin-right: 5px;
+        font-weight: normal;
+    }
+    .required {
+        color: red;
+        margin-left: 2px;
+    }
+</style>
 </head>
 
 <body>
@@ -94,45 +152,62 @@ $category_id = $row['category_id'] ? intval($row['category_id']) : 0;
                     <th width="8%">计价单位</th>
                     <td><input type="text" id="unit" name="unit" value="<?php echo $unit; ?>" class="txt1"/></td>
                 </tr>
+<!--                <tr>-->
+<!--                    <th width="8%">起订数量</th>-->
+<!--                    <td><input type="text" id="moq" name="moq" value="--><?php //echo $moq; ?><!--" class="txt1"/></td>-->
+<!--                </tr>-->
                 <tr>
-                    <th width="8%">起订数量</th>
-                    <td><input type="text" id="moq" name="moq" value="<?php echo $moq; ?>" class="txt1"/></td>
-                </tr>
-                <tr>
-                    <th width="8%">默认售价</th>
+                    <th width="8%">产品规格</th>
                     <td>
-                        <div class="Price">
+                        <div class="specifications">
                         <?php
-                        $price_sql = "SELECT num, price FROM price WHERE AreaId = 0 AND productId = " . $id . " ORDER BY num ASC";
-                        $price_result = mysqli_query($conn, $price_sql);
-                        if (mysqli_num_rows($price_result) > 0) {
-                            while ($price_row = mysqli_fetch_assoc($price_result)) {
+                        // Fetch specifications for this product
+                        $spec_sql = "SELECT * FROM product_specifications WHERE product_id = " . (int)$id . " ORDER BY sort_order ASC";
+                        $spec_result = mysqli_query($conn, $spec_sql);
+                        
+                        if (mysqli_num_rows($spec_result) > 0) {
+                            while ($spec_row = mysqli_fetch_assoc($spec_result)) {
                                 ?>
-                                <div class="priceitem">
-                                    <label>≥</label>
-                                    <input type="number" class="txt3 num" name="num[]" value="<?php echo $price_row['num']; ?>">
-                                    <label class="unit"><?php echo $unit; ?></label>
-                                    <label>售价</label>
-                                    <input type="text" class="txt3 price" name="price[]" value="<?php echo $price_row['price']; ?>">
-                                    <label>RMB</label>
-                                    <span class="additem"></span>
-                                    <span class="delitem"></span>
-                                    <span class="note"></span>
+                                <div class="specitem">
+                                    <span class="spec-label">规格名称<span class="required">*</span>:</span>
+                                    <input type="text" class="spec-input" name="spec_name[]" placeholder="如: 红色、XL" value="<?php echo htmlspecialcharsFix($spec_row['spec_name']); ?>" required>
+                                    
+                                    <span class="spec-label">起订数量<span class="required">*</span>:</span>
+                                    <input type="number" class="spec-small-input" name="spec_moq[]" value="<?php echo $spec_row['min_order_quantity']; ?>" required>
+                                    
+                                    <span class="spec-label">规格价格<span class="required">*</span>:</span>
+                                    <input type="text" class="spec-small-input" name="spec_price[]" placeholder="价格" value="<?php echo $spec_row['price']; ?>" required>
+                                    
+                                    <span class="addspecitem">+</span>
+                                    <span class="delspecitem">-</span>
+                                    
+                                    <!-- 隐藏字段，保留原始数据 -->
+                                    <input type="hidden" name="spec_value[]" value="<?php echo htmlspecialcharsFix($spec_row['spec_value']); ?>">
+                                    <input type="hidden" name="spec_code[]" value="<?php echo htmlspecialcharsFix($spec_row['spec_code']); ?>">
+                                    <input type="hidden" name="spec_sort[]" value="<?php echo $spec_row['sort_order']; ?>">
                                 </div>
                                 <?php
                             }
                         } else {
+                            // No specifications found, show one empty form
                             ?>
-                            <div class="priceitem">
-                                <label>≥</label>
-                                <input type="number" class="txt3 num" name="num[]">
-                                <label class="unit"><?php echo $unit; ?></label>
-                                <label>售价</label>
-                                <input type="text" class="txt3 price" name="price[]">
-                                <label>RMB</label>
-                                <span class="additem"></span>
-                                <span class="delitem"></span>
-                                <span class="note"></span>
+                            <div class="specitem">
+                                <span class="spec-label">规格名称<span class="required">*</span>:</span>
+                                <input type="text" class="spec-input" name="spec_name[]" placeholder="如: 红色、XL" required>
+                                
+                                <span class="spec-label">起订数量<span class="required">*</span>:</span>
+                                <input type="number" class="spec-small-input" name="spec_moq[]" value="1" required>
+                                
+                                <span class="spec-label">规格价格<span class="required">*</span>:</span>
+                                <input type="text" class="spec-small-input" name="spec_price[]" placeholder="价格" required>
+                                
+                                <span class="addspecitem">+</span>
+                                <span class="delspecitem">-</span>
+                                
+                                <!-- 隐藏字段，仍然提交但不显示 -->
+                                <input type="hidden" name="spec_value[]" value="">
+                                <input type="hidden" name="spec_code[]" value="">
+                                <input type="hidden" name="spec_sort[]" value="0">
                             </div>
                             <?php
                         }
@@ -182,6 +257,34 @@ $category_id = $row['category_id'] ? intval($row['category_id']) : 0;
         </table>
     </form>
 </div>
+
+<script>
+    $(document).ready(function(){
+        // Add specification item
+        $(document).on('click', '.addspecitem', function(){
+            var newSpecItem = $(this).closest('.specitem').clone(true);
+            newSpecItem.find('input[type="text"], input[type="hidden"]').val(''); // Clear values
+            newSpecItem.find('input[name="spec_moq[]"]').val('1'); // Reset MOQ to 1
+            newSpecItem.find('input[name="spec_sort[]"]').val('0'); // Reset sort to 0
+            $(this).closest('.specifications').append(newSpecItem);
+        });
+        
+        // Remove specification item
+        $(document).on('click', '.delspecitem', function(){
+            if($('.specitem').length > 1){
+                $(this).closest('.specitem').remove();
+            } else {
+                alert('至少需要保留一个规格项');
+            }
+        });
+        
+        // Update unit display when unit field changes
+        $('#unit').on('change keyup', function(){
+            $('.unit').text($(this).val());
+        });
+    });
+</script>
+
 </body>
 </html>
 <?php mysqli_close($conn); ?> 

system/products.php

@@ -211,6 +211,7 @@ $temp_num = $pageSize * ($page - 1);
                 <th width="25%">产品名称</th>
                 <th width="15%">产品分类</th>
                 <th width="30%">图片</th>
+                <th width="10%">规格数量</th>
                 <th width="20%">操作</th>
             </tr>
         </thead>
@@ -232,6 +233,15 @@ $temp_num = $pageSize * ($page - 1);
                         ?>
                     </td>
                     <td align="center"><img src="<?php echo htmlspecialcharsFix($row['ProductImg']); ?>" width="30px"></td>
+                    <td align="center">
+                        <?php 
+                        // Count specifications for this product
+                        $spec_sql = "SELECT COUNT(*) as spec_count FROM product_specifications WHERE product_id = " . $row['id'];
+                        $spec_result = mysqli_query($conn, $spec_sql);
+                        $spec_row = mysqli_fetch_assoc($spec_result);
+                        echo $spec_row['spec_count']; 
+                        ?>
+                    </td>
                     <td align="center">
                         <a href="?Keys=<?php echo $keys; ?>&Page=<?php echo $page; ?>&act=edit&id=<?php echo $row['id']; ?><?php echo $filter_category_id ? '&category_id='.$filter_category_id : ''; ?>" class="ico_edit ico">修改</a>
                     </td>

system/save_product.php

@@ -12,13 +12,19 @@ $unit = isset($_POST['unit']) ? htmlspecialcharsFix($_POST['unit']) : '';
 $moq = isset($_POST['moq']) ? htmlspecialcharsFix($_POST['moq']) : '';
 $category_id = isset($_POST['category_id']) ? intval($_POST['category_id']) : 0;
 $nosale = isset($_POST['nosale']) ? $_POST['nosale'] : array();
-$num = isset($_POST['num']) ? $_POST['num'] : array();
-$price = isset($_POST['price']) ? $_POST['price'] : array();
 $note = isset($_POST['note']) ? htmlspecialcharsFix($_POST['note']) : '';
 $tips = isset($_POST['tips']) ? htmlspecialcharsFix($_POST['tips']) : '';
 $keys = isset($_POST['keys']) ? $_POST['keys'] : '';
 $page = isset($_POST['page']) ? $_POST['page'] : 1;
 
+// Initialize specification variables
+$spec_name = isset($_POST['spec_name']) ? $_POST['spec_name'] : array();
+$spec_value = isset($_POST['spec_value']) ? $_POST['spec_value'] : array();
+$spec_price = isset($_POST['spec_price']) ? $_POST['spec_price'] : array();
+$spec_moq = isset($_POST['spec_moq']) ? $_POST['spec_moq'] : array();
+$spec_code = isset($_POST['spec_code']) ? $_POST['spec_code'] : array();
+$spec_sort = isset($_POST['spec_sort']) ? $_POST['spec_sort'] : array();
+
 // Redirect URL
 $redirect_url = "products.php?Keys=" . $keys . "&Page=" . $page;
 if ($category_id) {
@@ -35,13 +41,31 @@ if (is_array($nosale) && !empty($nosale)) {
     $nosale_str = implode(',', $nosale_clean);
 }
 
-// Validate form data (add your validation here)
+// Validate form data
 if (empty($product_name)) {
     // You could add error handling here
     header("Location: " . $redirect_url);
     exit();
 }
 
+// Validate specifications - at least one specification is required with all fields filled
+$has_valid_specs = false;
+if (is_array($spec_name) && !empty($spec_name)) {
+    foreach ($spec_name as $key => $name) {
+        if (!empty($name) && isset($spec_price[$key]) && !empty($spec_price[$key]) && 
+            isset($spec_moq[$key]) && !empty($spec_moq[$key])) {
+            $has_valid_specs = true;
+            break;
+        }
+    }
+}
+
+if (!$has_valid_specs) {
+    // Redirect back with error message
+    header("Location: " . $redirect_url . "&error=missing_specs");
+    exit();
+}
+
 if ($is_edit) {
     // Update existing product
     $sql = "UPDATE products SET 
@@ -57,16 +81,31 @@ if ($is_edit) {
             WHERE id = " . (int)$id;
     mysqli_query($conn, $sql);
     
-    // Handle price updates
-    mysqli_query($conn, "DELETE FROM price WHERE productId = " . (int)$id . " AND AreaId = 0");
+    // Clear existing specifications for this product
+    mysqli_query($conn, "DELETE FROM product_specifications WHERE product_id = " . (int)$id);
     
-    if (is_array($num) && is_array($price)) {
-        foreach ($num as $key => $num_value) {
-            if (isset($price[$key])) { // Only process if we have both num and price
-                $num_value = empty($num_value) ? 0 : (float)$num_value;
-                $price_value = empty($price[$key]) ? 0 : (float)$price[$key];
-                $sql = "INSERT INTO price (productId, AreaId, num, price) VALUES 
-                        (" . (int)$id . ", 0, " . $num_value . ", '" . $price_value . "')";
+    // Add new specifications
+    if (is_array($spec_name) && !empty($spec_name)) {
+        foreach ($spec_name as $key => $name) {
+            if (!empty($name) && isset($spec_price[$key]) && !empty($spec_price[$key])) {
+                $spec_price_value = isset($spec_price[$key]) && is_numeric($spec_price[$key]) ? (float)$spec_price[$key] : 0;
+                $spec_moq_value = isset($spec_moq[$key]) && is_numeric($spec_moq[$key]) ? (int)$spec_moq[$key] : 1;
+                $spec_code_value = isset($spec_code[$key]) ? mysqli_real_escape_string($conn, $spec_code[$key]) : '';
+                $spec_sort_value = isset($spec_sort[$key]) && is_numeric($spec_sort[$key]) ? (int)$spec_sort[$key] : 0;
+                $spec_value_value = isset($spec_value[$key]) ? mysqli_real_escape_string($conn, $spec_value[$key]) : '';
+                
+                $sql = "INSERT INTO product_specifications 
+                        (product_id, spec_name, spec_value, price, min_order_quantity, spec_code, addtime, sort_order) 
+                        VALUES (
+                            " . (int)$id . ", 
+                            '" . mysqli_real_escape_string($conn, $name) . "', 
+                            '" . $spec_value_value . "', 
+                            " . $spec_price_value . ", 
+                            " . $spec_moq_value . ", 
+                            '" . $spec_code_value . "', 
+                            NOW(), 
+                            " . $spec_sort_value . "
+                        )";
                 mysqli_query($conn, $sql);
             }
         }
@@ -88,14 +127,28 @@ if ($is_edit) {
     mysqli_query($conn, $sql);
     $id = mysqli_insert_id($conn);
     
-    // Handle price insertions
-    if (is_array($num) && is_array($price)) {
-        foreach ($num as $key => $num_value) {
-            if (isset($price[$key])) { // Only process if we have both num and price
-                $num_value = empty($num_value) ? 0 : (float)$num_value;
-                $price_value = empty($price[$key]) ? 0 : (float)$price[$key];
-                $sql = "INSERT INTO price (productId, AreaId, num, price) VALUES 
-                        (" . (int)$id . ", 0, " . $num_value . ", '" . $price_value . "')";
+    // Add specifications for new product
+    if (is_array($spec_name) && !empty($spec_name)) {
+        foreach ($spec_name as $key => $name) {
+            if (!empty($name) && isset($spec_price[$key]) && !empty($spec_price[$key])) {
+                $spec_price_value = isset($spec_price[$key]) && is_numeric($spec_price[$key]) ? (float)$spec_price[$key] : 0;
+                $spec_moq_value = isset($spec_moq[$key]) && is_numeric($spec_moq[$key]) ? (int)$spec_moq[$key] : 1;
+                $spec_code_value = isset($spec_code[$key]) ? mysqli_real_escape_string($conn, $spec_code[$key]) : '';
+                $spec_sort_value = isset($spec_sort[$key]) && is_numeric($spec_sort[$key]) ? (int)$spec_sort[$key] : 0;
+                $spec_value_value = isset($spec_value[$key]) ? mysqli_real_escape_string($conn, $spec_value[$key]) : '';
+                
+                $sql = "INSERT INTO product_specifications 
+                        (product_id, spec_name, spec_value, price, min_order_quantity, spec_code, addtime, sort_order) 
+                        VALUES (
+                            " . (int)$id . ", 
+                            '" . mysqli_real_escape_string($conn, $name) . "', 
+                            '" . $spec_value_value . "', 
+                            " . $spec_price_value . ", 
+                            " . $spec_moq_value . ", 
+                            '" . $spec_code_value . "', 
+                            NOW(), 
+                            " . $spec_sort_value . "
+                        )";
                 mysqli_query($conn, $sql);
             }
         }