From cd97fc698d20c5a72c4adaa6b983908700ed863d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Thu, 18 Jul 2024 09:37:32 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=95=B4?=
 =?UTF-8?q?=E5=90=88=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E6=94=B6=E7=BC=96=E8=BE=91=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=A1=B5=E9=9D=A2=E5=AF=B9=E8=B1=A1=E4=B8=BAOutsource?=
 =?UTF-8?q?Quote=E7=B1=BB=20[feat]=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC=E5=86=85?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95getunit=E3=80=81getnormb=E3=80=81getrmb=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Emapper=E6=8C=89=E6=8A=A5=E4=BB=B7=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=AD=90=E8=A1=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OutsourceQuoteController.java  |  20 +-
 .../ruoyi/system/domain/OutsourceQuote.java   |   7 +-
 .../system/mapper/OutsourceQuoteMapper.java   |  14 +-
 .../impl/OutsourceQuoteServiceImpl.java       |   5 +-
 .../mapper/system/OutsourceQuoteMapper.xml    |   8 +-
 .../system/outsource_quote/edit.html          | 478 ++++++++++--------
 6 files changed, 302 insertions(+), 230 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java
index 97cbaa26..7892798b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java
@@ -131,22 +131,16 @@ public class OutsourceQuoteController extends BaseController
     @Log(title = "委外报价", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@RequestBody OutsourceQuoteVO childVO)
+    public AjaxResult editSave(@RequestBody OutsourceQuote outsourceQuote)
     {
-        System.out.println(childVO.toString());
-        List<OutsourceQuoteChild> children = childVO.getOutsourceQuoteChildList();
+        List<OutsourceQuoteChild> children = outsourceQuote.getOutsourceQuoteChildList();
         for (OutsourceQuoteChild child:children) {
-            child.setOutsourceQuoteCode(childVO.getOutsourceQuoteCode());
-            child.setSupplierCode(childVO.getSupplierQuoteCode());
-            child.setSupplierName(childVO.getSupplierName());
-            child.setTaxRate(childVO.getTaxRate());
+            child.setOutsourceQuoteCode(outsourceQuote.getOutsourceQuoteCode());
+            child.setSupplierCode(outsourceQuote.getSupplierQuoteCode());
+            child.setSupplierName(outsourceQuote.getSupplierName());
+            child.setTaxRate(outsourceQuote.getTaxRate());
         }
-        OutsourceQuote outsourceQuote = new OutsourceQuote();
-        outsourceQuote.setPricingDate(childVO.getPricingDate());
-        outsourceQuote.setProcessAmount(children.size());
-        outsourceQuote.setSupplierQuoteCode(childVO.getSupplierQuoteCode());
-        outsourceQuote.setSupplierName(childVO.getSupplierName());
-        outsourceQuote.setOutsourceQuoteChildList(children);
+//        System.out.println(children);
         return toAjax(outsourceQuoteService.updateOutsourceQuote(outsourceQuote));
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceQuote.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceQuote.java
index 466677d6..8d4d4b37 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceQuote.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceQuote.java
@@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 
 /**
  * 委外报价对象 outsource_quote
@@ -38,7 +39,7 @@ public class OutsourceQuote extends BaseEntity
 
     /** 税率 */
     @Excel(name = "税率")
-    private Long taxRate;
+    private BigDecimal taxRate;
 
     /** 定价日期 */
     @Excel(name = "定价日期")
@@ -102,12 +103,12 @@ public class OutsourceQuote extends BaseEntity
         return processAmount;
     }
 
-    public void setTaxRate(Long taxRate) 
+    public void setTaxRate(BigDecimal taxRate)
     {
         this.taxRate = taxRate;
     }
 
-    public Long getTaxRate() 
+    public BigDecimal getTaxRate()
     {
         return taxRate;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceQuoteMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceQuoteMapper.java
index 9a080884..6a198b65 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceQuoteMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceQuoteMapper.java
@@ -72,11 +72,19 @@ public interface OutsourceQuoteMapper
     /**
      * 批量删除委外报价工序信息
      * 
-     * @param outsourceQuoteIds 需要删除的数据主键集合
+     * @param outsourceProcessCodes 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteOutsourceQuoteChildByOutsourceProcessCodes(String[] outsourceQuoteIds);
-    
+    public int deleteOutsourceQuoteChildByOutsourceProcessCodes(String[] outsourceProcessCodes);
+
+    /**
+     * 通过委外报价主键删除委外报价工序信息
+     *
+     * @param outsourceQuoteCode 委外报价编号
+     * @return 结果
+     */
+    public int deleteOutsourceQuoteChildByOutsourceQuoteCode(String outsourceQuoteCode);
+
     /**
      * 批量新增委外报价工序信息
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
index ad1dbc4e..d85da58e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
@@ -105,7 +105,7 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
     public int updateOutsourceQuote(OutsourceQuote outsourceQuote)
     {
         outsourceQuote.setUpdateTime(DateUtils.getNowDate());
-        outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceProcessCode(outsourceQuote.getOutsourceQuoteId());
+        outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceQuoteCode(outsourceQuote.getOutsourceQuoteCode());
         insertOutsourceQuoteChild(outsourceQuote);
         return outsourceQuoteMapper.updateOutsourceQuote(outsourceQuote);
     }
@@ -134,7 +134,8 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
     @Override
     public int deleteOutsourceQuoteByOutsourceQuoteId(Integer outsourceQuoteId)
     {
-        outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceProcessCode(outsourceQuoteId);
+        OutsourceQuote outsourceQuote = outsourceQuoteMapper.selectOutsourceQuoteByOutsourceQuoteId(outsourceQuoteId);
+        outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceQuoteCode(outsourceQuote.getOutsourceQuoteCode());
         return outsourceQuoteMapper.deleteOutsourceQuoteByOutsourceQuoteId(outsourceQuoteId);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml
index 65dd14c8..3230e695 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml
@@ -69,7 +69,7 @@
     </select>
 
     <select id="selectOutsourceQuoteChildList" resultType="OutsourceQuoteChild" resultMap="OutsourceQuoteChildResult">
-        select outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status
+        select outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status,charge_unit
         from outsource_quote_child
         where outsource_quote_code = #{outsource_quote_code}
     </select>
@@ -136,6 +136,8 @@
         </foreach>
     </delete>
 
+
+
     <delete id="deleteOutsourceQuoteChildByOutsourceProcessCode" parameterType="String">
         delete from outsource_quote_child where outsource_process_code in
         <foreach item="outsourceProcessCode" collection="array" open="(" separator="," close=")">
@@ -154,9 +156,9 @@
     </delete>
 
     <insert id="batchOutsourceQuoteChild">
-        insert into outsource_quote_child( outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status) values
+        insert into outsource_quote_child( outsource_quote_child_id, outsource_quote_code, outsource_process_code, charge_unit, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.outsourceQuoteChildId}, #{item.outsourceQuoteCode}, #{item.outsourceProcessCode}, #{item.outsourceProcessNo}, #{item.outsourceProcessName}, #{item.remark}, #{item.taxRate}, #{item.materialRmb}, #{item.materialNormb}, #{item.supplierCode}, #{item.supplierName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.auditStatus})
+            ( #{item.outsourceQuoteChildId}, #{item.outsourceQuoteCode}, #{item.outsourceProcessCode},#{item.chargeUnit}, #{item.outsourceProcessNo}, #{item.outsourceProcessName}, #{item.remark}, #{item.taxRate}, #{item.materialRmb}, #{item.materialNormb}, #{item.supplierCode}, #{item.supplierName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.auditStatus})
         </foreach>
     </insert>
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html
index d838b391..aa26eb48 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/edit.html
@@ -4,232 +4,308 @@
     <th:block th:include="include :: header('修改委外报价')" />
 </head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-outsource_quote-edit" th:object="${outsourceQuote}">
-            <h4 class="form-header h4">委外报价信息</h4>
-            <input name="outsourceQuoteId" th:field="*{outsourceQuoteId}" type="hidden">
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">委外报价单号：</label>
-                    <div class="col-sm-8">
-                        <input name="outsourceQuoteCode" th:field="*{outsourceQuoteCode}" class="form-control" type="text" required>
-                    </div>
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-outsource_quote-edit" th:object="${outsourceQuote}">
+        <h4 class="form-header h4">委外报价信息</h4>
+        <input name="outsourceQuoteId" th:field="*{outsourceQuoteId}" type="hidden">
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">委外报价单号：</label>
+                <div class="col-sm-8">
+                    <input name="outsourceQuoteCode" th:field="*{outsourceQuoteCode}" class="form-control" type="text" required>
                 </div>
             </div>
+        </div>
 
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">供应商编号：</label>
-                    <div class="col-sm-8">
-                        <input name="supplierQuoteCode" th:field="*{supplierQuoteCode}" class="form-control" type="text">
-                    </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">供应商编号：</label>
+                <div class="col-sm-8">
+                    <input name="supplierQuoteCode" th:field="*{supplierQuoteCode}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">供应商名称：</label>
-                    <div class="col-sm-8">
-                        <input name="supplierName" th:field="*{supplierName}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">供应商名称：</label>
+                <div class="col-sm-8">
+                    <input name="supplierName" th:field="*{supplierName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">工序合计：</label>
-                    <div class="col-sm-8">
-                        <input name="processAmount" th:field="*{processAmount}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">工序合计：</label>
+                <div class="col-sm-8">
+                    <input name="processAmount" th:field="*{processAmount}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">税率：</label>
-                    <div class="col-sm-8">
-                        <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">税率：</label>
+                <div class="col-sm-8">
+                    <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">定价日期：</label>
-                    <div class="col-sm-8">
-                        <input name="pricingDate" th:field="*{pricingDate}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">定价日期：</label>
+                <div class="col-sm-8">
+                    <input name="pricingDate" th:field="*{pricingDate}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">审核状态：</label>
-                    <div class="col-sm-8">
-                        <select name="auditStatus" class="form-control" th:with="type=${@dict.getType('audit_status')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
-                        </select>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <select name="auditStatus" class="form-control" th:with="type=${@dict.getType('audit_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
+                    </select>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">备注：</label>
-                    <div class="col-sm-8">
-                        <input name="remark" th:field="*{remark}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
                 </div>
             </div>
-            <h4 class="form-header h4">委外报价工序信息</h4>
-            <div class="row">
-                <div class="col-sm-12">
-                    <button type="button" class="btn btn-blue btn-sm" onclick="processadd()"><i class="fa fa-plus"> 增加</i></button>
-                    <div class="col-sm-12 select-table table-striped">
-                        <table id="bootstrap-table"></table>
-                    </div>
+        </div>
+        <h4 class="form-header h4">委外报价工序信息</h4>
+        <div class="row">
+            <div class="col-sm-12">
+                <button type="button" class="btn btn-blue btn-sm" onclick="processadd()"><i class="fa fa-plus"> 增加</i></button>
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table-process"></table>
                 </div>
             </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "system/outsource_quote";
-        $("#form-outsource_quote-edit").validate({
-            focusCleanup: true
-        });
-        // 保存信息 刷新表格
-        function saveJson(url, data, callback) {
-            var config = {
-                url: url,
-                type: "post",
-                dataType: "json",
-                contentType: "application/json;charset=utf-8",
-                data: data,
-                beforeSend: function () {
-                    $.modal.loading("正在处理中，请稍后...");
-                    $.modal.disable();
-                },
-                success: function(result) {
-                    if (typeof callback == "function") {
-                        callback(result);
-                    }
-                    $.operate.successCallback(result);
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/outsource_quote";
+    $("#form-outsource_quote-edit").validate({
+        focusCleanup: true
+    });
+    // 保存信息 刷新表格
+    function saveJson(url, data, callback) {
+        var config = {
+            url: url,
+            type: "post",
+            dataType: "json",
+            contentType: "application/json;charset=utf-8",
+            data: data,
+            beforeSend: function () {
+                $.modal.loading("正在处理中，请稍后...");
+                $.modal.disable();
+            },
+            success: function(result) {
+                if (typeof callback == "function") {
+                    callback(result);
                 }
-            };
-            $.ajax(config)
+                $.operate.successCallback(result);
+            }
         };
+        $.ajax(config)
+    };
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                var url = prefix + "/edit";
-                if ($.validate.form()) {
-                    // 获取表单数据
-                    const outsourceQuoteData = $("#form-outsource_quote-edit").serializeArray().reduce((obj, item) => {
-                        obj[item.name] = item.value;
-                        return obj;
-                    }, {});
-                    // console.log(outsourceQuoteData);
-                    // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
-                    var rows = $('#bootstrap-table').bootstrapTable('getData');
-                    // console.log(JSON.stringify(rows));
-                    // 检查表格数据是否为空
-                    if (rows.length === 0) {
-                        $.modal.alertWarning("请至少添加一条委外工序再保存!");
-                        return;
-                    }
-                    // 将表数据转换成与qualityReportData格式一致的数组
-                    var outsourceQuoteChildList = rows.map(function (item) {
-                        // 根据实际字段名调整
-                        return {
-                            "outsourceProcessCode": item.outsourceProcessCode,
-                            "outsourceProcessNo": item.outsourceProcessNo,
-                            "chargeUnit": item.chargeUnit,
-                            "materialRmb": item.materialRmb,
-                            "materialNormb": item.materialNormb,
+    function submitHandler() {
+        var url = prefix + "/edit";
+        var outsourceQuote = {
 
-                            // ...其他字段
-                        };
-                    });
-                    const combinedData = Object.assign({}, outsourceQuoteData,
-                        {
-                            outsourceQuoteChildList: outsourceQuoteChildList,
-                        },
-                    );
-                    // 合并表单数据和表格数据
-                    // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
-                    console.log(combinedData)
-                    // 使用 JSON.stringify() 序列化数据
-                    const jsonData = JSON.stringify(combinedData);
-                    // 发送 AJAX 请求到后端接口
-                    saveJson(prefix + "/edit", jsonData);
+        };
+        if ($.validate.form()) {
+            var outsourceQuoteChildList = [];
+            // 获取表单数据
+            const outsourceQuoteData = $("#form-outsource_quote-edit").serializeArray().reduce((obj, item) => {
+                obj[item.name] = item.value;
+                return obj;
+            }, {});
+            console.log(outsourceQuoteData);
+            outsourceQuote = {
+                outsourceQuoteId: outsourceQuoteData.outsourceQuoteId,
+                outsourceQuoteCode: outsourceQuoteData.outsourceQuoteCode,
+                supplierQuoteCode: outsourceQuoteData.supplierCode,
+                supplierName: outsourceQuoteData.supplierName,
+                pricingDate: outsourceQuoteData.pricingDate,
+                taxRate: outsourceQuoteData.taxRate,
+                remark: outsourceQuoteData.remark,
+                processAmount: 0,
+                outsourceQuoteChildList: []
+            }
+            // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+            var rows = $('#bootstrap-table-process').bootstrapTable('getData');
+            // 检查表格数据是否为空
+            if (rows.length === 0) {
+                $.modal.alertWarning("请至少添加一条委外工序再保存!");
+                return;
+            }else{
+                console.log(rows);
+                outsourceQuote.processAmount = rows.length;
+                var unit = getUnit();
+                var noRmb = getNoRmb();
+                var rmb = getRmb();
+                for(var i=0;i<rows.length;i++){
+                    var quoteChild = {
+                        outsourceProcessCode: rows[i].outsourceProcessCode,
+                        outsourceProcessNo: rows[i].outsourceProcessNo,
+                        outsourceProcessName: rows[i].outsourceProcessName,
+                        chargeUnit:unit[i],
+                        materialNormb: noRmb[i],
+                        materialRmb: rmb[i],
+                    };
+                    outsourceQuote.outsourceQuoteChildList.push(quoteChild);
                 }
+                console.log(outsourceQuote);
             }
-        };
-        function processadd() {
-            var url = prefix + "/processadd";
-            var options = {
-                title: '选择委外工序',
-                height: "500",
-                url: url,
-                callBack: doSubmit
-            };
-            $.modal.openOptions(options);
+            saveJson(prefix + "/edit", JSON.stringify(outsourceQuote));
         }
-        /* 选择委外工序回调 */
-        function doSubmit(index, layero){
-            // // 这里取到的是多行的
-            var rowData = layero.find("iframe")[0].contentWindow.getSelections();
-            //判断是否重复
-            var rows = $("#bootstrap-table").bootstrapTable('getData').length;
-            if(rows>0){
-                for(var i=0;i<rows;i++){
-                    var data = $("#bootstrap-table").bootstrapTable('getData')[i];
-                    for(var j=0;j<rowData.length;j++){
-                        if(data.outsourceProcessCode==rowData[j].outsourceProcessCode){
-                            $.modal.alertError("不能选择已添加过的相同工序");
-                            return;
-                        }
+    }
+
+    function processadd() {
+        var url = prefix + "/processadd";
+        var options = {
+            title: '选择委外工序',
+            height: "500",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+    /* 选择委外工序回调 */
+    function doSubmit(index, layero){
+        // // 这里取到的是多行的
+        var rowData = layero.find("iframe")[0].contentWindow.getSelections();
+        //判断是否重复
+        var rows = $("#bootstrap-table-process").bootstrapTable('getData').length;
+        if(rows>0){
+            for(var i=0;i<rows;i++){
+                var data = $("#bootstrap-table-process").bootstrapTable('getData')[i];
+                for(var j=0;j<rowData.length;j++){
+                    if(data.outsourceProcessNo==rowData[j].outsourceProcessNo){
+                        $.modal.alertError("不能选择已添加过的相同工序");
+                        return;
                     }
-                    sub.addRow(rowData[i]);
-                };
-            }else{
-                for(i=0;i<rowData.length;i++){
-                    sub.addRow(rowData[i]);
+                    insertTable(rowData[i]);
                 }
+            };
+        }else{
+            for(i=0;i<rowData.length;i++){
+                insertTable(rowData[i]);
             }
-            layer.closeAll();
         }
-        $(function() {
-            var options = {
-                data: [[${outsourceQuote.outsourceQuoteChildList}]],
-                pagination: false,
-                showSearch: false,
-                showRefresh: false,
-                showToggle: false,
-                showColumns: false,
-                sidePagination: "client",
-                columns: [
+        layer.closeAll();
+    }
+    function insertTable(rowData) {
+        $("#bootstrap-table-process").bootstrapTable('insertRow', {
+            index: 1,
+            row: {
+                outsourceProcessNo: rowData.outsourceProcessNo,
+                outsourceProcessCode: rowData.outsourceProcessCode,
+                outsourceProcessName: rowData.outsourceProcessName,
+                materialNoRmb: 0.00,
+                materialRmb: 0.00,
+            }
+        });
+    }
+
+    function getUnit(){
+        var selectElements = $('#bootstrap-table-process').find('select[id^="chargeUnit"]');
+        // 遍历每个下拉框
+        var unit = [];
+        selectElements.each(function() {
+            // 获取当前下拉框的值
+            var selectedValue = $(this).val();
+            unit.push(selectedValue);
+        });
+        console.log(unit);
+        return unit;
+    }
+    function getNoRmb(){
+        var selectElements = $('#bootstrap-table-process').find('input[id^="materialNormb"]');
+        // 遍历每个下拉框
+        var noRmb = [];
+        selectElements.each(function() {
+            // 获取当前下拉框的值
+            var selectedValue = $(this).val();
+            noRmb.push(selectedValue);
+        });
+        // console.log(noRmb);
+        return noRmb;
+    };
+    function getRmb(){
+        var selectElements = $('#bootstrap-table-process').find('input[id^="materialRmb"]');
+        // 遍历每个输入框
+        var rmb = [];
+        selectElements.each(function() {
+            // 获取当前输入框的值
+            var selectedValue = $(this).val();
+            rmb.push(selectedValue);
+        });
+        // console.log(rmb);
+        return rmb;
+    };
+
+    function initTable(data,index){
+        $("#bootstrap-table-process").bootstrapTable('insertRow', {
+            index:1,
+            row: {
+                outsourceProcessNo: data.outsourceProcessNo,
+                outsourceProcessCode: data.outsourceProcessCode,
+                outsourceProcessName: data.outsourceProcessName,
+            }
+        });
+        $('#bootstrap-table-process').find('select[id="chargeUnit'+index+'"]').val(data.chargeUnit);
+        $('#bootstrap-table-process').find('input[id="materialNormb'+index+'"]').val(data.materialNormb);
+        $('#bootstrap-table-process').find('input[id="materialRmb'+index+'"]').val(data.materialRmb);
+
+    };
+    $(function() {
+        var options = {
+            id: "bootstrap-table-process",
+            pagination: false,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            sidePagination: "client",
+            data: [[${outsourceQuote.outsourceQuoteChildList}]],
+            columns: [
                 {
                     field: 'outsourceProcessId',
                     align: 'center',
                     title: '委外工序主键',
                     visible: false,
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text'  readonly='readonly' name='outsourceQuoteChildList[%s].outsourceProcessId' value='%s'>", index, value);
-                        return html;
-                    }
                 },
                 {
                     field: 'outsourceProcessNo',
                     align: 'center',
                     title: '委外工序编号',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourceQuoteChildList[%s].outsourceProcessNo' value='%s'>", index, value);
-                        return html;
-                    }
                 },
 
                 {
                     field: 'outsourceProcessName',
                     align: 'center',
                     title: '委外工序名称',
+                },
+                {
+                    field: 'chargeUnit',
+                    align: 'center',
+                    title: '计价单位',
+                    width: 120,
+                    // overflow: visible,
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourceQuoteChildList[%s].outsourceProcessName' value='%s'>", index, value);
+                        var html = $.common.sprintf("<select class='form-control'  id='chargeUnit" + index + "' data-first-title= '请选择' > " +
+                            "<option value=''>请选择</option>" +
+                            "<option value='0'>按重量计</option>" +
+                            "<option value='1'>按数量计</option>" +
+                            "<option value='2'>按面积计</option>" +
+                            "</select>", index, value);
                         return html;
                     }
                 },
@@ -238,7 +314,7 @@
                     align: 'center',
                     title: '工序的不含税单价(RMB) ',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourceQuoteChildList[%s].materialNormb' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='text' id='materialNormb" + index + "'>", index, value);
                         return html;
                     }
                 },
@@ -247,7 +323,7 @@
                     align: 'center',
                     title: '工序的含税单价(RMB)',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourceQuoteChildList[%s].materialRmb' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='text' id='materialRmb" + index + "'>", index, value);
                         return html;
                     }
                 },
@@ -259,32 +335,22 @@
                         return '<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="sub.delRowByIndex(\'' + value + '\')"><i class="fa fa-remove"></i>删除</a>';
                     }
                 }]
-            };
-            // console.log(options.data);
-            $.table.init(options);
+        };
+        $.table.init(options);
+        var quoteDetail = options.data;
+        $.each(quoteDetail, function(index, item) {
+            // 设置下拉框的值
+            $('#chargeUnit' + index).val(item.chargeUnit);
+
+            // 设置不含税单价输入框的值
+            $('#materialNormb' + index).val(item.materialNormb);
+
+            // 设置含税单价输入框的值
+            $('#materialRmb' + index).val(item.materialRmb);
         });
 
-        function addRow() {
-            var count = $("#" + table.options.id).bootstrapTable('getData').length;
-            var row = {
-                index: $.table.serialNumber(count),
-                outsourceQuoteCode: "",
-                outsourceProcessNo: "",
-                outsourceProcessName: "",
-                remark: "",
-                taxRate: "",
-                materialRmb: "",
-                materialNormb: "",
-                supplierCode: "",
-                supplierName: "",
-                createBy: "",
-                createTime: "",
-                updateBy: "",
-                updateTime: "",
-                auditStatus: "",
-            }
-            sub.addRow(row);
-        };
-    </script>
+    });
+
+</script>
 </body>
 </html>
\ No newline at end of file