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

ch

2022-07-29 94bd70ca069aa3bb8546b77a2e99fd5c7ffc4c6a

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

@@ -108,8 +108,8 @@
                                    <div class="layui-input-inline">
                                        <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
                                        <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px;"></i>
                                        </button>
                                    </div>
                                </div>
@@ -136,13 +136,25 @@
                                    <div class="layui-input-inline">
                                        <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float:left;width:150px;">
                                        <input type="hidden" name="HProcessID_K3" id="HProcessID_K3" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px;"></i>
                                        </button>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-row">
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">组织</label>
                                    <div class="layui-input-inline" style="margin-bottom: -15px;">
                                        <div class="layui-form">
                                            <div class="layui-form-item">
                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">禁用标志</label>
                                    <div class="layui-input-inline">
@@ -173,6 +185,16 @@
                                        <input type="hidden" value="false" name="HAutoTrunFlag" id="HAutoTrunFlag">
                                    </div>
                                </div>
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">工作中心</label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="HWorkCenterName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                        <input type="hidden" name="HWorkCenterID" id="HDeptID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkCenterID-BT" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-row">
                                <div class="layui-col-xs8 layui-inline">
@@ -192,6 +214,7 @@
                            </div>
                        </div>
                        <input type="hidden" value="0" name="HParentID" id="HParentID">
                    </div>
                </form>
            </div>
        </div>
@@ -225,7 +248,7 @@

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

            Organ();//显示组织
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
@@ -240,6 +263,8 @@
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                //禁用组织选项
                $("#HUSEORGID").attr("disabled", true);
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(linterid);
@@ -295,7 +320,7 @@
            });

            //选择工作中心按钮
            form.on('submit(HWorkingProcedure-BT)', function () {
            form.on('submit(HWorkCenterID-BT)', function () {
                get_checkWorkCenter();
            });

@@ -323,6 +348,28 @@
                }
            }
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region åŠ è½½è¡¨å¤´
            function RoadBillMain(linterid) {
@@ -378,6 +425,7 @@
                                , "HAutoTrunFlag": data.自动移转
                                , "HRemark": data.备注
                                , "HProcCheckNote": data.本工序确认记录
                                , "HUSEORGID": data.HUSEORGID
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -415,7 +463,7 @@
                    type: "POST",
                    url: GetWEBURL() + "Gy_Process/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    data: { "oMain": sMainStr + ";" + sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -504,8 +552,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HCenter").val(checkStatus.data[0].工作中心);
                        $("#HCenterID").val(checkStatus.data[0].HItemID);
                        $("#HWorkCenterName").val(checkStatus.data[0].工作中心);
                        $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }