1

duhe

2023-12-15 1a3ef899e4758365f5ae6a725b13c35db2ce5afb

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>F:\GIT仓库\ZYMESWEBUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)

 WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_QiaoYi_PDA.html

@@ -240,7 +240,7 @@
                            <button type="button" lay-submit="" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">新增</button>
                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">提交</button>
                            <!--<button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">编辑</button>-->
                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">删除</button>
                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">清空</button>
                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                    </div>
@@ -913,7 +913,7 @@
                                                parent.location.href = "../../WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
                                            }
                                        }//关闭
                                    }
@@ -968,13 +968,13 @@

            //#endregion

            //#region åˆ é™¤
            //#region æ¸…空

            form.on('submit(cmdDelete)', function () {
                var checkStatus = table.checkStatus('wl-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length == 1) {
                    layer.confirm("确认要删除选中行所有扫码记录？删除后将不可恢复！", { title: "删除确认" }, function (index) {
                    layer.confirm("确认要清空选中行所有扫码记录？清空后将不可恢复！", { title: "清空确认" }, function (index) {
                        var sMaterID = data[0].HMaterID
                        var sAuxPropID = data[0].HAuxPropID
                        var sMTONo = data[0].HMTONo
@@ -1009,7 +1009,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行记录，进行删除！');
                    layer.msg('请选择一行记录，进行清空！');
                }
            });


 WebTM/views/index.html

@@ -12,7 +12,13 @@
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>

    <script language="JavaScript">
    //屏蔽后退按钮
        history.pushState(null, null, document.URL);
        window.addEventListener('popstate', function () {
            history.pushState(null, null, document.URL);
        });
    </script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost ä¸‹å†è®¿é—®');
    </script>

 WebTM/views/indexMenu.html

@@ -11,7 +11,12 @@
    <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>

    <script language="JavaScript">//屏蔽后退按钮
        history.pushState(null, null, document.URL);
        window.addEventListener('popstate', function () {
            history.pushState(null, null, document.URL);
        });
    </script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost ä¸‹å†è®¿é—®');
    </script>
@@ -201,14 +206,14 @@
            //显示侧边菜单
            function set_sideMenuDisPlay() {
                //判断用户是移动端还是PC端
                var judgeMorPCflag = judgeMorPC();
                if (!judgeMorPCflag) {//移动端
                    var dd = '<dd><a href="车间管理/工序流转/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序流转/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
                    $("#append").prepend(dd);
                }
                if (!judgeMorPCflag) {//移动端
                    window.location.href = 'index_Mobile.html'
                }
                //var judgeMorPCflag = judgeMorPC();
                //if (!judgeMorPCflag) {//移动端
                //    var dd = '<dd><a href="车间管理/工序流转/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序流转/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
                //    $("#append").prepend(dd);
                //}
                //if (!judgeMorPCflag) {//移动端
                //    window.location.href = 'index_Mobile.html'
                //}

                var ajaxLoad = layer.load();
                //获取菜单列表数据

 WebTM/views/index_Mobile.html

@@ -821,14 +821,14 @@
          if (sessionStorage.login != "login") {
              layer.confirm("登录失效，请重新登录！", {
                  icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
              }, function () { window.location.href = "user/login.html"; });
              }, function () { window.location.href = "user/login_pda.html"; });
          }

          //判断用户是移动端还是PC端
          var judgeMorPCflag = judgeMorPC();
          if (judgeMorPCflag) {//PC端
              window.location.href = 'index.html'
          }
          ////判断用户是移动端还是PC端
          //var judgeMorPCflag = judgeMorPC();
          //if (judgeMorPCflag) {//PC端
          //    window.location.href = 'index.html'
          //}

      });


 WebTM/views/index_QiaoYi.html

@@ -12,7 +12,13 @@
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>

    <script language="JavaScript">
    //屏蔽后退按钮
        history.pushState(null, null, document.URL);
        window.addEventListener('popstate', function () {
            history.pushState(null, null, document.URL);
        });
    </script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost ä¸‹å†è®¿é—®');
    </script>

 WebTM/views/index_pb.html

@@ -12,7 +12,13 @@
    <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>

    <script language="JavaScript">
    //屏蔽后退按钮
        history.pushState(null, null, document.URL);
        window.addEventListener('popstate', function () {
            history.pushState(null, null, document.URL);
        });
    </script>
    <script>
        /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost ä¸‹å†è®¿é—®');
    </script>
@@ -1144,7 +1150,7 @@
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "user/login.html"; });
                }, function () { window.location.href = "user/login_pb.html"; });
            }           

            $("#LAY_app_flexible").click();

 WebTM/views/user/login2.html

@@ -246,11 +246,11 @@
                            sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
                            sessionStorage["HManagerName"] = result.data[0].HSecManager;
                            //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
                            if (!judgeMorPCflag) {//移动端
                                window.location.href = '../../views/index_Mobile.html'
                            } else {//PC端
                            //if (!judgeMorPCflag) {//移动端
                            //    window.location.href = '../../views/index_Mobile.html'
                            //} else {//PC端
                                window.location.href = '../../views/indexMenu.html'
                            }
                            //}
                            get_WriteConfigFile();
                        }
                        else {

 WebTM/views/¹¤×ʹÜÀí/¶¨¶îÉêÇë/Pay_ProcPriceRequestBillList.html

@@ -472,6 +472,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -482,7 +483,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʵ¥/Pay_PayMentBillList.html

@@ -471,6 +471,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -481,7 +482,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -470,6 +470,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -480,7 +481,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo+" åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

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

@@ -172,15 +172,15 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核人</label>
                                            <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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -192,29 +192,63 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckerDate" id="HCheckerDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBacker" id="HBacker" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBackerDate" id="HBackerDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">退回原因</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -314,12 +348,6 @@
            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"]);
                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HUpDater").val(sessionStorage["HUserName"]);
                $("#HCloseDate").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 = [{
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
@@ -649,13 +677,15 @@
                                , "HExplanation": data.摘要              //摘要
                                , "HRemark": data.表头备注                    //备注
                                , "HMaker": data.制单人
                                , "HUpdater": data.修改人
                                , "HChecker": data.审核人
                                , "HCloseMan": data.关闭人
                                , "HMakeDate": data.制单日期
                                , "HCheckDate": data.审核日期
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                , "HDeleteMan": data.作废人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(data.制单日期, "yyyy-MM-dd hh:mm:ss")
                                , "HUpdaterDate": data.修改日期 == null ? "" : Format(data.修改日期, "yyyy-MM-dd hh:mm:ss")
                                , "HCheckerDate": data.审核日期 == null ? "" : Format(data.审核日期, "yyyy-MM-dd hh:mm:ss")
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(data.关闭日期, "yyyy-MM-dd hh:mm:ss")
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(data.作废日期, "yyyy-MM-dd hh:mm:ss")
                            });

                        } else {

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

@@ -328,6 +328,7 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            var HBillNo = data[0].单据号.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
@@ -336,7 +337,7 @@
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -468,6 +468,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var HBillNo = data[0].单据号.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -478,7 +479,7 @@
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -191,26 +191,11 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">制单日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">

                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">审核日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -224,7 +209,20 @@
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">作废人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">修改日期</label>
@@ -353,14 +351,6 @@
                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"]);
                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HUpDater").val(sessionStorage["HUserName"]);
                    $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
                    $("#HDeleteMan").val(sessionStorage["HUserName"]);
                    $("#HCloseMan").val(sessionStorage["HUserName"]);
                    //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                    option.data = [{
                        "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
@@ -764,11 +754,13 @@
                                    , "HMaker": data.制单人
                                    , "HChecker": data.审核人
                                    , "HCloseMan": data.关闭人
                                    , "HMakeDate": data.制单日期
                                    , "HCheckDate": data.审核日期
                                    , "HCloseDate": data.关闭日期
                                    , "HUpDateDate": data.修改日期
                                    , "HDeleteDate": data.作废日期
                                    , "HUpDater": data.修改人
                                    , "HDeleteMan": data.作废人
                                    , "HMakeDate": data.制单日期 == null ? "" : Format(data.制单日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HCheckDate": data.审核日期 == null ? "" : Format(data.审核日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HCloseDate": data.关闭日期 == null ? "" : Format(data.关闭日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HUpDateDate": data.修改日期 == null ? "" : Format(data.修改日期, "yyyy-MM-dd hh:mm:ss")
                                    , "HDeleteDate": data.作废日期 == null ? "" : Format(data.作废日期, "yyyy-MM-dd hh:mm:ss")
                                });

                            } else {

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillList.html

@@ -276,6 +276,7 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            var HBillNo = data[0].单据号.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
@@ -284,7 +285,7 @@
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            layer.msg("单据号：" + HBillNo + " åˆ é™¤æˆåŠŸï¼", { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -228,10 +228,10 @@
                };
            }

            //报工平台进入(有源单)
            //报工平台进入(有源单) åªèƒ½çœ‹åˆ°å½“前生产资源上开工了的生产订单的产量汇报单
            function set_AddNew()
            {
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                sWhere = " where HSourceID='" + HSourceID + "' and HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表
@@ -395,19 +395,19 @@
                    var Source = $("#Source").val();  //资源
                    sWhere += SchWhere;
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                        sWhere += " and CONVERT(varchar(100),HDate, 23) >= '" + HDate + "'";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) <= '" + HDate1 + "'";
                        sWhere += " and CONVERT(varchar(100),HDate, 23) <= '" + HDate1 + "'";
                    }
                    if (HBillNo) {
                        sWhere += " and a.HBillNo like '%" + HBillNo + "%'";
                        sWhere += " and HBillNo like '%" + HBillNo + "%'";
                    }
                    if (Part) {
                        sWhere += " and concat(m.HNumber,m.HName,m.HModel) like '%" + Part + "%'";
                        sWhere += " and concat(HNumber,HName,HModel) like '%" + Part + "%'";
                    }
                    if (Source) {
                        sWhere += " and s.HName like '%" + Dept + "%'";
                        sWhere += " and HName like '%" + Dept + "%'";
                    }
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -282,10 +282,7 @@
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , limits: [50, 500, 5000, 20000]                   
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
@@ -393,6 +390,21 @@
                        //, { field: 'HReportType', title: '汇报类型', width: 200 , sort: true}
                        , { field: 'HRelationInterID', title: '是否报检申请', width: 200, hide: true, sort: true }
                    ]]
                    , done: function (res, curr, count) {
                        soulTable.render(this);

                        $.each(res.data, function (index, item) {
                            //判断产量汇报临时数据是否已有关联，有则添加背景色标记
                            if (item.HRelationInterID != 0) {
                                //// æ–¹æ³•1（没看到有效果，没有进行调试）
                                //$("#table-id").next().find('tbody tr[data-index="' + index +
                                //    '"]').css("background-color", "#EA08C1");
                                // æ–¹æ³•2（可用）
                                 var i = index + 1;
                                $('tr').eq(i).css("background-color", "#FAAAED");
                            }
                        });
                    }
                };
            }


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -343,8 +343,10 @@
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0","HICMOEntryID":"0","HRemark": ""
                };

                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -428,7 +430,8 @@
                    , btn1: function (index, layero) {
                        option.data = [{
                            "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                            "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                            "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                            "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                        }];
                        table.render(option);
                        //按钮【按钮一】的回调
@@ -458,7 +461,7 @@
                                    //var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
                                    table.cache["mainTable"].push({
                                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                                    });
                                    option.data = table.cache["mainTable"];
                                    table.render(option);
@@ -839,6 +842,10 @@
                    , { field: 'HWorkerName', title: '操作员名称', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100 }
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100 }
                    , { field: 'HICMOBillNo', title: '生产订单', edit: 'text', width: 100 }
                    , { field: 'HICMOInterID', title: '生产订单内码', edit: 'text', width: 100, hide: true}
                    , { field: 'HICMOEntryID', title: '生产订单子内码', edit: 'text', width: 100, hide: true}

                    , { field: 'HRemark', title: '表体备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
@@ -926,7 +933,8 @@
                $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                }];
                table.render(option);
            }
@@ -957,7 +965,8 @@
                                        "HMaterID": data[i].物料ID, "HMaterCode": data[i].物料代码, "HMaterName": data[i].物料名称, "HMaterSpec": data[i].规格型号,
                                        "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].生产资源ID, "HSourceCode": data[i].生产资源代码,
                                        "HSourceName": data[i].生产资源名称, "HWorkerid": data[i].操作员ID, "HWorkerCode": data[i].操作员代码,
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量, "HRemark": ""
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量, "HICMOBillNo": data[i].生产订单号,
                                        "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": ""
                                    });
                                }

@@ -979,6 +988,7 @@
                    });

                    option.data = arr;
                    console.log(option.data );
                    table.render(option);

                    option_prodReport.data = arr_detail;
@@ -986,7 +996,8 @@
                } else {
                    option.data = [{
                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, 
                        "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                    }];
                    table.render(option);
                }
@@ -1000,7 +1011,8 @@
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, 
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                }];
                table.render(option);
            }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBillList.html

@@ -625,7 +625,7 @@
                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame