Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

YL

2021-12-16 dbef02da8664033c7b3cec90c5d5b9d1716d4d1f

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/WebTM.csproj

@@ -606,6 +606,8 @@
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />

 WebTM/views/IpadStepIndex.html

@@ -736,6 +736,46 @@
            });
        }

        //返工申请单按钮点击事件
        function OpenReturn(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "返工")) {
                layer.alert("单据状态不满足返工条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增返工单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HBillType": HBillType,
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }

        //上料防错单
        function OpenMaterToSource() {
            if (wktag == 0) {
@@ -860,6 +900,9 @@
                case "报检申请":

                    break;
                case "返工":
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')";   //是否有不为开工、停工挂起状态
                    break;
                default:
            }

@@ -981,7 +1024,7 @@
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md3" onclick="">
                            <div class="layui-col-sm12 layui-col-md3" onclick="OpenReturn(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-return imgicon"></span>
                                    <span class="imgtitle">返工申请</span>

 WebTM/views/PublicPage/Gy_Maintain.html

@@ -176,18 +176,25 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
               
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/MaintainList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere1) },
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert("暂无记录", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });

 WebTM/views/PublicPage/PartInformation.html

@@ -177,11 +177,18 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
               
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/PartList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere1) },
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;

 WebTM/views/index.html

@@ -316,10 +316,11 @@
                                </dd>
                                <dd>
                                    <a>开结班管理(工序)</a>
                                    <dl class="layui-nav-child">                                    
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html">开班单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html">停工挂起单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html">结班单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/返工/Sc_MESReturnStepWorkBillList.html">返工单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
@@ -778,6 +779,7 @@
                                        <dd><a lay-href="基础资料/工资基础资料/Gy_Group.html">生产班组列表</a></dd>
                                        <dd><a lay-href="基础资料/生产基础资料/Gy_BadReason.html">不良原因列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_ConkReasonList.html">故障原因列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_StockCheckItemList.html">盘点方案列表</a></dd>
                                    </dl>
                                </dd>
                                <dd>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_MouldType.html

@@ -135,7 +135,14 @@
            //#region å·¥å…·æŒ‰é’®
            //退出按钮
            form.on('submit(Exit)', function () {
                Pub_Close(1);
                if (hID == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            })
            //保存
            form.on('submit(Saver)', function (data) {//保存

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonList.html

@@ -223,7 +223,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].HItemID.toString();
                    var hID = data[0].hitemid;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemEdit.html

New file
@@ -0,0 +1,295 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>新增/编辑盘点方案</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>

                            </div>

                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align:center;"><b>盘点方案</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                        <input type="hidden" class="layui-input" name="user" id="user">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                    <input name="HOrgID" id="HOrgID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">助记码：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">截止日期</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">备注：</label>
                                                <div class="layui-input-inline">
                                                    <div class="layui-input-inline">
                                                        <textarea placeholder="请输入盘点方案备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">使用状态：</label>
                                                <div class="layui-input-block">
                                                    <select name="HUseFlag" lay-filter="aihao" id="HUseFlag">
                                                        <option value="未检测" selected="selected">未检测</option>
                                                        <option value="未检测">未检测</option>
                                                        <option value="已使用">已使用</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label"> ç¦ç”¨æ ‡å¿—:</label>
                                            <div class="layui-input-inline">
                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>

    <script>
        //获取参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
        }

        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
            }
            else if (OperationType == 3) {//编辑
                set_EditFromGrid();
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            laydate.render({
                elem: '#HEndDate'

            });
            //保存
            form.on('submit(Saver)', function (data) {//保存

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
                var user = sessionStorage["HUserName"];
                if (sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == null) {
                    $("#HOrgID").val(0);
                }
                else {
                    $("#HOrgID").val(sessionStorage["OrganizationID"]);
                }
                var sMainStr = JSON.stringify(data.field) + ";" + user;
                if (AllowLoadData()) {
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "Gy_StockCheckItemBill/SaveGy_StockCheckItem", //方法所在页面和方法名
                            async: true,
                            data: { "msg": sMainStr },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    layer.msg(data.Message, { icon: 1 });
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                }
                                else {
                                    f_alert(data.Message);
                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {

                                f_alert("错误:" + err);
                                console.log("Reason" + sMainStr);
                            }
                        });
                }
            });
            //退出
            form.on('submit(Exit)', function (data) {//
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });
            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
                    // if (value != '') {
                    if (!/^\d+$/.test(value)) {
                        return '不能为空或数字或者0';
                    }
                    //}
                }
            });
            //#endregion


            //#region å½“前页面面所有的方法

            //无源单新增
            function set_AddFNew() {
                $("#HItemID").val("0");
                $("#HOrgID").val("0");
                $("#HNumber").val("");
            }
            //编辑
            function set_EditFromGrid() {
                $("#HItemID").val(linterid);
                set_EditForm(linterid);  //编辑获取表头
            }
            //编辑加载表头
            function set_EditForm(linterid) {
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "Gy_StockCheckItemBill/GetStockCheckItemByID",
                    type: "GET",
                    data: {
                        "HID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            $("#HNumber").val(data.HNumber);//代码
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HName").val(data.HName);//名称
                            $("#HHelpCode").val(data.HHelpCode);//助记代码
                            $("#HEndDate").val(formatDate(data.HEndDate));//描述
                            $("#HRemark").val(data.HRemark);//备注
                            $("#HUseFlag").val(data.HUseFlag);//使用状态
                            $("input[name='HStopflag']").attr("checked", data.禁用标记);//true:选中 false:不选中
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //数据验证
            function AllowLoadData() {
                if ($("#HHelpCode").val() == '') {
                    layer.msg("请填写助记码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HNumber").val() == '') {
                    layer.msg("请填写代码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HName").val() == '') {
                    layer.msg("请填写名称", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                else {
                    return true;
                }
            }
            //
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }
            //日期格式化
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
                    day = '' + d.getDate(),
                    year = d.getFullYear();

                if (month.length < 2) month = '0' + month;
                if (day.length < 2) day = '0' + day;

                return [year, month, day].join('-');
            }
            //#endregion
        });

    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemList.html

New file
@@ -0,0 +1,292 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>盘点方案列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">

                    <form class="layui-form" action="" lay-filter="component-form-group">

                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <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" name="HNumber" id="HNumber">
                                    </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" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>

                            </div>
                        </div>

                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            </div>
                        </script>

                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            //查询条件
            var sWhere = "";
            var option = [];
            //#endregion


            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //新增
                    case 'btn-Add': set_AddNew();
                        break;
                    //编辑
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //删除
                    case 'btn-Delete': set_DeleteBill();
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion


            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //初始化表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , limits: [20, 50, 100, 150, 200, 250]
                    , limit: 20
                    , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hitemid', title: 'HItemID', sort: true, hide: true }
                        , { field: '盘点方案代码', title: '盘点方案代码' }
                        , { field: '盘点方案', title: '盘点方案' }
                        , { field: '截止日期', title: '截止时间', templet: "<div>{{d.截止日期 ==null ?'':layui.util.toDateString(d.截止日期, 'yyyy-MM-dd')}}</div>"}
                        , { field: '使用状态', title: '使用状态' }
                        , { field: '禁用标志', title: '禁用标志' }
                        , { field: '使用组织', title: '使用组织' }
                        , { field: '备注', title: '备注' }
                    ]]
                };
            }
            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Gy_StockCheckItemBill/Get_StockCheckItemList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //快速查询
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and ç›˜ç‚¹æ–¹æ¡ˆä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and ç›˜ç‚¹æ–¹æ¡ˆ like '%" + HName + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Gy_StockCheckItemBill/Get_StockCheckItemList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置快速查询
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();
            }
            //新增
            function set_AddNew() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增盘点方案',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../基础资料/Gy_StockCheckItemEdit.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
                    },
                    success: function (layero, index) {

                    }
                });
            }
            //编辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hitemid;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑盘点方案'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_StockCheckItemEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })

                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HItemID = data[0].hitemid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Gy_StockCheckItemBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HItemID": HItemID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                }
            }
            //#endregion

            //以上是layui模块
        });
    </script>
</body>
</html>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldLifeChangeBillList.html

@@ -601,7 +601,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '仓库列表',
                    title: '负责人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
@@ -673,14 +673,13 @@


            form.on('submit(Exit)', function (data) {//
                if (OperationType == 1) {
                    Pub_Close(closeType);//直接新增closeType值为2，列表调新增closeType值从列表传递
                }
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                if (hID == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    Pub_Close(2);
                    //关闭页签
                    Pub_Close(1);
                }
            });


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillList.html

@@ -74,8 +74,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audi"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-faudi"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -544,7 +544,14 @@
            });
            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });
            //预览
            form.on("submit(planview)", function (data) {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html

@@ -512,6 +512,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HName").val(checkStatus.data[0].HName);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckPlanBillList.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
@@ -330,6 +330,7 @@
                        $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HInterID").val(0);
                        $("#HMouldID").val(0);
                    }
                });
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
@@ -70,7 +70,11 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养计划编号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input">
                                                    <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -310,7 +314,7 @@
                });
            });

            //产品模具
            //默认保养
            form.on('submit(HMouldList)', function () {
                //页面层-自定义
                layer.open({
@@ -330,8 +334,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMouldName").val(checkStatus.data[0].HName);
                        $("#HMouldID").val(checkStatus.data[0].HItemID);
                        $("#HMouldName").val(checkStatus.data[0].单据号);
                        $("#HMouldID").val(checkStatus.data[0].hmainid);
                        get_MaintainItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -344,6 +348,42 @@
                    },
                    success: function (layero, index) {

                    }
                });
            });

            //表头信息保养计划源单弹窗
            form.on('submit(HPlanList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '保养计划源单列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../模治具管理/Sc_Add_MouldMaintainPlanBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HPlanName").val(checkStatus.data[0].单据号);
                        $("#HPlanNo").val(checkStatus.data[0].hmainid);
                        get_MaintainItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
@@ -704,8 +744,14 @@

            //退出
            form.on('submit(Exit)', function (data) {//
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });


@@ -861,6 +907,7 @@
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                , "HPlanNo": data.保养计划编号
                                , "HPlanName": data.保养计划
                                , "HPlanInterID": data.保养计划内码
                                , "HMouldID": data.HMouldID
                                , "HMouldName": data.产品模具

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
@@ -197,7 +197,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " };
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": " " };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -355,17 +355,13 @@

            //退出
            form.on('submit(Exit)', function (data) {//
                if (closeType == 0) {
                if (linterid == undefined) {
                    //关闭页签
                    parent.layui.admin.events.closeThisTabs();
                    Pub_Close(2);
                }
                if (closeType == 1) {
                    //关闭弹窗
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                else {
                    //关闭页签
                    parent.layui.admin.events.closeThisTabs();
                    Pub_Close(1);
                }
            });

@@ -420,7 +416,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark" }];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":"" }];
                table.render(option);
            }

@@ -428,7 +424,7 @@
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark"}];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":""}];
                table.render(option);
            }


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainPlanBillList.html

@@ -385,7 +385,7 @@
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert("暂无记录", { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_Add_MESReturnStepWorkBillList.html

@@ -2,9 +2,898 @@
<html>
<head>
    <meta charset="utf-8" />
    <title></title>
    <title>工序返工单</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
        }

        .maintitle {
            background-color: #1492ff;
            color: #fff;
            padding: 5px 10px;
            border: none;
            border-radius: 4px;
        }

        .title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
            font-size: 16px;
            color: #333;
        }

        .buttom_box_little {
            width: 60px;
            height: 36px;
            color: #fff;
            background-color: #1492ff;
            border-radius: 4px;
            border: none;
            margin: 10px;
        }

        .layui-input {
            width: 93%;
        }

        .layui-inline, img {
            display: block;
            vertical-align: middle
        }

        .layui-input, .layui-textarea {
            display: inline-block;
            width: 100%;
            padding-left: 10px;
        }

        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }

        .layui-form-label {
            padding: 9px 5px;
        }

        .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }
    </style>
</head>
<body>
    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>

                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align:center;"><b>工序返工单</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab layui-tab-card">
                                        <ul class="layui-tab-title">
                                            <li class="layui-this">基本信息</li>
                                            <li>制单信息</li>
                                        </ul>
                                        <div class="layui-tab-content" style="height: 700px;">
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">单据号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />

                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">单据日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">任务单号</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                                            <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HICMOBillList" id="HICMOBillList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>-->
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工工序</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HProcID" id="HProcID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" id="HProcList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品代码</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品名称:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off" readonly="readonly">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品规格:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off" readonly="readonly">
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">责任部门:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">所属班组:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">操作员:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工描述:</label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入返工描述" class="layui-textarea" name="HRemark" id="HRemark" style="width:780px"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-tab-item">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">制单日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">修改日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">审核日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废人:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关闭日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">作废日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        //获取参数
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceEntryID = "";  //源单子内码
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
        var refSav = "";   //提交类型


        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSBillType = params[params[2]];//源单类型
        }

        var edit = function (data) {
            HBillType = data[0].HBillType;
            HSourceInterID = data[0].HSourceInterID;
            HSourceEntryID = data[0].HSourceEntryID;
            HSourceBillNo = data[0].HSourceBillNo;
            HSourceBillType = data[0].HSourceBillType;

        }


        layui.config({
            base: '../../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //#endregion

            //初始化表单插件
            set_InitFrom();

            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
            }
            else if (OperationType == 2) {//有源单
                set_AddNew();
            }
            else if (OperationType == 3) {//编辑
                set_EditFromGrid();
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }

            //初始化插件
            function set_InitFrom() {
                //日期时间选择器
                laydate.render({
                    elem: '#HPlanBeginDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HMakeDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HUpDateDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HCheckDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HCloseDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HDeleteDate'
                    , type: 'datetime'
                });
            }

            //无源单新增
            function set_AddFNew() {
                //加源单类型区分(可以写不同的方法)

            }

            //有源单新增
            function set_AddNew() {
                refSav = "Add";
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //返工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                //加源单类型区分(可以写不同的方法)

                $('#HICMOBillNo').attr("disabled", true);
                $('#HICMOInterID').attr("disabled", true);
                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HProcID').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
               

                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkFrom", //方法所在页面和方法名
                        async: true,
                        data: {
                            "HSourceInterID": HSourceInterID,
                            "HSourceEntryID": HSourceEntryID,
                            "HSourceBillNo": HSourceBillNo,
                            "HSourceBillType": HBillType
                        },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                               
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //产品代码
                                $("#HMaterName").val(LoadData[0].HMaterName); //产品名称
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                               
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //任务单主内码ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //任务单子内码ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //任务单号
                                $("#HSourceBillType").val(HSourceBillType); //源单类型

                                $("#HProcID").val(LoadData[0].HProcID); //返工工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //返工工序

                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
                                $("#HDeptName").val(LoadData[0].HDeptName); //车间
                                
                                
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });

                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });
                        }
                    });
            }

            //编辑
            function set_EditFromGrid() {
                refSav = "Update";

                $('#HICMOBillNo').attr("disabled", true);
                $('#HICMOInterID').attr("disabled", true);
                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HProcID').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);

                $.ajax({
                    url: GetWEBURL() + "Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HID": linterid
                    },
                    success: function (result) {

                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_MESReturnWorkBillList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.hmainid
                                , "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOBillNo": data.任务单                        //生产订单

                                , "HProcID": data.HProcID
                                , "HProcName": data.返工工序名称
                                , "HQty": data.返工数量
                                , "HPlanBeginDate": formatDate(data.返工时间)

                                , "HMaterID": data.HMaterID
                                , "HMaterCode": data.产品代码
                                , "HMaterName": data.产品名称
                                , "HMaterSpec": data.规格型号

                                , "HGroupID": data.HGroupID                //班组ID
                                , "HGroupName": data.班组名称              //班组名称
                                , "HDeptID": data.HDeptID                  //部门ID
                                , "HDeptName": data.部门名称               //部门名称

                                , "HWorkerID": data.HWorkerID                   //操作员ID
                                , "HWorkerName": data.操作员           //操作员

                                , "HRemark": data.备注                    //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
                                , "HUpDater": sessionStorage["HUserName"]             //修改人
                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//修改日期
                                , "HChecker": data.审核人             //审核人
                                , "HCheckDate": data.审核日期   //审核日期
                                , "HCloseMan": data.关闭人                //关闭人
                                , "HCloseDate": data.关闭日期             //关闭日期
                                , "HDeleteMan": data.作废人               //作废人
                                , "HDeleteDate": data.作废日期       //作废日期

                            });

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }


            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3718' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID
            }

            

            //保存提交
            form.on('submit(Saver)', function (data) {

                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //方法所在页面和方法名
                    async: false,
                    data: { "msg": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            });

            //审核按钮提交
            form.on('submit(VerIfySaver)', function (data) {
                SaveVerify();
            });

            //审核提交
            function SaveVerify() {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/AuditReturnStepProcessReportList", //方法所在页面和方法名
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }


            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });


            //表头信息产品弹窗
            form.on('submit(HMaterList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '产品列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //返工工序
            form.on('submit(HProcList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HSourceName").val(checkStatus.data[0].HName);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //操作员
            form.on('submit(HWorkerList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '人员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HWorkerName").val(checkStatus.data[0].HName);
                        $("#HWorkerID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //源单单号 XDHList

            //表头信息班组弹窗
            form.on('submit(HGroupList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '班组列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HGroupName").val(checkStatus.data[0].HName);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //表头信息车间弹窗
            form.on('submit(HDeptList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '班组列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/DeptInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });


            //以上为layui模块
        });

        function AllowLoadData() {  //非空验证
            var Result = true;
            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
                layer.msg("单据号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HDate").val() == '' || $("#HDate").val() == null) {
                layer.msg("单据日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HPlanBeginDate").val() == '' || $("#HPlanBeginDate").val() == null) {
                layer.msg("返工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HWorkerID").val() == '' || $("#HWorkerID").val() == null) {
                layer.msg("操作员不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                layer.msg("班组不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                layer.msg("部门不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;
        }

        function formatDate(date) {
            var d = new Date(date),
                month = '' + (d.getMonth() + 1),
                day = '' + d.getDate(),
                year = d.getFullYear();

            if (month.length < 2) month = '0' + month;
            if (day.length < 2) day = '0' + day;

            return [year, month, day].join('-');
        }
    </script>
</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_MESReturnStepWorkBillList.html

@@ -64,7 +64,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -209,7 +209,6 @@

            }


            //初始化表格
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -286,7 +285,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../返工/Sc_Add_MESReturnStepWorkBill.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../返工/Sc_Add_MESReturnStepWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -319,7 +318,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../返工/Sc_Add_MESReturnStepWorkBill.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
                        , content: '../返工/Sc_Add_MESReturnStepWorkBillList.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
                        ,resize: false,
                        end: function () {
                            //刷新页面,
@@ -428,7 +427,7 @@
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/FAuditReturnStepProcessReportList", //方法所在页面和方法名
                        url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/AuditReturnStepProcessReportList", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {

 WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html

@@ -166,6 +166,7 @@
    <script src="../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/PubCustom.js"></script>
    <script>
        //获取参数
        function getUrlVars() {
@@ -684,8 +685,14 @@


            form.on('submit(Exit)', function (data) {//
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
                if (hID == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });



 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillEdit.html

@@ -79,9 +79,13 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">点检计划编号</label>
                                                <label class="layui-form-label">点检计划编号<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input">
                                                    <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -274,13 +278,52 @@
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                }
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                            else {
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                table.render(option);
                                layer.alert("该设备暂无默认点检记录", { icon: 5 });
                            }
                        }
                    }
                })
            }

            //表头信息点检计划源单弹窗
            form.on('submit(HPlanList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '点检计划源单列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../设备管理/Sb_EquipDotCheckPlanBillEdit.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HPlanName").val(checkStatus.data[0].单据号);
                        $("#HPlanNo").val(checkStatus.data[0].hmainid);
                        get_MaintainItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });

            // æäº¤ä¿å­˜
            form.on('submit(set_SaveBill)', function (data) {//保存
@@ -567,6 +610,7 @@
                                , "HBeginDate": data.开始日期             // å¼€å§‹æ—¥æœŸ
                                , "HEndDate": data.结束日期               // ç»“束日期
                                , "HPlanNo": data.点检计划编号            //点检计划编号
                                , "HPlanName": data.点检计划            //点检计划编号
                                , "HRemark": data.表头备注                //备注
                            });


 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillEdit.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
@@ -77,7 +77,11 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养计划编号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input">
                                                    <input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -354,6 +358,43 @@
                })
            }

            //表头信息保养计划源单弹窗
            form.on('submit(HPlanList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '保养计划源单列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../设备管理/Sb_EquipMaintainPlanBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HPlanName").val(checkStatus.data[0].单据号);
                        $("#HPlanNo").val(checkStatus.data[0].hmainid);
                        get_MaintainItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });


            //新增
            form.on('submit(set_AddNew)', function (data) {
                $("#component-form-group")[0].reset();
@@ -583,6 +624,7 @@
                                , "HExplanation": data.摘要               //摘要
                                , "HBeginDate": data.开始日期                //
                                , "HEndDate": data.结束日期                //
                                , "HPlanName": data.保养计划  
                                , "HPlanNo": data.保养计划编号                //
                                , "HRemark": data.表头备注                //备注


 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainPlanBillEdit.html

@@ -20,7 +20,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html

@@ -503,6 +503,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HName").val(checkStatus.data[0].HName);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -914,6 +915,8 @@
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                        parent.layer.close(index); //再执行关闭
                                    }
                                    else {
                                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipMaintainRuleEdit.html

@@ -19,7 +19,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form id="component-form-group" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>

 WebTM/views/²É¹º¹ÜÀí/ίÍⶩµ¥/WW_EntrustOrderBillList.html

@@ -256,69 +256,69 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                    ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                    , { field: '日期', title: '日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '单据号', title: '单据号', width: 150 }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码，物料名称，规格型号，批号，数量，单位，源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '供应商代码', title: '供应商代码', width: 120}
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120 }
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
                    , { field: '业务员', title: '业务员', width: 100 }
                    , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
                    , { field: '优先级', title: '优先级', width: 100 }
                    , { field: '交货地点', title: '交货地点', width: 100}
                    , { field: '交货地点', title: '交货地点', width: 100 }
                    , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
                    , { field: '采购方式代码', title: '采购方式代码', width: 120}
                    , { field: '采购方式', title: '采购方式', width: 100}
                    , { field: '采购方式代码', title: '采购方式代码', width: 120 }
                    , { field: '采购方式', title: '采购方式', width: 100 }
                    , { field: 'HSSID', title: 'HSSID', hide: true }
                    , { field: '结算方式代码', title: '结算方式代码', width: 120}
                    , { field: '结算方式', title: '结算方式', width: 100}
                    , { field: '结算方式代码', title: '结算方式代码', width: 120 }
                    , { field: '结算方式', title: '结算方式', width: 100 }
                    , { field: '结算日期', title: '结算日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.结算日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'HCurID', title: 'HCurID', hide: true }
                    , { field: '币别代码', title: '币别代码', width: 100}
                    , { field: '币别', title: '币别', width: 100}
                    , { field: '汇率', title: '汇率', width: 100}
                    , { field: '币别代码', title: '币别代码', width: 100 }
                    , { field: '币别', title: '币别', width: 100 }
                    , { field: '汇率', title: '汇率', width: 100 }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: '部门代码', title: '部门代码', width: 100}
                    , { field: '部门', title: '部门', width: 100}
                    , { field: '部门代码', title: '部门代码', width: 100 }
                    , { field: '部门', title: '部门', width: 100 }
                    , { field: 'HManagerID', title: 'HManagerID', hide: true }
                    , { field: '主管代码', title: '主管代码', width: 100}
                    , { field: '主管', title: '主管', width: 100}
                    , { field: '主管代码', title: '主管代码', width: 100 }
                    , { field: '主管', title: '主管', width: 100 }
                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
                    , { field: '摘要', title: '摘要', width: 100}
                    , { field: '表头备注', title: '表头备注', width: 100}
                    , { field: '摘要', title: '摘要', width: 100 }
                    , { field: '表头备注', title: '表头备注', width: 100 }
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: '物料代码', title: '物料代码', width: 100}
                    , { field: '物料名称', title: '物料名称', width: 100}
                    , { field: '规格型号', title: '规格型号', width: 100}
                    , { field: '批号', title: '批号', width: 100}
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120}
                    , { field: '计量单位', title: '计量单位', width: 100}
                    , { field: '数量', title: '数量', width: 100}
                    , { field: '单价', title: '单价', width: 100}
                    , { field: '金额', title: '金额', width: 100}
                    , { field: '税率', title: '税率', width: 100}
                    , { field: '税额', title: '税额', width: 100}
                    , { field: '价税合计', title: '价税合计', width: 100}
                    , { field: '单价', title: '单价', width: 100 }
                    , { field: '金额', title: '金额', width: 100 }
                    , { field: '税率', title: '税率', width: 100 }
                    , { field: '税额', title: '税额', width: 100 }
                    , { field: '价税合计', title: '价税合计', width: 100 }
                    , { field: '交货日期', title: '交货日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.交货日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '源单单号', title: '源单单号', width: 100}
                    , { field: '计划跟踪号', title: '计划跟踪号', width: 100}
                    , { field: '表体备注', title: '表体备注', width: 100}
                    , { field: '制单人', title: '制单人', width: 100}
                    , { field: '计划跟踪号', title: '计划跟踪号', width: 100 }
                    , { field: '表体备注', title: '表体备注', width: 100 }
                    , { field: '制单人', title: '制单人', width: 100 }
                    , { field: '制单日期', title: '制单日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '审核人', title: '审核人', width: 100}
                    , { field: '审核人', title: '审核人', width: 100 }
                    , { field: '审核日期', title: '审核日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '修改人', title: '修改人', width: 100}
                    , { field: '修改人', title: '修改人', width: 100 }
                    , { field: '修改日期', title: '修改日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '关闭人', title: '关闭人', width: 100}
                    , { field: '关闭人', title: '关闭人', width: 100 }
                    , { field: '关闭日期', title: '关闭日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '作废人', title: '作废人', width: 100}
                    , { field: '作废人', title: '作废人', width: 100 }
                    , { field: '作废日期', title: '作废日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>" }

                ];

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -255,8 +255,17 @@
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }/*物料代码，物料名称，规格型号，批号，数量，单位，源单单号*/
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120}
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
@@ -286,21 +295,12 @@
                    , { field: '表头备注', title: '表头备注', width: 100}
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: '物料代码', title: '物料代码', width: 100}
                    , { field: '物料名称', title: '物料名称', width: 100}
                    , { field: '规格型号', title: '规格型号', width: 100}
                    , { field: '批号', title: '批号', width: 100}
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120}
                    , { field: '计量单位', title: '计量单位', width: 100}
                    , { field: '数量', title: '数量', width: 100}
                    , { field: '单价', title: '单价', width: 100}
                    , { field: '金额', title: '金额', width: 100}
                    , { field: '税率', title: '税率', width: 100}
                    , { field: '税额', title: '税额', width: 100}
                    , { field: '价税合计', title: '价税合计', width: 100}
                    , { field: '交货日期', title: '交货日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.交货日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '源单单号', title: '源单单号', width: 100}
                    , { field: '计划跟踪号', title: '计划跟踪号', width: 100}
                    , { field: '表体备注', title: '表体备注', width: 100}
                    , { field: '制单人', title: '制单人', width: 100}