duhe
2023-09-20 edec40b7b28a0a62a9d5aa72b33eeef0672d6026
产线返修平台:界面调整
产线返修平台:加载表头报错提醒修改
2个文件已修改
145 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/产线返修平台/Sc_SourceLineRepairBill.html 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3822,7 +3822,7 @@
      <publishTime>08/22/2023 10:58:17</publishTime>
    </File>
    <File Include="views/计划管理/产线返修平台/Sc_SourceLineRepairBill.html">
      <publishTime>09/06/2023 13:37:43</publishTime>
      <publishTime>09/20/2023 17:24:12</publishTime>
    </File>
    <File Include="views/计划管理/产线返修平台/Sc_SourceLineRepairBill_ChangeMater.html">
      <publishTime>08/24/2023 08:50:29</publishTime>
WebTM/views/¼Æ»®¹ÜÀí/²úÏß·µÐÞÆ½Ì¨/Sc_SourceLineRepairBill.html
@@ -57,16 +57,18 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">新增</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                    <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">采集信息</li>
                            <li lay-id="2" style="padding:1px;">当前工单</li>
                            <li lay-id="2" style="padding:1px;">不良率占比分析</li>
                            <li lay-id="2" style="padding:1px;">子表信息</li>
                        </ul>
                        <div class="layui-tab-content">
                        <div class="layui-tab-content">-->
                            <!--采集信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                    <!--<div class="layui-tab-item layui-show">
                        <div class="layui-form-item" style="padding-top: 10px;">-->
                    <div style="width: 750px;height:350px; border: 1px solid #000; display:inline-block;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">条形码</label>
@@ -94,6 +96,8 @@
                                                </button>
                                            </div>
                                        </div>
                        </div>
                        <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">不良原因</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -104,8 +108,6 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">不良类型</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -116,6 +118,8 @@
                                                </button>
                                            </div>
                                        </div>
                        </div>
                        <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">不良后果</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -124,6 +128,37 @@
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                </div>
                            </div>
                            <div class="layui-inline" style="width:300px;">
                                <label class="layui-form-label" style="width: 85px;">维修结果</label>
                                <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
                                    <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
                                        <option style="color:blue;" selected="selected" value="OK">OK</option>
                                        <option style="color:blue;" value="NG">NG</option>
                                    </select>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">产品MAC</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" lay-verify="HProdMac" name="HProdMac" id="HProdMac" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">产品SN</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">备注</label>
                                <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                    <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="display:none;">
@@ -143,37 +178,6 @@
                                            <label class="layui-form-label" style="width: 85px;">数量</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HQty" name="HQty" id="HQty" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline" style="width:300px;">
                                            <label class="layui-form-label" style="width: 85px;">维修结果</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
                                                <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
                                                    <option style="color:blue;" selected="selected" value="OK">OK</option>
                                                    <option style="color:blue;" value="NG">NG</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">产品MAC</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HProdMac" name="HProdMac" id="HProdMac" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">产品SN</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -207,10 +211,12 @@
                                        </div>
                                    </div>
                                </div>
                            </div>
                    <!--</div>
                    </div>-->
                            <!--当前工单-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                    <!--<div class="layui-tab-item">
                        <div class="layui-form-item">-->
                    <div style="width: 820px; height: 350px; border: 1px solid #000; display: inline-block; ">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产订单</label>
@@ -226,12 +232,7 @@
                                                <input type="text" class="layui-input" lay-verify="HSplitNO" name="HSplitNO" id="HSplitNO" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -247,14 +248,15 @@
                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                        </div>
                        <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">计量单位</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -262,6 +264,8 @@
                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
                                            </div>
                                        </div>
                        </div>
                        <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产资源</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -270,10 +274,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">维修部门</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                <label class="layui-form-label" style="width: 85px;">日期</label>
                                <div class="layui-input-block" style="margin-left: 120px; width:180px;">
                                    <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                    </div>
@@ -305,6 +308,15 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">维修部门</label>
                                <div class="layui-input-block" style="margin-left: 120px;width:501px;">
                                    <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;"></label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeBill" id="ChangeBill"> æ¢&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单 </button>
@@ -314,17 +326,22 @@
                                        </div>
                                    </div>
                                </div>
                            </div>
                    <!--</div>
                    </div>-->
                            <!--不良率占比分析-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                    <!--<div class="layui-tab-item">
                        <div class="layui-form-item">-->
                    <div style="width: 750px; height: 350px; display: inline-block; ">
                                    <div class="layui-row">
                                        <div id="HBadReasonECharts" style="width: 600px;height:250px;"></div>
                            <div id="HBadReasonECharts" style="width: 600px;height:350px;"></div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <!--</div>
                    </div>-->
                    <!--子表信息-->
                    <!--<div class="layui-tab-item">
                        <div class="layui-form-item">-->
                    <div style="width: 820px; height: 350px; border: 1px solid #000; display: inline-block; ">
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
@@ -333,6 +350,11 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                        </div>
                    </script>
                    </div>
                    <!--</div>
                    </div>-->
                    <!--</div>
                    </div>-->
                </form>
            </div>
        </div>
@@ -722,7 +744,8 @@
                                
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            //layer.alert(result.code + result.Message, { icon: 5 });
                            layer.msg(result.Message);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });