1.销售管理,仓库管理 所有的 新增 审核 反审核 删除 增加 进行 会计期间 结账 的判断和控制 2.岗位技能清单 和 员工技能清单 表头 增加 2...

zrg

2024-05-16 fb21bba8780ac7b2bd51edb3534640bcc5e88040

1.销售管理,仓库管理 所有的 新增 审核 反审核 删除 增加 进行 会计期间 结账 的判断和控制
2.岗位技能清单 和 员工技能清单 表头 增加 2个 字段； HMaterID int --产品编码（gy_Material） HProcID int --工序（gy_Process）

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_PostSkillList.html

@@ -51,6 +51,17 @@
                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应岗位</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                           
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 120px">使用组织：</label>
@@ -66,6 +77,16 @@
                                                        <option value="未使用">未使用</option>
                                                        <option value="已使用">已使用</option>
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应工序</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
@@ -198,6 +219,20 @@
                    //}
                }
            });

            //#region é€‰æ‹©å²—位按钮
            form.on('submit(btnSearchHPost)', function () {
                get_checkSearchHPost();
            });
            //#endregion

            //#region é€‰æ‹©éƒ¨é—¨æŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion


            //#endregion


@@ -232,6 +267,10 @@
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HNumber").val(data.岗位技能代码);//代码
                            $("#HName").val(data.岗位技能名称);//名称
                            $("#HPostID").val(data.HPostID);//代码ID
                            $("#HPostName").val(data.岗位名称);//代码
                            $("#HProcID").val(data.HProcID);//代码ID
                            $("#HProcName").val(data.工序名称);//代码
                            $("#HHelpCode").val(data.助记码);//助记码
                            $("#HUSEORGID").val(data.创建组织);//使用组织
                            $("#HUseFlag ").val(data.使用状态);//使用状态
@@ -253,6 +292,63 @@
                layer.alert(sMsg, { icon: 5 });

            }

            //#region å²—位选择页面
            function get_checkSearchHPost() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '员工表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Post.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HPostID").val(checkStatus.data[0].HItemID);//岗位id
                        $("#HPostName").val(checkStatus.data[0].岗位名称);//岗位名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_checkSearchHProc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HProcID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HProcName").val(checkStatus.data[0].工序名称);//部门名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

             //获取登录页组织列
            function Organ() {
                var Organization = '';
@@ -277,6 +373,17 @@
            //#endregion
        });

        //工序
        function GetProcessValue(obj) {
            $("#HProcID").val(obj[0].HItemID);//工序id
            $("#HProcName").val(obj[0].工序名称);//工序名称
        }
        //岗位
        function GetGyPostValue(obj) {
            $("#HPostID").val(obj[0].HItemID);//岗位id
            $("#HPostName").val(obj[0].岗位名称);//岗位名称
        }

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

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_PostSkillList.html

@@ -121,7 +121,7 @@
            var option = [];
            var HModName = "Gy_PostSkill";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "短代码 ","父级ID", "等级", "末级标志", "助记码", "创建组织"];
            var titleData = ["HItemID", "短代码 ", "父级ID", "等级", "末级标志", "助记码", "创建组织", "HPostID","HProcID"];

            //#endregion


 WebTM/views/¹¤×ʹÜÀí/Ô±¹¤¼¼ÄÜÇåµ¥/HR_EmployeeSkillBill.html

@@ -115,10 +115,41 @@
                                                </button>
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品编码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo" >
                                                <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                    </div>
@@ -129,23 +160,6 @@
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
                                                <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
                                            </div>
                                        </div>
                                    </div>
@@ -399,14 +413,28 @@
                get_checkSearchHEmp();
            });
            //#endregion

            //#region é€‰æ‹©è¯„定人按钮
            form.on('submit(btnSearchHCheckEmp)', function () {
                get_checkSearchHCheckEmp();
            });
            //#endregion

            //#region é€‰æ‹©ä¸Šçº§é¢†å¯¼æŒ‰é’®
            form.on('submit(btnSearchHManagerEmp)', function () {
                get_checkSearchHManagerEmp();
            });
            //#endregion

            //#region é€‰æ‹©ç‰©æ–™æŒ‰é’®
            form.on('submit(btnSearchHMater)', function () {
                get_checkSearchHMater();
            });
            //#endregion

            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion

@@ -458,7 +486,7 @@
                    "HPostSkillid": "0"
                    , "HPostSkillNumber": ""
                    , "HPostSkillName": ""
                    , "HSkillLev": ""
                    , "HSkillLev": "1"
                    , "HTrainDate": Format(new Date(), "yyyy-MM-dd")
                    , "HRemark": ""
                    , "HSourceInterID": "0"
@@ -827,6 +855,67 @@
            }
            //#endregion

            //#region ç‰©æ–™é€‰æ‹©é¡µé¢
            function get_checkSearchHMater() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "物料列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据


                        $("#HMaterID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//部门名称

                        table.render(option);
                        layer.closeAll();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () { }
                });
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_checkSearchHProc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HProcID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HProcName").val(checkStatus.data[0].工序名称);//部门名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region ä¿å­˜HMaker
            function set_AddNew(data) {
                //获取子表数据
@@ -909,6 +998,10 @@
                            , "HDeptName": data[0]["部门名称"]
                            , "HPostID": data[0]["HPostID"]
                            , "HPostName": data[0]["岗位名称"]
                            , "HProcID": data[0]["HProcID"]
                            , "HProcName": data[0]["工序名称"]
                            , "HMaterID": data[0]["HMaterID"]
                            , "HMaterName": data[0]["物料名称"]

                            , "HEmpID": data[0]["HEmpID"]
                            , "HEmpName": data[0]["职员名称"]
@@ -1271,6 +1364,19 @@
            $("#HManagerEmpID").val(obj[0].HItemID);
            $("#HManagerEmpName").val(obj[0].职员名称);
        }

        //双击返回物料
        function GetGyMaterial(obj) {
            $("#HMaterID").val(obj.HItemID);//物料id
            $("#HMaterName").val(obj.物料名称);//物料名称
        }

        //工序
        function GetProcessValue(obj) {
            $("#HProcID").val(obj[0].HItemID);//工序id
            $("#HProcName").val(obj[0].工序名称);//工序名称
        }

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

 WebTM/views/¹¤×ʹÜÀí/Ô±¹¤¼¼ÄÜÇåµ¥/HR_EmployeeSkillBillList.html

@@ -131,7 +131,7 @@
            var HModName = "HR_EmployeeSkillBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID"];
            var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID","HProcID", "HMaterID"];

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "2330";

 WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBill.html

@@ -73,6 +73,8 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">部门</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -83,6 +85,34 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品编码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -91,23 +121,6 @@
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
                                                <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
                                            </div>
                                        </div>
                                    </div>
@@ -355,6 +368,19 @@
            });
            //#endregion

            //#region é€‰æ‹©ç‰©æ–™æŒ‰é’®
            form.on('submit(btnSearchHMater)', function () {
                get_checkSearchHMater();
            });
            //#endregion

            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion


            //#endregion

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
@@ -403,7 +429,7 @@
                    "HPostSkillid": "0"
                    , "HPostSkillNumber": ""
                    , "HPostSkillName": ""
                    , "HSkillLev": ""
                    , "HSkillLev": "1"
                    , "HRemark": ""
                    , "HSourceInterID": "0"
                    , "HSourceEntryID": "0"
@@ -662,6 +688,67 @@
            }
            //#endregion

            //#region ç‰©æ–™é€‰æ‹©é¡µé¢
            function get_checkSearchHMater() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "物料列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据


                        $("#HMaterID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//部门名称

                        table.render(option);
                        layer.closeAll();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () { }
                });
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_checkSearchHProc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HProcID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HProcName").val(checkStatus.data[0].工序名称);//部门名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region ä¿å­˜HMaker
            function set_AddNew(data) {
                //获取子表数据
@@ -744,6 +831,10 @@
                            , "HDeptName": data[0]["部门名称"]
                            , "HPostID": data[0]["HPostID"]
                            , "HPostName": data[0]["岗位名称"]
                            , "HProcID": data[0]["HProcID"]
                            , "HProcName": data[0]["工序名称"]
                            , "HMaterID": data[0]["HMaterID"]
                            , "HMaterName": data[0]["物料名称"]

                            , "HRemark": data[0]["表头备注"]
                            , "HMaker": data[0]["制单人"]
@@ -1083,6 +1174,19 @@
            $("#HPostID").val(obj[0].HItemID);//岗位id
            $("#HPostName").val(obj[0].岗位名称);//岗位名称
        }

        //双击返回物料
        function GetGyMaterial(obj) {
            $("#HMaterID").val(obj.HItemID);//物料id
            $("#HMaterName").val(obj.物料名称);//物料名称
        }

        //工序
        function GetProcessValue(obj) {
            $("#HProcID").val(obj[0].HItemID);//工序id
            $("#HProcName").val(obj[0].工序名称);//工序名称
        }

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

 WebTM/views/¹¤×ʹÜÀí/¸Úλ¼¼ÄÜÇåµ¥/HR_PostSkillBillList.html

@@ -131,7 +131,7 @@
            var HModName = "HR_PostSkillBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEntryID",  "HPostID", "HDeptID", "HPostSkillid", "HOrgID"];
            var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HProcID","HMaterID"];

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "2331";

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

@@ -135,8 +135,9 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">对应ERP物料
                                                <!--<label style="color:red"> * </label>-->
                                                <label class="layui-form-label">
                                                    å¯¹åº”ERP物料
                                                    <!--<label style="color:red"> * </label>-->
                                                </label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
@@ -275,6 +276,23 @@
                                                        <option value="加工">加工</option>
                                                        <option value="关机">关机</option>
                                                        <option value="异常停机">异常停机</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">数采物理地址</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HMacAddress" id="HMacAddress">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">是否主生产设备</label>
                                                <div class="layui-input-block" style="margin-left: 125px;width:55%;">
                                                    <select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
                                                        <option value="否" selected="selected">否</option>
                                                        <option value="是">是</option>
                                                    </select>
                                                </div>
                                            </div>
@@ -929,6 +947,8 @@
                        $("#HLogo").val(d.data[0].品牌);
                        $("#HSourceID").val(d.data[0].HSourceID);
                        $("#HSourceName").val(d.data[0].HSourceName);
                        $("#HMacAddress").val(d.data[0].数采物理地址);
                        $("#HMainSourceFlag").val(d.data[0].是否主生产设备);
                        form.render("select");
                    }
                });
@@ -973,7 +993,7 @@
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        location.reload();
                                    }
                                    else {
@@ -1005,7 +1025,7 @@
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        location.reload();
                                    }
                                    else {

 WebTM/views/ÏúÊÛ¹ÜÀí/ÌØÅúÉêÇëµ¥/Xs_ExceptiveCheckRequestBill.html

@@ -430,6 +430,7 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HPlanPayDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            else if (OperationType == 3) {                                                 //编辑
                //加载编辑页面

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛµ÷¼Ûµ¥/Xs_SellOutChangeBillList.html

@@ -113,6 +113,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" ><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>

 WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBillList.html

@@ -111,7 +111,7 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -180,7 +180,40 @@
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                    case 'set_DeleteBill':
                        var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Kf_EntrustInBill/DeleteKf_EntrustInBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                            });

                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                    }
                                });
                            })
                        }
                        else {
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                    //审核按钮
                    case 'btn-Audit':