yusijie
2022-11-25 13568a80fde6d52db3ebe760b9e184e527400508
基础资料
13个文件已修改
80 ■■■■ 已修改文件
WebTM/views/Baseset/基础资料/Gy_ClassTimePrjList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_DormList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_DutyList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_PostList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_WorkTypeList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/GroupInformation.html 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_ClassTimePrjList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_DormList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_DutyList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_PostList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_WorkTypeList.html
@@ -22,7 +22,7 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
WebTM/views/PublicPage/GroupInformation.html
@@ -89,51 +89,6 @@
                , tree = layui.tree
            var sWhere = "";
            //tree.render({
            //    elem: '#treeDepartment',
            //    data: getData(sWhere),
            //    showCheckbox: false,     //是否显示复选框
            //    id: 'demoId',
            //    isJump: false, //是否允许点击节点时弹出新窗口跳转
            //    showLine: true,//是否开启连接线
            //    onlyIconControl: true,   //点击后不收缩
            //    click: function (obj) {
            //        //点击高光
            //        if (obj.data.id !== treeCkData.id) {
            //            $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
            //            treeCkData = obj.data;
            //            TagId = obj.data.id;
            //            TagParentId = obj.data.ParentID;
            //        }
            //        else {
            //            $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
            //            treeCkData = { id: 0 };
            //            TagId = "";
            //            TagParentId = "";
            //        }
            //        $.ajax({
            //            url: GetWEBURL() + '/Gy_MaintenanceMode/GroupCX',
            //            type: "GET",
            //            data: { "HInterID": obj.data.id },
            //            success: function (data1) {
            //                if (data1.count == 1) {
            //                    option.data = data1.data;
            //                    table.render(option);
            //                    layer.close(index);
            //                } else {
            //                    layer.close(index);
            //                    layer.alert(data1.code + data1.Message, { icon: 5 });
            //                }
            //            }, error: function () {
            //                layer.close(index);
            //                layer.alert("接口请求失败!", { icon: 5 });
            //            }
            //        });
            //    }
            //});
            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Department.html
@@ -332,7 +332,7 @@
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes']
                    , btn: ['确定', '取消']
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html
@@ -716,7 +716,7 @@
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '工种列表'
                    , title: '计量单位组列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Unit.html
@@ -68,7 +68,7 @@
                                                <div class="layui-col-xs4">
                                                    <label class="layui-form-label"> é»˜è®¤å•位:</label>
                                                    <div class="layui-input-inline">
                                                        <input type="radio" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
                                                        <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
                                                        <input type="hidden" value="false" name="HStandard" id="HStandard">
                                                    </div>
                                                </div>
@@ -160,11 +160,15 @@
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Edit_Gy_UnitList[0];
                            console.log("返回的data.HStopFlag" + JSON.stringify(data.禁用标记));
                            console.log("返回的data.HStandard" + JSON.stringify(data.默认标记));
                            var IsHStopflag = data.禁用标记;
                            //禁用标记
                            if (IsHStopflag == "true") {
                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            }
                            if (data.默认标记 == "true") {
                                $("input[name='checkboxHStandard'][value='" + data.默认标记 + "']").attr("checked", true);
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HNumber": data.计量单位代码
                                , "HItemID": data.HItemID
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Warehouse.html
@@ -342,7 +342,7 @@
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes']
                    , btn: ['确定', '取消']
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Xt_ORGANIZATIONSList.html
@@ -238,9 +238,10 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            var IsHStopflag = data.禁用标记;
                            var IsHStopflag = data.禁用状态;
                            //禁用标记
                            if (IsHStopflag) {
                            if (IsHStopflag == "是") {
                                IsHStopflag = true;
                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
@@ -248,7 +249,7 @@
                                , "HItemID": data.HItemID
                                , "HName": data.组织名称
                                //, "HMakeTime": data.日期
                                , "HStopflag": data.禁用标记
                                , "HStopflag": data.禁用状态
                                , "HRemark": data.备注
                            });
                            $("#HMakeTime").val(Format(data.日期, "yyyy-MM-dd"));
@@ -268,7 +269,7 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                if (data.field.HStopflag) {
                if (data.field.HStopflag == true) {
                    data.field.HStopflag = 1
                } else  {
                    data.field.HStopflag = 0
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Employee_Add_Edit_.html
@@ -477,7 +477,7 @@
                                                <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
                                                <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>