diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
index 1e85b4e2..0c7ee214 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
@@ -180,7 +180,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">报价币种：</label>
             <div class="col-sm-8">
-                <select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" required>
+                <select class="form-control" id="commonCurrency_edit" name="commonCurrency" th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" disabled>
                     <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                 </select>
@@ -189,7 +189,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" id="usdTax_edit" class="form-control" th:field="*{usdTax}" type="number" required />
+                <input name="usdTax" id="usdTax_edit" class="form-control" th:field="*{usdTax}" type="number" disabled />
             </div>
         </div>
         <div class="form-group">
@@ -197,7 +197,7 @@
             <div class="col-sm-8">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
                     <input required type="radio" th:id="${'confirmTax_' + dict.dictCode}"
-                           name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                           name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}" th:disabled="${dict.default ? 'disabled' : ''}">
                     <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
@@ -205,7 +205,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">税率：</label>
             <div class="col-sm-8">
-                <input name="taxRate" id="taxRate_edit" th:field="*{taxRate}" class="form-control" type="number">
+                <input name="taxRate" id="taxRate_edit" th:field="*{taxRate}" class="form-control" type="number" disabled>
             </div>
         </div>
         <div class="form-group">
@@ -213,7 +213,7 @@
             <div class="col-sm-8">
                 <div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
                     <input required type="radio" th:id="${'invoice_' + dict.dictCode}"
-                           name="invoice" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                           name="invoice" th:value="${dict.dictValue}" th:checked="${dict.default}" th:disabled="${dict.default ? 'disabled' : ''}">
                     <label th:for="${'invoice_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                 </div>
             </div>
@@ -221,19 +221,19 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">付款条件：</label>
             <div class="col-sm-8">
-                <input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text">
+                <input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">交货方式：</label>
             <div class="col-sm-8">
-                <input name="deliveryMethod" th:field="*{deliveryMethod}" class="form-control" type="text">
+                <input name="deliveryMethod" th:field="*{deliveryMethod}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">交货条件：</label>
             <div class="col-sm-8">
-                <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text">
+                <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
@@ -249,7 +249,7 @@
             <label class="col-sm-3 control-label">客户验收时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="modificationTime" th:field="*{modificationTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />
+                    <input name="modificationTime" th:field="*{modificationTime}" class="form-control" placeholder="yyyy-mm-dd" type="text"  disabled/>
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -257,57 +257,47 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">贸易条款：</label>
             <div class="col-sm-8">
-                <textarea name="tradeClause" class="form-control" th:field="*{tradeClause}"></textarea>
+                <textarea name="tradeClause" class="form-control" th:field="*{tradeClause}" disabled></textarea>
             </div>
         </div>
 
         <div class="form-group">
             <label class="col-sm-3 control-label">备注内容：</label>
             <div class="col-sm-8">
-                <textarea name="remark" class="form-control" th:field="*{remark}"></textarea>
+                <textarea name="remark" class="form-control" th:field="*{remark}" disabled></textarea>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select name="businessMembers" class="form-control m-b" th:field="*{businessMembers}"  required>
-                </select>
+                <input name="businessMembers" th:field="*{businessMembers}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="container">
             <h4 class="form-header h4">计算</h4>
             <div class="col-xs-12 form-row">
-                <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" id="enterprise_edit" type="number" th:field="*{materialSum}" readonly/>
-                <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" th:field="*{enterpriseSum}" readonly/>
+                <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" type="number" th:field="*{materialSum}" readonly/>
+                <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum"type="number" th:field="*{enterpriseSum}" readonly/>
             </div>
             <div class="col-xs-12 form-row">
-                <label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbPrice" id="noRmb_edit" type="number" th:field="*{noRmbPrice}" readonly/>
-                <label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" th:field="*{noRmbSum}" readonly/>
+                <label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbPrice" type="number" th:field="*{noRmbPrice}" readonly/>
+                <label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" type="number" th:field="*{noRmbSum}" readonly/>
             </div>
             <div class="col-xs-12 form-row">
-                <label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-4" name="rmbPrice" id="rmb_edit" type="number" th:field="*{rmbPrice}" readonly/>
-                <label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-4" name="rmbTaxSum" id="rmbTax_edit" type="number" th:field="*{rmbTaxSum}" readonly/>
+                <label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-4" name="rmbPrice" type="number" th:field="*{rmbPrice}" readonly/>
+                <label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-4" name="rmbTaxSum" type="number" th:field="*{rmbTaxSum}" readonly/>
             </div>
             <div class="col-xs-12">
-                <label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-4" name="noUsdPrice" id="noUsd_edit" type="number" th:field="*{noUsdPrice}" readonly/>
-                <label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" th:field="*{noUsdSum}" readonly/>
+                <label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-4" name="noUsdPrice" type="number" th:field="*{noUsdPrice}" readonly/>
+                <label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-4" name="noUsdSum"  type="number" th:field="*{noUsdSum}" readonly/>
             </div>
             <div class="col-xs-12 form-row">
-                <label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-4" name="usdPrice" id="usd_edit" type="number" th:field="*{usdPrice}" readonly/>
-                <label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-4" name="usdTaxSum" id="usdSum_edit" type="number" th:field="*{usdTaxSum}" readonly/>
+                <label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-4" name="usdPrice"  type="number" th:field="*{usdPrice}" readonly/>
+                <label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-4" name="usdTaxSum"  type="number" th:field="*{usdTaxSum}" readonly/>
             </div>
         </div>
     </form>
     <div class="other-container">
-        <div class="form-row">
-            <div class="btn-group-sm" id="toolbars" role="group">
-                <span>选择报价信息</span>
-                <a class="btn btn-success" onclick="insertRow()">
-                    <i class="fa fa-plus"></i> 添加物料
-                </a>
-            </div>
-
-        </div>
         <div class="row">
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-sub-table-editOrder"></table>
@@ -334,93 +324,54 @@
         var options = {
             id:'bootstrap-sub-table-editOrder',
             url: ctx + "system/orderChild/list",
-            pagination: false,
             queryParams: queryParams,
             sidePagination: "client",
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
             model: "物料报价信息",
             columns: [
                 {checkbox: true},
                 {field: 'index',align: 'center', title: "序号",
-                    formatter: function (value, row, index) {
-                        var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
-                        return columnIndex + $.table.serialNumber(index);
+                    formatter: function (value, row, index,column) {
+                        return $.table.serialNumber(index) - 1;
                     }
                 },
                 {title: '物料索引id',field: 'materialId',align: 'center',visible: false},
                 {title: '料号',field: 'materialCode',align: 'center'},
                 {title: '物料名称',field: 'materialName',align: 'center'},
-                {title: '图片',field: 'photoUrl',
-                    formatter: function(value, row, index) {
-                        return $.table.imageView(value);
-                    }
-                },
-                {title: '物料类型',field: 'materialType',align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.selectCategoryLabel(materialTypeDatas, value);
-                    }
-                },
+                {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} },
+                {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
-                { title: '单位',field: 'unit',align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(sysUnitClassDatas, value);
-                    }
-                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(processMethodDatas, value);
-                    }
-                },
-                { title: '对外售价',field: 'materialSole',editable: true},
-                {title: '国内税率',field: 'countTax',align: 'center',editable: true},
-                { title: '美元汇率',field: 'usdTax', align: 'center',editable: true},
-                {field: 'materialNum',align: 'center',title: '物料的数量',editable: true},
+                { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
+                {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
+                { title: '对外售价',field: 'materialSole'},
+                {title: '国内税率',field: 'countTax',align: 'center'},
+                { title: '美元汇率',field: 'usdTax', align: 'center'},
                 { title: '物料的不含税单价(RMB)',
                     field: 'materialNoRmb',
-                    align: 'center',
-                    editable: function(value, row, index) {
-                        var commonCurrency3 = $("#commonCurrency_edit option:selected").val();
-                        if (commonCurrency3 == 1){
-                            return true;
-                        }else{
-                            return false;
-                        }
-                    }
+                    align: 'center'
                 },
+                { title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},
+                {field: 'materialNum',align: 'center',title: '物料的数量',
+                },
+                {title: '物料的不含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',},
+                { title: '物料的含税总价(RMB)',field: 'materialRmbSum',align: 'center',},
                 {title: '物料的不含税单价(美元)',
                     field: 'materialNoUsd',
                     align: 'center',
-                    editable: function(value, row, index) {
-                        var commonCurrency2= $("#commonCurrency_edit option:selected").val();
-                        if (commonCurrency2 == 2){
-                            return true;
-                        }else{
-                            return false;
-                        }
-                    }
-                },
-                { title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center'},
-                { title: '物料的含税总价(美元)',field: 'materialUsdSum',align: 'center'},
-                { title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center'},
-                { title: '物料的含税总价(RMB)',field: 'materialNoRmbSum', align: 'center'},
-                { title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center'},
-                {   title: '计划交付时间',field: 'deliveryTime',align: 'center',
-                    editable: {type: 'date',title: '计划交付时间',format: 'yyyy-mm-dd', emptytext: "计划交付时间",
-                        formatter: function (value, row, index) {
-                            return value;
-                        }}
                 },
-                {title: '质保天数',align: 'center',field: 'expiryDay',formatter: function(value, row, index){
-                        return value + "天数";
-                    },
+                { title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center',},
+                { title: '物料的含税总价(美元)',field: 'materialUsdSum', align: 'center',},
+                { title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center',},
+                {  title: '计划交付时间',field: 'deliveryTime',align: 'center' },
+                {title: '质保天数',align: 'center',field: 'expiryDay',
                 },
-                {title:'已完成数'},{title: '已出货数'},{title: '已出库数'},{title: '已收货数'},{title: '已验收数'},
-                { title: '录入人',field: 'createBy',align: 'center',visible: false},
-                { title: '录入时间',field: 'createTime',align: 'center',visible: false},
-                { title: '更新人',field: 'updateBy',align: 'center',visible: false},
-                { title: '上次更新时间',field: 'updateTime',align: 'center',visible: false},
-                { title: '备注',field: 'remark',align: 'center', visible: false },
-                { title: '审核状态',field: 'auditStatus',align: 'center',visible: false,
+                {field: 'remark',align: 'center',title: '备注',},
+                {field: 'auditStatus',align: 'center',title: '审核状态',visible: false,
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(auditStatusDatas, value);
                     }
@@ -433,43 +384,6 @@
                     }
                 }
             ],
-            onEditableSave:function(field, row, oldValue, $el){
-                var commonCurrency1 = $("#commonCurrency_edit option:selected").val();
-                var rmb1 = $("#taxRate_edit").val();
-                if (rmb1 =='' || rmb1== null){
-                    rmb1 = 0;
-                }else{
-                    rmb1 = $("#taxRate_edit").val();
-                }
-                var rmb = Number(rmb1).toFixed(2) / 100;
-                var usd = $("#usdTax_edit").val();
-                if (usd =='' || usd== null){
-                    usd = 0;
-                }else{
-                    usd = Number(usd).toFixed(2);
-                }
-                if(commonCurrency1 == 1){
-                    row.materialNoRmb = Number(row.materialNoRmb).toFixed(2);
-                    row.materialRmb = Number(row.materialNoRmb * Number(1 + rmb));
-                    row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);
-                    row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2);
-                    row.materialNoUsd = Number(row.materialNoRmb / usd).toFixed(2);
-                    row.materialNoUsdSum = Number(row.materialNum * row.materialNoUsd).toFixed(2);
-                    row.materialUsd = Number(row.materialNoUsd).toFixed(2)
-                    row.materialUsdSum = Number(row.materialNum * Number(row.materialUsd)).toFixed(2);
-                }
-                else if( commonCurrency1 == 2){
-                    row.materialNoUsd = Number(row.materialNoUsd).toFixed(2);
-                    row.materialUsd = Number(row.materialNoUsd).toFixed(2);
-                    row.materialUsdSum = Number(row.materialNum * row.materialUsd).toFixed(2);
-                    row.materialNoUsdSum = Number(row.materialNoUsd * row.materialNum).toFixed(2);
-                    row.materialNoRmb = Number(row.materialNoUsd * usd).toFixed(2);
-                    row.materialRmb = Number(row.materialNoRmb * (1 + rmb)).toFixed(2);
-                    row.materialNoRmbSum = Number(row.materialNoRmb * row.materialNum).toFixed(2);
-                    row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2);
-                }
-                getTotalAmount()
-            },
         };
         $.table.init(options);
         $.ajax({
@@ -693,46 +607,7 @@
             }
         }
     }
-    //计算
-    function getTotalAmount(){
-        // $("#addFinishbomTable").bootstrapTable('refresh');
-        let getData = $("#bootstrap-sub-table-order").bootstrapTable('getData');
-        let enterprise = 0;let enterpriseSum = 0; let noRmb = 0;
-        let rmb = 0;let noRmbSum =0;let rmbSum = 0;
-        let noUsd = 0;let usd = 0;let noUsdSum =0; let usdSum = 0;
-        $("input[name='materialSum']").val(0);
-        $("input[name='enterpriseSum']").val(0);
-        $("input[name='noRmbPrice']").val(0);
-        $("input[name='noRmbSum']").val(0);
-        $("input[name='rmbPrice']").val(0);
-        $("input[name='rmbTaxSum']").val(0);
-        $("input[name='noUsdPrice']").val(0);
-        $("input[name='noUsdSum']").val(0);
-        $("input[name='usdPrice']").val(0);
-        $("input[name='usdTaxSum']").val(0);
-        for(let i=0;i<getData.length;i++){
-            enterprise += 1;
-            enterpriseSum = parseInt(enterprise + getData[i].materialNum);
-            noRmb = parseFloat(noRmb + getData[i].materialNoRmb).toFixed(2);
-            rmb = parseFloat(rmb + getData[i].materialRmb).toFixed(2) ;
-            noRmbSum = parseFloat(noRmbSum + getData[i].materialNoRmbSum).toFixed(2);
-            rmbSum = parseFloat(rmbSum + getData[i].materialRmbSum).toFixed(2);
-            noUsd = parseFloat(noUsd + getData[i].materialNoUsd).toFixed(2) ;
-            usd = parseFloat(usd + getData[i].materialUsd).toFixed(2) ;
-            noUsdSum = parseFloat(noUsdSum + getData[i].materialNoUsdSum).toFixed(2);
-            usdSum = parseFloat(usdSum + getData[i].materialUsdSum).toFixed(2);
-        }
-        $("input[name='materialSum']").val(enterprise);
-        $("input[name='enterpriseSum']").val(enterpriseSum);
-        $("input[name='noRmbPrice']").val(noRmb);
-        $("input[name='noRmbSum']").val(noRmbSum);
-        $("input[name='rmbPrice']").val(rmb);
-        $("input[name='rmbTaxSum']").val(rmbSum);
-        $("input[name='noUsdPrice']").val(noUsd);
-        $("input[name='noUsdSum']").val(noUsdSum);
-        $("input[name='usdPrice']").val(usd);
-        $("input[name='usdTaxSum']").val(usdSum);
-    }
+
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
         minView: "month",