src/main/java/com/zjt/entity/ProductionVarietyDetail.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
+
 /**
  * <p>
  * 
@@ -23,11 +25,13 @@ public class ProductionVarietyDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Float id;
-
+    @Column(name = "variety_id")
     private Float varietyId;
 
+    @Column(name = "variety")
     private String variety;
 
+    @Column(name = "variety_details")
     private String varietyDetails;
 
 

src/main/java/com/zjt/entity/ProductionVarietyDetailColour.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
+
 /**
  * <p>
  * 
@@ -22,9 +24,9 @@ import lombok.experimental.Accessors;
 public class ProductionVarietyDetailColour implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @Column(name = "variety_details_id")
     private Float varietyDetailsId;
-
+    @Column(name = "colour")
     private String colour;
 
 

src/main/java/com/zjt/entity/Productionheader.java

@@ -10,6 +10,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
+
 /**
  * <p>
  * 
@@ -26,6 +28,12 @@ public class Productionheader implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Column(name = "variety_detail_id")
+    private Float varietyDetailId;
+
+    @Column(name = "variety_id")
+    private Float varietyId;
+
     @ApiModelProperty(value = "关联订单ID")
     private Long orderId;
 
@@ -33,92 +41,117 @@ public class Productionheader implements Serializable {
     private Long customerId;
 
     @ApiModelProperty(value = "系列")
+    @Column(name = "series")
     private String series;
 
     @ApiModelProperty(value = "商品1")
+    @Column(name = "product1")
     private String product1;
 
     @ApiModelProperty(value = "产品")
+    @Column(name = "product")
     private String product;
 
     @ApiModelProperty(value = "设计")
+    @Column(name = "design")
     private String design;
 
     @ApiModelProperty(value = "折射率")
+    @Column(name = "refractive_index")
     private String refractiveIndex;
 
     @ApiModelProperty(value = "膜层")
+    @Column(name = "coating")
     private String coating;
 
     @ApiModelProperty(value = "颜色")
+    @Column(name = "color")
     private String color;
 
     @ApiModelProperty(value = "属性")
+    @Column(name = "attribute")
     private String attribute;
 
     @ApiModelProperty(value = "光度范围")
+    @Column(name = "diopter_range")
     private String diopterRange;
 
     @ApiModelProperty(value = "范围说明")
+    @Column(name = "range_description")
     private String rangeDescription;
 
     @ApiModelProperty(value = "售价")
+    @Column(name = "retail_price")
     private BigDecimal retailPrice;
 
     @ApiModelProperty(value = "单眼瞳高")
+    @Column(name = "pupillary_height")
     private String pupillaryHeight;
 
     @ApiModelProperty(value = "单眼瞳距（右）")
-    private String singleEyePupillaryDistanceRight;
-
-    @ApiModelProperty(value = "单眼瞳距（左）")
-    private String singleEyePupillaryDistanceLeft;
+    @Column(name = "single_eye_pupillary_distance")
+    private String singleEyePupillaryDistance;
 
     @ApiModelProperty(value = "镜眼距")
+    @Column(name = "lens_edge_distance")
     private String lensEdgeDistance;
 
     @ApiModelProperty(value = "前倾角")
+    @Column(name = "front_angle")
     private String frontAngle;
 
     @ApiModelProperty(value = "镜架面")
+    @Column(name = "frame_surface")
     private String frameSurface;
 
     @ApiModelProperty(value = "习惯阅读距离")
+    @Column(name = "habit_reading_distance")
     private String habitReadingDistance;
 
     @ApiModelProperty(value = "近用瞳距")
+    @Column(name = "near_use_pupillary_distance")
     private String nearUsePupillaryDistance;
 
     @ApiModelProperty(value = "NVB")
+    @Column(name = "nvb")
     private String nvb;
 
     @ApiModelProperty(value = "主视眼")
+    @Column(name = "main_vision")
     private String mainVision;
 
     @ApiModelProperty(value = "ERCD")
+    @Column(name = "ercd")
     private String ercd;
 
     @ApiModelProperty(value = "年龄")
+    @Column(name = "age")
     private String age;
 
     @ApiModelProperty(value = "商品编码")
+    @Column(name = "product_code")
     private String productCode;
 
     @ApiModelProperty(value = "商品名称")
+    @Column(name = "product_name")
     private String productName;
 
     @ApiModelProperty(value = "状态：0-禁用，1-启用")
     @TableField("STATUS")
     private Integer status;
 
+    @Column(name = "create_Time")
     private LocalDateTime createTime;
 
+    @Column(name = "update_Time")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "创建人")
+    @Column(name = "create_By")
     private String createBy;
 
     @ApiModelProperty(value = "更新人")
+    @Column(name = "update_By")
     private String updateBy;
 
 

src/main/java/com/zjt/mapper/ProductionVarietyDetailColourMapper.java

@@ -15,4 +15,6 @@ import java.util.List;
  */
 public interface ProductionVarietyDetailColourMapper extends BaseMapper<ProductionVarietyDetailColour> {
     public List<ProductionVarietyDetailColour> selectvarietyDetailsColour(long varietyId);
+
+    List<ProductionVarietyDetailColour> selectColour(long varietyDetailId);
 }

src/main/java/com/zjt/mapper/ProductionVarietyDetailMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @since 2025-09-25
  */
 public interface ProductionVarietyDetailMapper extends BaseMapper<ProductionVarietyDetail> {
-    public List<ProductionVarietyDetail> selectvarietyDetails(long varietyId);
+    public List<ProductionVarietyDetail> selectvarietyDetails(String variety);
     public List<ProductionVarietyDetail> selectvarietyList();
 
 }

src/main/java/com/zjt/mapper/ProductionheaderMapper.java

@@ -1,8 +1,11 @@
 package com.zjt.mapper;
 
+import com.zjt.entity.ProductionVarietyDetail;
 import com.zjt.entity.Productionheader;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProductionheaderMapper extends BaseMapper<Productionheader> {
 
+    List<Productionheader> selectProductionheader(long varietyDetailId);
 }

src/main/java/com/zjt/service/IProductionVarietyDetailService.java

@@ -2,6 +2,8 @@ package com.zjt.service;
 
 import com.zjt.entity.ProductionVarietyDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.zjt.entity.Productionheader;
 
 import java.util.List;
 
@@ -15,5 +17,9 @@ import java.util.List;
  */
 public interface IProductionVarietyDetailService extends IService<ProductionVarietyDetail> {
     List<ProductionVarietyDetail> selectvarietyList();
-    List<ProductionVarietyDetail> selectvarietyDetails(long varietyId);
+    List<ProductionVarietyDetail> selectvarietyDetails(String variety);
+
+    List<Productionheader> selectProductionheader(long varietyDetailId);
+
+    List<ProductionVarietyDetailColour> selectColour(long varietyDetailId);
 }

src/main/java/com/zjt/service/impl/ProductionVarietyDetailServiceImpl.java

@@ -1,12 +1,15 @@
 package com.zjt.service.impl;
 
 import com.zjt.entity.ProductionVarietyDetail;
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.zjt.entity.Productionheader;
+import com.zjt.mapper.ProductionVarietyDetailColourMapper;
 import com.zjt.mapper.ProductionVarietyDetailMapper;
 import com.zjt.mapper.ProductionVarietyMapper;
+import com.zjt.mapper.ProductionheaderMapper;
 import com.zjt.service.IProductionVarietyDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
@@ -24,6 +27,10 @@ public class ProductionVarietyDetailServiceImpl extends ServiceImpl<ProductionVa
 
     @Resource
     ProductionVarietyDetailMapper ProductionVarietyDetailMapper;
+    @Resource
+    ProductionheaderMapper ProductionheaderMapper;
+    @Resource
+    com.zjt.mapper.ProductionVarietyDetailColourMapper ProductionVarietyDetailColourMapper;
     @Override
     public List<ProductionVarietyDetail> selectvarietyList() {
         List<ProductionVarietyDetail> productionVarietyDetails = ProductionVarietyDetailMapper.selectvarietyList();
@@ -31,8 +38,22 @@ public class ProductionVarietyDetailServiceImpl extends ServiceImpl<ProductionVa
     }
 
     @Override
-    public List<ProductionVarietyDetail> selectvarietyDetails(long  varietyId) {
-        List<ProductionVarietyDetail> productionVarietyDetails = ProductionVarietyDetailMapper.selectvarietyDetails(varietyId);
+    public List<ProductionVarietyDetail> selectvarietyDetails(String  variety) {
+        List<ProductionVarietyDetail> productionVarietyDetails = ProductionVarietyDetailMapper.selectvarietyDetails(variety);
         return productionVarietyDetails;
     }
+
+    @Override
+    public List<Productionheader> selectProductionheader(long varietyDetailId) {
+        List<Productionheader>productionheaderDetails = ProductionheaderMapper.selectProductionheader(varietyDetailId);
+        return productionheaderDetails;
+    }
+
+    @Override
+    public List<ProductionVarietyDetailColour> selectColour(long varietyDetailId) {
+        List<ProductionVarietyDetailColour>ProductionVarietyDetailColour = ProductionVarietyDetailColourMapper.selectColour(varietyDetailId);
+        return ProductionVarietyDetailColour;
+    }
+
+
 }

src/main/java/com/zjt/web/ProductionVarietyDetailController.java

@@ -1,8 +1,11 @@
 package com.zjt.web;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.zjt.entity.ProductionVarietyDetail;
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.zjt.entity.Productionheader;
 import com.zjt.service.IProductionVarietyDetailService;
 import com.zjt.service.IProductionVarietyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +36,9 @@ public class ProductionVarietyDetailController {
         return  JSONArray.toJSON(productionVarietyDetails).toString();
     }
     @RequestMapping("varietyDetailsLists")
-    public String selectvarietyDetails(@RequestParam("id") String id) {
-        if(id!=null||id!=""){
-            long l = Long.parseLong(id);
-            List<ProductionVarietyDetail> productionVarietyDetails = productionVarietyDetailService.selectvarietyDetails(l);
+    public String selectvarietyDetails(String variety) {
+        if(variety!=null||variety!=""){
+            List<ProductionVarietyDetail> productionVarietyDetails = productionVarietyDetailService.selectvarietyDetails(variety);
             return  JSONArray.toJSON(productionVarietyDetails).toString();
         }else{
             return  JSONArray.toJSON("").toString();
@@ -46,11 +48,21 @@ public class ProductionVarietyDetailController {
     @RequestMapping("productionheader")
     public String group(@RequestParam("id") String id){
         if(id!=null||id!=""){
-            List<ProductionVarietyDetail> productionVarietyDetails1 = productionVarietyDetailService.selectvarietyDetails(Long.parseLong(id));
-            return  JSONArray.toJSON(productionVarietyDetails1).toString();
+            long l = Long.parseLong(id);
+            List<Productionheader> productionVarietyDetails = productionVarietyDetailService.selectProductionheader(l);
+            return  JSONArray.toJSON(productionVarietyDetails).toString();
+        }else{
+            return  JSONArray.toJSON("").toString();
+        }
+    }
+    @RequestMapping("selectColour")
+    public String selectColour(@RequestParam("id") String id){
+        if(id!=null||id!=""){
+            long l = Long.parseLong(id);
+            List<ProductionVarietyDetailColour> productionVarietyDetails = productionVarietyDetailService.selectColour(l);
+            return  JSONArray.toJSON(productionVarietyDetails).toString();
         }else{
             return  JSONArray.toJSON("").toString();
         }
-
     }
 }

src/main/java/com/zjt/web/ProductionheaderController.java

@@ -32,7 +32,6 @@ public class ProductionheaderController {
     public String selectVarietyAll() {
         productionVarietyService.varietyList();
         productionVarietyDetailService.selectvarietyList();
-        productionVarietyDetailService.selectvarietyDetails(1l);
         return VIEW_VARIETY_LIST;
     }
 

src/main/resources/mapper/ProductionVarietyDetailColourMapper.xml

@@ -12,4 +12,8 @@
         where variety_details_id=#{varietyId}
     </select>
 
+    <select id="selectColour" resultMap="BaseResultMap">
+        select * from production_variety_detail_colour
+        where variety_details_id=#{varietyDetailId}
+    </select>
 </mapper>

src/main/resources/mapper/ProductionVarietyDetailMapper.xml

@@ -31,6 +31,6 @@
     <select id="selectvarietyDetails" resultMap="BaseResultMap">
         select <include refid="Base_Column_List" />
         from production_variety_detail
-        where variety_id = #{varietyId}
+        where variety = #{variety}
     </select>
 </mapper>

src/main/resources/mapper/ProductionheaderMapper.xml

@@ -3,6 +3,18 @@
 <mapper namespace="com.zjt.mapper.ProductionheaderMapper">
     <!-- 通用查询结果映射 -->
     <resultMap id="BaseResultMap" type="com.zjt.entity.Productionheader">
-        <!-- 请根据实际实体类字段进行配置 -->
+        <id column="variety_detail_id" jdbcType="FLOAT" property="varietyDetailId" />
+        <result column="variety_id" jdbcType="VARCHAR" property="varietyId" />
+        <result column="product_code" jdbcType="VARCHAR" property="productCode" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
     </resultMap>
+    <sql id="Base_Column_List">
+        variety_detail_id, variety_id, product_code, product_name
+    </sql>
+
+    <select id="selectProductionheader"  resultMap="BaseResultMap">
+        select  *
+        from productionheader
+        where variety_detail_id = #{varietyDetailId}
+    </select>
 </mapper>

src/main/resources/templates/mypackage/varietyList.ftl

@@ -12,164 +12,97 @@
     <link rel="icon" href="${basePath!}/static/logo.png">
     <link rel="stylesheet" href="${basePath!}/static/layui/css/layui.css" media="all" />
     <link rel="stylesheet" href="${basePath!}/static/css/public.css" media="all" />
-    <!-- 保留一个layui脚本引用即可 -->
+    <script src="${basePath!}/static/layui/layui.js" charset="utf-8"></script>
     <script src="${basePath!}/static/layui/layui.all.js" charset="utf-8"></script>
+    <script src="${basePath!}/static/layui/lay/modules/jquery.js"></script>
 </head>
 <body>
 <hr>
-
-<!-- 订单信息区域 -->
 <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
     <legend>订单信息</legend>
-
-    <!-- 物料选择表单 -->
-    <div class="layui-form material-selection-form">
-        <div class="form-container">
+    <div class="layui-form" style="width: 100%; margin-top: 20px;">
+        <center>
             <form class="layui-form" action="">
                 <div class="layui-form-item" id="materialchoose">
-                    <label class="layui-form-label">物料信息</label>
-
-                    <div class="material-selection-group">
-                        <div class="layui-input-inline select-item">
-                            <select name="materialType"
-                                    id="materialType"
-                                    class="province-selector"
-                                    data-value="品类"
-                                    lay-filter="materialType"
-                                    lay-search="">
-                                <option value="">品类</option>
-                            </select>
-                        </div>
-
-                        <div class="layui-input-inline select-item">
-                            <select name="brand"
-                                    id="brand"
-                                    class="city-selector"
-                                    data-value="品牌"
-                                    lay-filter="brand"
-                                    lay-search="">
-                                <option value="">品牌</option>
-                            </select>
-                        </div>
-
-                        <div class="layui-input-inline select-item">
-                            <select name="materialGroup"
-                                    id="materialGroup"
-                                    class="county-selector"
-                                    data-value="物料组"
-                                    lay-filter="materialGroup"
-                                    lay-search="">
-                                <option value="">物料组</option>
-                            </select>
-                        </div>
-
-                        <div class="layui-input-inline select-item">
-                            <select name="materialdetil"
-                                    id="materialdetil"
-                                    class="county-selector"
-                                    data-value="物料描述"
-                                    lay-filter="materialdetil">
-                                <option value="">物料描述</option>
-                            </select>
-                        </div>
-
-                        <div class="layui-input-inline select-item">
-                            <select name="materialCode"
-                                    id="materialCode"
-                                    class="county-selector"
-                                    data-value="物料编码"
-                                    lay-filter="materialCode">
-                                <option value="">物料编码</option>
-                            </select>
-                        </div>
-
-                        <div class="layui-input-inline action-item">
-                            <button type="button"
-                                    class="layui-btn layui-btn-primary"
-                                    onclick="addtable()">
-                                <i class="layui-icon layui-icon-add-circle"></i>添加
-                            </button>
-                        </div>
+                    <div class="layui-form-label">物料信息</div>
+                    <div class="layui-input-inline" style="width: 300px;">
+                        <select name="materialType" id="materialType" class="province-selector" data-value="品类" lay-filter="materialType" onclick="dele()" lay-search="">
+                            <option value="">品类</option>
+                        </select>
+                    </div>
+                    <div class="layui-input-inline" style="width: 300px;">
+                        <select name="brand" id ="brand" class="city-selector" data-value="品牌" lay-filter="brand" onclick="selectbrand()" lay-search="">
+                            <option value="">品牌</option>
+                        </select>
+                    </div>
+<#--                    <div class="layui-input-inline" style="width: 200px;">
+                        <select name="materialGroup" id ="materialGroup" class="county-selector" data-value="物料组" lay-filter="materialGroup"  lay-search="">
+                            <option value="">物料组</option>
+                        </select>
+                    </div>-->
+                    <div class="layui-input-inline" style="width: 400px;">
+                        <select name="productName" id ="productName" class="county-selector" data-value="物料描述" lay-filter="productName">
+<#--                            <option value="">物料描述</option>-->
+                        </select>
+                    </div>
+                    <div class="layui-input-inline" style="width: 200px;">
+                        <select name="productCode" id ="productCode" class="county-selector" data-value="物料编码" lay-filter="productCode">
+                            <option value="">物料编码</option>
+                        </select>
+                    </div>
+                    <div class="layui-input-inline" style="width: 100px;">
+                        <a class="layui-btn layui-btn add" onclick="addtable()">添加</a>
                     </div>
                 </div>
             </form>
-        </div>
+        </center>
     </div>
 
-    <!-- 订单数据表格 -->
-    <form class="layui-form order-form" method="post">
-        <div class="layui-form-item table-container">
-            <div class="table-wrapper">
-                <table class="layui-table order-table"
-                       id="table"
-                       lay-filter="table">
+    <form class="layui-form" method="post" >
+        <div class="layui-form-item" style="width:5000px;">
+            <center>
+                <table class="layui-table" style ="width:5000px; overflow:scroll;" id="table" lay-filter="table" border="1">
                     <colgroup>
                         <col width="150">
                         <col width="200">
                         <col>
                     </colgroup>
-
-                    <thead>
-                    <tr>
-                        <th style="width: 200px">操作</th>
-                        <th style="width: 200px">镜片位置</th>
-                        <th style="width: 200px">采购/退货</th>
-                        <th style="width: 200px">用户名</th>
-                        <th style="width: 300px">物料编码</th>
-                        <th style="width: 800px">物料描述</th>
-                        <th style="width: 300px">物料价格</th>
-                        <th style="width: 300px">数量</th>
-                        <th style="width: 300px">球镜</th>
-                        <th style="width: 300px">柱镜</th>
-                        <th style="width: 300px">轴位</th>
-                        <th style="width: 300px">瞳距</th>
-                        <th style="width: 300px">瞳高</th>
-                        <th style="width: 300px">下加光</th>
-                        <th style="width: 300px">通道</th>
-                        <th style="width: 300px">棱镜</th>
-                        <th style="width: 300px">镜片度数</th>
-                        <th style="width: 300px">镜片型号/基弧</th>
-                        <th style="width: 300px">是否染色</th>
-                        <th style="width: 300px">色度</th>
-                        <th style="width: 300px">来板染色</th>
-                        <th style="width: 300px">厂家色板</th>
-                        <th style="width: 300px">标准色号</th>
-                        <th style="width: 300px">美薄加工</th>
-                        <th style="width: 300px">丽薄加工</th>
-                        <th style="width: 300px">镜架框形</th>
-                        <th style="width: 300px">镜架高度</th>
-                        <th style="width: 300px">鼻梁间距</th>
-                        <th style="width: 300px">水平宽度</th>
-                        <th style="width: 300px">加工镜架框形</th>
-                        <th style="width: 300px">颜色</th>
-                        <th style="width: 300px">直径</th>
-                        <th style="width: 300px">片型</th>
-                        <th style="width: 300px">片色</th>
-                        <th style="width: 300px">备注</th>
+                    <thead style="align: center">
+                    <tr style="align: center">
+                        <th style = "width: 200px"> 操作</th>
+                        <th style = "width: 300px"> 物料编码</th>
+                        <th style = "width: 500px"> 物料描述</th>
+                        <th style = "width: 100px"> 颜色</th>
+                        <th style = "width: 200px"> 镜片位置</th>
+                        <th style = "width: 150px"> 球镜</th>
+                        <th style = "width: 150px"> 柱镜</th>
+                        <th style = "width: 150px"> 轴位</th>
+                        <th style = "width: 150px"> 通道</th>
+                        <th style = "width: 150px"> 下加光</th>
+                        <th style = "width: 300px">备注</th>
+                        <th style = "width: 150px"> 零售价格</th>
+                        <th style = "width: 300px"> 光度范围</th>
+                        <th style = "width: 150px"> 光度说明</th>
+                        <th style = "width: 150px"> 单眼瞳距</th>
+                        <th style = "width: 150px"> 单眼瞳高</th>
+                        <th style = "width: 150px"> 镜眼间距</th>
+                        <th style = "width: 150px"> 前倾角</th>
+                        <th style = "width: 150px"> 镜架面弯</th>
+                        <th style = "width: 150px"> 习惯阅读距离</th>
+                        <th style = "width: 150px"> 近用瞳距</th>
+                        <th style = "width: 150px"> NVB</th>
+                        <th style = "width: 75px"> 主视眼</th>
+                        <th style = "width: 150px"> ERCD</th>
                     </tr>
                     </thead>
-
                     <tbody style="text-align: center">
-                    <!-- 动态数据行将在此处添加 -->
                     </tbody>
                 </table>
-            </div>
-
-            <!-- 表单操作按钮 -->
-            <div class="layui-form-item form-actions">
+            </center>
+            <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="button"
-                            class="layui-btn"
-                            lay-submit
-                            lay-filter="formDemo"
-                            onclick="adddata(); return false;">
-                        <i class="layui-icon layui-icon-ok"></i>立即提交
-                    </button>
-
-                    <button type="reset"
-                            class="layui-btn layui-btn-primary">
-                        <i class="layui-icon layui-icon-refresh"></i>重置
-                    </button>
+                    <button class="layui-btn" lay-submit lay-filter="formDemo" onclick="adddata(); return false;">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
             </div>
         </div>
@@ -177,226 +110,234 @@
 </fieldset>
 
 <script>
-    layui.use(['form', 'table', 'layer', 'jquery'], function () {
+    layui.use('form', function(){
         var form = layui.form;
-        var table = layui.table;
-        var $ = layui.$;
-        var layer = layui.layer;
-
-        // 初始化表单
         form.render();
-
-        // 加载物料品类数据
+    });
+    layui.use(['form', 'table', "laydate", 'layer','jquery'], function () {
+        var productName=null;
+        var material=null;
+        var form = layui.form;
+        var table = layui.table;
+        var $ = layui.$ //重点处
+            ,layer = layui.layer;
         $.ajax({
             url: 'varietyLists',
             type: 'get',
             success: function (data) {
                 $("#materialType").empty();
                 $.each($.parseJSON(data), function(idx, obj) {
-                    $("#materialType").append("<option value=\"" + obj.varietyId + "\">" + obj.variety + "</option>");
-                });
-                form.render("select");
-            },
-            error: function (xhr, status, error) {
+                    $("#materialType").append("<option value=\""+obj.varietyId+"\" data-variety=\""+obj.variety+"\">"+obj.variety+"</option>");                });
+                layui.form.render("select");
+            },error:function (xhr, status, error) {
                 layer.alert('请求失败: ' + error);
-            }
-        });
-
-        // 物料品类选择事件
-        form.on('select(materialType)', function(data) {
+            }});
+        form.on('select(materialType)', function(data){
+            var variety = $(data.elem).find("option:selected").text();
             $.ajax({
                 url: 'varietyDetailsLists',
                 type: 'post',
-                data: {'id': data.value},
+                data:{'variety':variety},
                 success: function (data) {
                     $("#brand").empty();
                     $("#brand").append('<option value="">品牌</option>');
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#brand").append("<option value=\"" + obj.id + "\">" + obj.varietyDetails + "</option>");
+                        $("#brand").append("<option value=\""+obj.id+"\">"+obj.varietyDetails+"</option>");
                     });
-                    form.render("select");
-                },
-                error: function (xhr, status, error) {
+
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
                     layer.alert('请求失败: ' + error);
-                }
-            });
+                }});
         });
-
-        // 品牌选择事件
-        form.on('select(brand)', function(data) {
+/*        form.on('select(brand)', function(data){
             $.ajax({
-                url: 'productionheader',
+                url: 'group',
                 type: 'post',
-                data: {'id': data.value},
+                data:{'brand':data.value},
                 success: function (data) {
                     $("#materialGroup").empty();
                     $("#materialGroup").append('<option value="">物料组</option>');
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#materialGroup").append("<option value=\"" + obj.materialGroupCode + "\">" + obj.materialGroupName + "</option>");
+                        $("#materialGroup").append("<option value=\""+obj.materialGroupCode+"\">"+obj.materialGroupName+"</option>");
                     });
-                    form.render("select");
-                },
-                error: function (xhr, status, error) {
-                    layer.alert('请求失败: ' + error);
-                }
-            });
-        });
 
-        // 物料组选择事件
-        form.on('select(materialGroup)', function(data) {
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
+        });*/
+        form.on('select(brand)', function(data){
             $.ajax({
-                url: 'price',
+                url: 'productionheader',
                 type: 'post',
-                data: {'group': data.value},
+                data:{'id':data.value},
                 success: function (data) {
-                    $("#materialdetil").empty();
-                    $("#materialdetil").append('<option value="">物料描述</option>');
+                    layer.alert('请求失败: ' + data);
+                    $("#productName").empty();$("#productCode").empty();$("#varietyDetailId").empty();
+
+                // $("#productName").append('<option value="">物料描述</option>');
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#materialdetil").append("<option value=\"" + obj.materialCode + "\">" + obj.materialName + "</option>");
+                        $("#productName").append("<option value=\""+obj.productName+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productName+"</option>");
+                        $("#productCode").append("<option value=\""+obj.productCode+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productCode+"</option>");
+
+                        /*$("#productName").append("<option value=\""+obj.productName+"\">"+obj.productName+"</option>");
+                        $("#productCode").append("<option value=\""+obj.productCode+"\">"+obj.productCode+"</option>");*/
                     });
-                    form.render("select");
-                },
-                error: function (xhr, status, error) {
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
                     layer.alert('请求失败: ' + error);
-                }
-            });
+                }});
         });
 
-        // 物料描述选择事件
-        form.on('select(materialdetil)', function(data) {
+        form.on('select(materialdetil)', function(data){
             $.ajax({
                 url: 'code',
                 type: 'post',
-                data: {'code': data.value},
+                data:{'code':data.value},
                 success: function (data) {
-                    $("#materialCode").empty();
-                    // 注意：原代码中引用了不存在的 materialRealPrice 元素
+                    $("#materialCode").empty();$("#materialdetil").empty();
+                    $("#materialRealPrice").empty();
                     $.each($.parseJSON(data), function(idx, obj) {
-                        $("#materialCode").append("<option value=\"" + obj.materialCode + "\">" + obj.materialCode + "</option>");
+                        $("#materialCode").append("<option value=\""+obj.materialCode+"\">"+obj.materialCode+"</option>");
+                        $("#materialRealPrice").append("<option value=\""+obj.retailPrice+"\">"+obj.retailPrice+"</option>");
                     });
-                    form.render("select");
-                },
-                error: function (xhr, status, error) {
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
                     layer.alert('请求失败: ' + error);
-                }
-            });
+                }});
         });
 
-        // 添加表格行
-        window.addtable = function() {
-            var selectedMaterialCode = $('#materialCode option:selected').text();
-            var selectedMaterialDetail = $('#materialdetil option:selected').text();
+        //因为动态添加的元素class属性是无效的，所以不能用$('.add').click(function(){});
+        window.addtable= function(){
+            var selectedVarietyDetailId = $('#productName option:selected').data('variety-detail-id') ||
+                $('#productCode option:selected').data('variety-detail-id');
+            layer.alert(selectedVarietyDetailId);
+            $.ajax({
+                url: 'selectColour',
+                type: 'post',
+                data:{'id':selectedVarietyDetailId},
+                success: function (data) {
+                    $("#colour").empty();
+                    $("#colour").append('<option value="">颜色</option>');
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#colour").append("<option value=\""+obj.id+"\">"+obj.colour+"</option>");
+                    });
 
-            var html = '<tr>' +
-                '<td style="width: 100px"><button type="button" class="layui-btn layui-btn-danger layui-btn-xs" onclick="dele(this)">删除</button></td>' +
-                '<td style="width:200px">' +
-                '<select name="WZ" lay-verify="required">' +
-                '<option value="">--请选择--</option>' +
-                '<option value="L">L</option>' +
-                '<option value="R">R</option>' +
-                '</select>' +
-                '</td>' +
-                '<td style="width:300px">' +
-                '<select name="LY" lay-verify="required">' +
-                '<option value="">--请选择--</option>' +
-                '<option value="C">采购</option>' +
-                '<option value="T">退货</option>' +
-                '</select>' +
-                '</td>' +
-                '<td style="width: 200px"><input type="text" name="username" required lay-verify="required" placeholder="用户名字" autocomplete="off" class="layui-input" readonly="true" value="${currentUser.userName!}"/></td>' +
-                '<td style="width: 200px"><input type="text" name="materialCode" required lay-verify="required" placeholder="物料编码" autocomplete="off" class="layui-input" readonly="true" value="' + selectedMaterialCode + '"/></td>' +
-                '<td style="width: 800px"><input type="text" name="materialDetile" required lay-verify="required" placeholder="物料描述" autocomplete="off" class="layui-input" readonly="true" value="' + selectedMaterialDetail + '"/></td>' +
-                '<td style="width: 200px"><input type="text" name="price" required lay-verify="required" placeholder="价格" autocomplete="off" class="layui-input" readonly="true"/></td>' +
-                '<td style="width: 100px"><input type="text" name="NUM" required lay-verify="required" placeholder="数量" autocomplete="off" class="layui-input" value="1"/></td>' +
-                '<td style="width: 300px"><input type="text" name="SPH" placeholder="球镜" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="CYL" placeholder="柱镜" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="AXIS" placeholder="轴位" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="PDFOD" placeholder="瞳距" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="PH" placeholder="瞳高" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="XADD" placeholder="下加光" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="YULIU1" placeholder="通道" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="PRISM" placeholder="棱镜" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="CVA" placeholder="镜片度数" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="OPTICBC" placeholder="镜片型号/基弧" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="RS" placeholder="是否染色" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="SD" placeholder="色度" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="LRS" placeholder="来板染色" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="CRS" placeholder="厂家色板" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="BRS" placeholder="标准色号" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="MPRO" placeholder="美薄加工" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="LBPO" placeholder="丽薄加工" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="FRAMESHAPE" placeholder="镜架框形" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="FRAMEHEIGHT" placeholder="镜架高度" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="FRAMEBRIDGEWIDTH" placeholder="鼻梁间距" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="SPK" placeholder="水平宽度" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="JFRAMESHAPE" placeholder="加工镜架框形" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="COLOR" placeholder="颜色" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="lEN_DIAMETER" placeholder="直径" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="PX" placeholder="片型" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="PS" placeholder="片色" autocomplete="off" class="layui-input"></td>' +
-                '<td style="width: 300px"><input type="text" name="MARK" placeholder="备注" autocomplete="off" class="layui-input"></td>' +
-                '</tr>';
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
+            $.ajax({
+                url: 'productionheader',
+                type: 'post',
+                data:{'id':selectedVarietyDetailId},
+                success: function (data) {
+                    layer.alert('请求失败: ' + data);
+                    $("#productName").empty();$("#productCode").empty();$("#varietyDetailId").empty();
+
+                    $.each($.parseJSON(data), function(idx, obj) {
+                        $("#productName").append("<option value=\""+obj.productName+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productName+"</option>");
+                        $("#productCode").append("<option value=\""+obj.productCode+"\" data-variety-detail-id=\""+obj.varietyDetailId+"\">"+obj.productCode+"</option>");
 
+                    });
+                    layui.form.render("select");
+                },error:function (xhr, status, error) {
+                    layer.alert('请求失败: ' + error);
+                }});
+            var html = '<tr>'+
+                '<td style = "width: 100px"><input type="button" class="layui-btn layui-btn-radius" onclick="dele(this)" value="删除" /></td>'+
+                '<td style = "width: 200px"> <input type="text" name="materialCode" required lay-verify="required"   placeholder="物料编码" autocomplete="off" class="layui-input"  readonly="true" value="'+ $('#productCode option:selected').text()+'"/></td>'+
+                '<td style = "width: 500px"> <input type="text" name="materialDetile"  required lay-verify="required"  placeholder="物料描述" autocomplete="off" class="layui-input"  readonly="true" value="'+$('#productName option:selected').text()+'"/></td>'+
+                '<td style = "width: 100px">' +
+                '<select name="colour" id ="colour" class="county-selector"  placeholder="颜色" lay-filter="productName">'+
+                '</select></td>'+
+                '<td style="width:200px">'+
+                '<select name="WZ" lay-verify="required">'+
+                '<option value="">--请选择--</option>'+
+                '<option value="L">L</option>'+
+                '<option value="R">R</option>'+
+                '</select></td>'+
+                '<td style = "width: 150px"> <input type="text" name="SPH"    placeholder="球镜" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="CYL"    placeholder="柱镜" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="AXIS"    placeholder="轴位" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150"> <input type="text" name="YULIU1"    placeholder="通道" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="XADD"    placeholder="下加光" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 300px"> <input type="text" name="MARK"    placeholder="备注" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="NUM" required lay-verify="required"   placeholder="零售价" autocomplete="off" class="layui-input" /></td>'+
+                '<td style = "width: 300px"> <input type="text" name="CVA"    placeholder="光度范围" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="SD"    placeholder="光度说明" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="PDFOD"    placeholder="单眼瞳距" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="PH"    placeholder="单眼瞳高" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="FRAMEBRIDGEWIDTH"    placeholder="镜眼距离" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="OPTICBC"    placeholder="前倾角" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="FRAMESHAPE"    placeholder="镜架面弯" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="FRAMEHEIGHT"    placeholder="习惯阅读距离" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="PRISM"    placeholder="近用瞳距" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="RS"    placeholder="NVB" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 75px"> <input type="text" name="LRS"    placeholder="主视眼" autocomplete="off" class="layui-input"></td>'+
+                '<td style = "width: 150px"> <input type="text" name="CRS"    placeholder="ERCD" autocomplete="off" class="layui-input"></td>'+
+
+                '</tr>';
+            //添加到表格最后
             $(html).appendTo($('#table tbody:last'));
             form.render();
-        };
-
-        // 删除表格行
-        window.dele = function (obj) {
+        }
+        window.dele= function (obj){
+            debugger;
             var otr = obj.parentNode.parentNode;
-            var tab = otr.parentNode;
+//			var tab = document.getElementById("tab");
+//			tab.deleteRow(otr.rowIndex)
+            var tab =  otr.parentNode; //自己的父节点 就是table
             tab.removeChild(otr);
+        }
+        window.deltable= function() {
+            if ($('#table tbody tr').length === 1) {
+                layer.msg('只有一条不允许删除。', {
+                    time : 2000
+                });
+            } else {
+                //删除当前按钮所在的tr
+                $(this).closest('tr').remove();
+            }
         };
-
-        // 提交数据
-        window.adddata = function() {
-            var tableElement = document.getElementById("table");
-            var trElements = tableElement.getElementsByTagName("tr");
-            var dataArray = [];
-
-            for (var i = 0; i < trElements.length; i++) {
-                var targetElements = trElements[i].querySelectorAll("[name]");
-                var dataObject = {};
-
-                for (var j = 0; j < targetElements.length; j++) {
-                    if (targetElements[j].value) {
-                        dataObject[targetElements[j].getAttribute("name")] = targetElements[j].value;
-                    } else {
-                        dataObject[targetElements[j].getAttribute("name")] = targetElements[j].getAttribute("value");
+        window.adddata= function() {
+            table=document.getElementById("table");
+            let tr=table.getElementsByTagName("tr");
+            var arrayObj = new Array();
+            for (var i=0; i<tr.length; i++){
+                let target=tr[i].querySelectorAll("[name]"),obj={};
+                for (var j=0; j<target.length; j++){
+                    if(target[j].value){
+                        obj[target[j].getAttribute("name")]=target[j].value;
+                    }else{
+                        obj[target[j].getAttribute("name")]=target[j].getAttribute("value");
                     }
                 }
-
-                // 只有包含数据的对象才添加到数组中
-                if (Object.keys(dataObject).length > 0) {
-                    dataArray.push(dataObject);
-                }
+                arrayObj.push(obj);
             }
-
-            var jsonData = JSON.stringify(dataArray);
-            jsonData = jsonData.replace(/[+]/g, '＋');
-
+            var json=JSON.stringify(arrayObj);
+            json = json.replace(/[+]/g, '＋');
             $.ajax({
                 url: 'insert',
                 type: 'post',
-                data: "list=" + jsonData,
+                data: "list="+json,
                 async: false,
                 dataType: "json",
                 success: function (data) {
                     layer.msg('提交成功！', {
-                        time: 3000
+                        time : 5000
                     });
-                },
-                error: function (xhr, status, error) {
+                }, error: function (xhr, status, error) {
                     layer.alert('请求失败: ' + error);
                 }
             });
-        };
-
-        // 表单提交事件
+        }
         form.on('submit(login)', function (data) {
-            // 可以在这里处理表单提交逻辑
+            //alert(data.value);
         });
     });
+
 </script>
 
 </body>