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

YL

2021-10-13 f2ae5ee1d4b453826c201e38f175e55729701638

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

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

@@ -156,7 +156,7 @@
                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;

                if (HType == "Modify") {

                    //修改
                    $.ajax(
                        {
                            type: "POST",
@@ -187,12 +187,13 @@
                        });
                }
                else {
                    //新增
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/Gy_ModelType/AddBill", //方法所在页面和方法名
                            async: true,
                            data: { "oMain": oMain },
                            data: { "oMain": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(ÆäËû)/Pay_OtherBalBill.html

@@ -63,7 +63,7 @@
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input id="HInterID" name="HInterID" type="hidden" />
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                            </div>
                                        </div>
@@ -139,9 +139,19 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工资类型</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
                                                <input type="text" name="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工资类型</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
                                            </div>
                                        </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">摘要</label>
                                            <div class="layui-input-inline">
@@ -240,6 +250,7 @@
            </div>
        </div>
    </div>

    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
@@ -249,6 +260,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
    <script>

        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -278,6 +290,9 @@
                elem: '#HDate'

            });



            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
@@ -296,8 +311,8 @@
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: '物料代码', edit: 'text', event: 'HMaterCheck', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 190 }
                    //, { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true }
                    , { field: 'HProcNumber', title: '工序代码', edit: 'text', event: "HProcCheck", width: 100 }
                    , { field: 'HProcName', title: '工序名称', edit: 'text', width: 100 }
@@ -320,9 +335,17 @@
            };
            //判断是否新增
            if (OperationType == 1) {
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HChecker").val(sessionStorage["HUserName"]);
                $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HCloseMan").val(sessionStorage["HUserName"]);
                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "","HProcNumber": "", "HProcName": ""
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
                    , "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0
                    , "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0, "HRemark": ""
                }];
@@ -332,7 +355,7 @@
                $("#HInterID").val(hID);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + '/Pay_OtherBalBill/Pay_OtherBalBillListProjectDetai',
                    url: GetWEBURL() + 'Pay_OtherBalBill/Pay_OtherBalBillListProjectDetai',
                    type: "GET",
                    data: { "sqlWhere": "and hmainid=" + hID },
                    success: function (result) {
@@ -435,13 +458,13 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterCode: checkStatus.data[0].物料代码,
                                        HMaterName: checkStatus.data[0].物料,
                                        HMaterCode: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,

                                        //HDesignLife: 0,  //设计寿命
                                        //HLeaveLife: 0,   //剩余寿命
                                        //HQty: 1,         //实收数量
                                        //HMoney: 0,       //金额
                                        HDesignLife: 0,  //设计寿命
                                        HLeaveLife: 0,   //剩余寿命
                                        HQty: 1,         //实收数量
                                        HMoney: 0,       //金额
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -637,7 +660,7 @@
                //alert(hID);
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail",
                    url: GetWEBURL() + "/Pay_OtherBalBill/Pay_OtherBalBillListCheckDetail",
                    type: "GET",
                    data: {
                        "HID": hID
@@ -657,6 +680,8 @@
                                , "HEmpName": data.职员         //主管名称
                                , "HDeptID": data.HDeptID                 //部门ID
                                , "HDeptName": data.部门                //部门名称
                                , "HPayID": data.HPayID
                                , "HPayTypeName": data.工资类型
                                , "HSourceBillType": ""                   //源单类型
                                , "Box2": ""                               //选单号
                                , "HExplanation": data.摘要              //摘要
@@ -798,8 +823,45 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].部门);
                        $("#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) {

                    }
                });
            });
            //表头信息工资类型弹窗
            form.on('submit(PayType)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工资类型列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/工资管理/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('请选择数据');
                        }
                        $("#HPayTypeName").val(checkStatus.data[0].工资类型);
                        $("#HPayID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -827,6 +889,17 @@
                }
            });






            //form.on('submit(Cancel)', function () {
            //    //sessionStorage["SourceFlag"] = false;
            //    parent.location.href = "../../../views/index.html"
            //    //window.close();//关闭当前页
            //})

            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
@@ -848,21 +921,13 @@
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Pay_SingleBalBill/AddBill",
                    //url:"http://localhost:12761/Gy_RoutingBill/AddBill",
                    url: GetWEBURL() + "/Pay_OtherBalBill/AddBill",
                    async: true,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面，浏览器有效，PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增

                            layer.close(index);
                            layer.msg("提交成功");
                        }

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

@@ -890,11 +890,9 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
                }
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(
                    {
                        type: "POST",

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

@@ -528,7 +528,7 @@
            });


            function RoadBillMain(linterid)//加载表头
            function RoadBillMain(hID)//加载表头
            {
                //alert(linterid);
                //查询检验方案单是否存在
@@ -824,12 +824,13 @@
                return [year, month, day].join('-');
            }

            form.on('submit(Saver)', function (data) {//保存
            //保存
            form.on('submit(Saver)', function (data) {
                //debugger;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -833,7 +833,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldMoveStockStepInBill/GetMouldMoveStockStepInBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -304,7 +304,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldMoveStockStepInBill/DeltetMouldMoveStockStepInBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -829,7 +829,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -225,7 +225,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -305,7 +305,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldMoveStockStepOutBill/DeltetMouldMoveStockStepOutBil", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -810,7 +810,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -216,7 +216,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -296,7 +296,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldOtherOutBill/DeltetMouldOtherOutBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -163,6 +163,10 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        //, { field: '内部单据号', title: '内部单据号', width: 115 }
@@ -213,11 +217,12 @@
            //进入页面显示的缓存列表
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                var ModRightNameSelect = "Sc_MouldProdBackBillList";
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MouldProdBackBill/GetMouldProdBackBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "ModRightNameSelect": ModRightNameSelect },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -297,7 +302,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldProdBackBill/DeltetMouldProdBackBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID,"user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -471,7 +471,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {
@@ -508,15 +508,7 @@
            });
            //退出
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
                    Pub_Close(closeType);//直接新增closeType值为2，列表调新增closeType值从列表传递
                }
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
                Pub_Close(1);
            });



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

@@ -203,6 +203,10 @@
                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                    , { field: '部门代码', title: '部门代码', width: 200 }
                    , { field: '部门', title: '部门名称', width: 200 }
                    , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true  }
                    , { field: '往来类型名称', title: '往来类型', width: 200 }
                    , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                    , { field: '往来单位', title: '往来单位', width: 200 }
                    , { field: '摘要', title: '摘要', width: 200 }
                    , { field: '表头备注', title: '表头备注', width: 200 }
                    , { field: '内部单据号', title: '内部单据号', width: 200 }
@@ -266,7 +270,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldProdInBill/Get_MouldProdInBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
@@ -343,7 +347,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldProdInBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -807,7 +807,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -216,7 +216,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldProdMoveBill/GetMouldProdMoveBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -296,7 +296,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -883,7 +883,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {

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

@@ -164,6 +164,10 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }
@@ -213,10 +217,11 @@
            //进入页面显示的缓存列表
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                var ModRightNameSelect = "Sc_MouldProdOutBillList";
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "ModRightNameSelect": ModRightNameSelect},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -296,7 +301,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -599,7 +599,7 @@
                //debugger;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr +  ';' + refSav;
                var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                //if (!AllowLoadData(sMainStr))//数据验证
                //{

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

@@ -220,7 +220,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldRepairChangeBill/Get_MouldRepairChangeBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -323,7 +323,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_MouldRepairChangeBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -617,7 +617,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {

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

@@ -250,7 +250,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -385,8 +385,8 @@
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            url: GetWEBURL() + "Sc_MouldRepairInBill/DeltetMouldRepairInBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -618,7 +618,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {

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

@@ -244,7 +244,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldRepairOutBill/Get_MouldRepairOutBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -380,7 +380,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_MouldRepairOutBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -447,7 +447,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {

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

@@ -284,7 +284,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldScrapInBill/get_Display',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
@@ -394,7 +394,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_MouldScrapInBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -515,7 +515,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];

                $.ajax(
                    {

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

@@ -278,7 +278,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -421,7 +421,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -883,6 +883,9 @@
            function set_btnSave(data) {
               
                $("#HMaker").val(sessionStorage["HUserName"]);
                var user = sessionStorage["HUserName"];
                var ModRightNameAdd = 'Gy_MouldFile_Edit';

                if (!AllowLoadData())//数据验证
                {
                    return false;
@@ -890,11 +893,13 @@
                if (Stverf == "Add") {
                    data.field.HMaker = sessionStorage["HUserName"];//制单人
                    var sMainStr = JSON.stringify(data.field);
                    var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
                    //新增
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill",
                        async: true,
                        data: { "oMain": sMainStr },
                        data: { "oMain": oMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
@@ -919,13 +924,16 @@
                    });
                }
                else {

                    //修改
                    data.field.HUpDater = sessionStorage["HUserName"];//修改人
                    var sMainStr = JSON.stringify(data.field);
                    var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
                        async: true,
                        data: { "oMain": sMainStr },
                        data: { "oMain": oMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {

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

@@ -812,7 +812,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];


                $.ajax(

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

@@ -216,7 +216,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldOtherInBill/GetMouldOtherInBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: {"sWhere": sWhere, "user":sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -296,7 +296,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldOtherInBill/DeltetMouldOtherInBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {