duhe
2023-11-07 76edf702b20ed1b4fb642a6d9c5e3294cd246fbc
生产订单下推生产订单变更单
生产订单变更单列表隐藏新增按钮
4个文件已修改
143 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产订单变更单/Sc_ICMOChangeBill.html 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产订单变更单/Sc_ICMOChangeBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3582,7 +3582,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>11/07/2023 23:22:14</publishTime>
    </File>
    <File Include="views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList - å¤åˆ¶.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3711,7 +3711,7 @@
      <publishTime>10/16/2023 09:58:41</publishTime>
    </File>
    <File Include="views/生产管理/生产订单变更单/Sc_ICMOChangeBill.html">
      <publishTime>10/30/2023 15:54:39</publishTime>
      <publishTime>11/07/2023 23:25:59</publishTime>
    </File>
    <File Include="views/生产管理/生产订单变更单/Sc_ICMOChangeBillList.html">
      <publishTime>10/30/2023 15:23:27</publishTime>
@@ -4656,7 +4656,7 @@
      <publishTime>10/26/2023 13:27:26</publishTime>
    </File>
    <File Include="views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html">
      <publishTime>10/27/2023 14:11:43</publishTime>
      <publishTime>11/07/2023 22:34:28</publishTime>
    </File>
    <File Include="views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html">
      <publishTime>10/27/2023 13:46:03</publishTime>
@@ -4677,7 +4677,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>11/07/2023 21:51:17</publishTime>
      <publishTime>11/07/2023 22:40:00</publishTime>
    </File>
    <File Include="views/采购管理/委外订单/WW_EntrustOrderBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4698,13 +4698,13 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>11/07/2023 21:51:17</publishTime>
      <publishTime>11/07/2023 22:40:00</publishTime>
    </File>
    <File Include="views/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html">
      <publishTime>11/07/2023 22:23:11</publishTime>
      <publishTime>11/07/2023 22:24:13</publishTime>
    </File>
    <File Include="views/销售管理/销售订单变更单/Xs_SeOrderChangeBillList.html">
      <publishTime>10/27/2023 20:17:34</publishTime>
      <publishTime>11/07/2023 22:26:40</publishTime>
    </File>
    <File Include="views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -189,6 +189,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>多行下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>下推(生产订单变更单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
@@ -304,6 +305,9 @@
                        break;
                    //多行下推
                    case 'set_ShowBill_dh': set_ShowBill_dh();
                        break;
                    //下推(生产订单变更单)
                    case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
                        break;
                    //新增
                    case 'set_AddNew': set_AddNew();
@@ -854,6 +858,37 @@
                }
            }
            //#region ä¸‹æŽ¨(生产订单变更单)
            function set_PushICMOChangeBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '下推-生产订单变更单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../生产管理/生产订单变更单/Sc_ICMOChangeBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1'
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#endregion
            //新增
            function set_AddNew() {
                layer.open({
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¶©µ¥±ä¸üµ¥/Sc_ICMOChangeBill.html
@@ -296,6 +296,9 @@
                //加载表体和表体数据
                RoadBillMain(linterid);
            }
            else if (OperationType == 4) {                                                  //下推
                setInit_PushBill(linterid);
            }
            //#endregion
            //#region åˆå§‹åŒ–组织
@@ -689,6 +692,93 @@
            }
            //#endregion
            //#region ä¸‹æŽ¨é¡µé¢åˆå§‹åŒ–
            function setInit_PushBill(linterid) {
                //生成并设置主表的内码和单据号
                createBillNo();
                //相关文本框信息初始化
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化并列设置:子表1
                set_InitGrid();
                DisPlay_HideColumn();
                //查询生产订单是否存在
                var ajaxLoad = layer.load();
                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        var result = d;
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HEmpID": data.HEmpID
                                , "HEmpName": data.销售员
                                //, "HDeptID": data.HDeptID
                                //, "HDeptName": data.生产车间
                                //, "HCusID": data.HCusID
                                //, "HCusName": data.客户
                                , "HMainSourceInterID": linterid
                                , "HMainSourceBillNo": data.单据号
                                , "HMainSourceBillType": params[params[2]]
                            });
                            //组织的值HOrgID变化,重新渲染
                            HOrgIDBar = data.HOrgID;
                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < result.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": result.data[i]["HMaterID"],
                                        "物料代码": result.data[i]["产品代码"],
                                        "物料名称": result.data[i]["产品名称"],
                                        "规格型号": result.data[i]["规格型号"],
                                        "HUnitID": result.data[i]["HUnitID"],
                                        "计量单位": result.data[i]["计量单位"],
                                        "HQty_Old": result.data[i]["生产任务单数量"],
                                        "HQty_New": result.data[i]["生产任务单数量"],
                                        //"HDate_Old": formatDate(result.data[i]["原交货日期"]),
                                        //"HDate_New": formatDate(result.data[i]["新交货日期"]),
                                        "HRemark": "",
                                        "HSourceInterID": result.data[i]["hmainid"],
                                        "HSourceEntryID": result.data[i]["HEntryID"],
                                        "HSourceBillNo": result.data[i]["单据号"],
                                        "HSourceBillType": result.data[i]["单据类型"]
                                    }
                                );
                            }
                            option.data = rowdata;
                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //#region å¼¹çª—选择方法
            //#region ç”Ÿäº§è½¦é—´é€‰æ‹©é¡µé¢
            function get_checkDept() {
@@ -770,7 +860,7 @@
            function set_SaveBill(data) {
                //记录操作类型
                var refSav = "";
                if (OperationType == 1 || OperationType == 2) {
                if (OperationType == 1 || OperationType == 2 || OperationType==4) {
                    refSav = "Add";
                    data.field.HChangeDate = new Date();
                }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¶©µ¥±ä¸üµ¥/Sc_ICMOChangeBillList.html
@@ -90,7 +90,7 @@
                        <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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>浏览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>