安灯呼叫规则增加复制功能,系统用户管理,增加钉钉id号字段

zrg

2024-10-28 a18fc75e659e12d77c73eba4cbacc5822552c563

安灯呼叫规则增加复制功能,系统用户管理,增加钉钉id号字段

 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>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -977,11 +977,11 @@
                                , "HPlanNo": data.点检计划内码
                                , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
                                , "HMouldDotCheckRuleName": data.器具点检规程单据号
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HMouldDotCheckRuleID
                                , "HErrNote": data.异常情况记录 //异常情况记录
                                , "HBigSafeNote": data.重大安全隐患记录 //重大安全隐患记录
                                , "HDotCheckNote": data.点检数据 //点检数据
                                , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
                                , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HShiftsID
                                , "HShiftsName": data.班次名称 //班次名称
                            });
                            if (data.最终结论 == "不合格") {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckBillList.html

@@ -211,7 +211,7 @@
            var option2 = [];
            var HModName = "Sc_MouldDotCheckBillList";
            var HBillType = "3821";
            var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码", "HBillType","HMouldDotCheckRuleID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码", "HBillType", "HMouldDotCheckRuleID","HShiftsID"];//不需要显示的字段 å¯æ‰©å±•
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -724,7 +724,10 @@
                    } else if ($("#HErrMsgBackTypeName").val() == "模具原因") {
                        $("#HHandleEmpName").val("吴斌");  //指派处理人
                        $("#HHandleEmpID").val(162686);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "不合格原因") {
                    } else if ($("#HErrMsgBackTypeName").val() == "测试原因") {
                        $("#HHandleEmpName").val("孙文静");  //指派处理人
                        $("#HHandleEmpID").val(162622);        //指派处理人
                    } else if ($("#HErrMsgBackTypeName").val() == "环境原因") {
                        $("#HHandleEmpName").val("孙文静");  //指派处理人
                        $("#HHandleEmpID").val(162622);        //指派处理人
                    }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_MESExecptFeedBackBillType.html

@@ -106,7 +106,7 @@
                                        </ul>
                                        <div class="layui-tab-content" style="height: 700px;">
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item" style="margin-top:30px">
                                                <div class="layui-form-item" style="margin-top:30px" >
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
@@ -117,7 +117,7 @@
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:400px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="设备异常">设备异常
                                                                <input type="radio" name="faultType" value="设备原因">设备原因
                                                            </label>
                                                        </div>
                                                    </div>
@@ -127,7 +127,7 @@
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="物料异常">物料异常
                                                                <input type="radio" name="faultType" value="材料原因">材料原因
                                                            </label>
                                                        </div>
                                                    </div>
@@ -140,23 +140,31 @@
                                                    </div>
                                                </div>

                                                <div class="layui-form-item" style="margin-top:90px">
                                                <div class="layui-form-item" style="margin-top:60px">
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="检测原因">检测原因
                                                                <input type="radio" name="faultType" value="模具原因">模具原因
                                                            </label>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:400px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="不合格原因">不合格原因
                                                                <input type="radio" name="faultType" value="测试原因">测试原因
                                                            </label>
                                                        </div>
                                                    </div>
                                                </div>

                                                <div class="layui-form-item" style="margin-top:60px">
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline" style="margin-left:200px">
                                                            <label class="radio-label">
                                                                <input type="radio" name="faultType" value="环境原因">环境原因
                                                            </label>
                                                        </div>
                                                    </div>                                                   
                                                </div>

                                            </div>
                                        </div>
@@ -211,13 +219,17 @@
                Pub_Close(1);
            });

            document.querySelectorAll('input[name="faultType"]').forEach(function (radio) {
            // èŽ·å–所有名称为 faultType çš„单选按钮
            const radios = document.querySelectorAll('input[name="faultType"]');

            // ä¸ºæ¯ä¸ªå•é€‰æŒ‰é’®æ·»åŠ  change äº‹ä»¶ç›‘听器
            radios.forEach(function (radio) {
                radio.addEventListener('change', function () {
                    if (this.checked) { // åªæœ‰è¢«é€‰ä¸­çš„radio才会触发  
                        var value = this.value; // èŽ·å–选中的radio的值  
                    if (this.checked) {
                        var value = this.value;
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            skin: 'layui-layer-rim',
                            title: '异常反馈单',
                            closeBtn: 1,
                            shift: 2,
@@ -236,9 +248,9 @@
                                    "HSourceBillNo": HSourceBillNo      //流转卡号
                                });

                                //通过索引获取到当前iframe弹出层
                                // é€šè¿‡ç´¢å¼•èŽ·å–到当前 iframe å¼¹å‡ºå±‚
                                var iframe = window['layui-layer-iframe' + index];
                                //调用iframe弹出层内的方法
                                // è°ƒç”¨ iframe å¼¹å‡ºå±‚内的方法
                                iframe.edit(data);
                            },
                        });
@@ -246,7 +258,48 @@
                });
            });

            // èŽ·å–所有的单选按钮的父元素 div.layui-input-inline
            const radioContainers = document.querySelectorAll('.layui-input-inline');

            // ä¸ºæ¯ä¸ªçˆ¶å…ƒç´ æ·»åŠ ç‚¹å‡»äº‹ä»¶ç›‘听器
            radioContainers.forEach(function (container) {
                container.addEventListener('click', function (event) {
                    // åˆ¤æ–­ç‚¹å‡»çš„元素是否是单选按钮或者其直接子元素
                    if (event.target.tagName === 'INPUT' || event.target.parentNode.tagName === 'INPUT') {
                        const clickedRadio = event.target.tagName === 'INPUT' ? event.target : event.target.parentNode.querySelector('input');
                        if (clickedRadio && clickedRadio.checked) {
                            var value = clickedRadio.value;
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim',
                                title: '异常反馈单',
                                closeBtn: 1,
                                shift: 2,
                                area: ['100%', '100%'],
                                maxmin: true,
                                content: './Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=',
                                end: function () {

                                },
                                success: function (dom, index) {
                                    var data = [];
                                    data.push({
                                        "HICMOBillNo": HICMOBillNo,//工单号
                                        "HSourceName": HSourceName, //设备
                                        "HType": value,     //异常类型
                                        "HSourceBillNo": HSourceBillNo      //流转卡号
                                    });

                                    // é€šè¿‡ç´¢å¼•èŽ·å–到当前 iframe å¼¹å‡ºå±‚
                                    var iframe = window['layui-layer-iframe' + index];
                                    // è°ƒç”¨ iframe å¼¹å‡ºå±‚内的方法
                                    iframe.edit(data);
                                },
                            });
                        }
                    }
                });
            });
            //以上为layui模块
        });
    </script>

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -86,6 +86,12 @@
                                                                </button>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label" style="width:110px;">钉钉ID号</label>
                                                            <div class="layui-input-inline">
                                                                <input class="layui-input" name="HDingDingUserID" id="HDingDingUserID" value="0">
                                                            </div>
                                                        </div>
                                                    </div>
                                                    <div class="layui-form-item">
                                                        <div class="layui-inline">
@@ -1005,6 +1011,7 @@
                                , "HWorkCenterID": data.HWorkCenterID
                                , "HWorkCenterName": data.工作中心
                                , "HICNumber": data.IC卡号
                                , "HDingDingUserID": data.钉钉ID号
                            });

                        } else {

 WebTM/views/ÖÊÁ¿¹ÜÀí/°²µÆÖ𼶺ô½Ð¹æÔò/OA_AndengFlowRuleBillMain.html

@@ -296,22 +296,31 @@
                ////禁用组织选项
                //$("#HOrgID").attr("disabled", true);
                OperationType = 1;

                //初始化项目阶段表
                get_InitGrid();

                //生成并设置主表的内码和单据号
                createBillNo();


                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));


            }
            else if (OperationType == 2) {//如果修改则走下面 new                                        //编辑
                OperationType = 1;
                //初始化项目阶段表
                get_InitGrid();
                RoadBillMain(linterid);
                //生成并设置主表的内码和单据号
                createBillNo();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            else if (OperationType == 3) {//如果修改则走下面 new                                        //编辑
                ////禁用组织选项
@@ -795,8 +804,8 @@

                        //主表 èµ‹å€¼
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HInterID": data[0]["hmainid"]
                            , "HBillNo": data[0]["单据号"]
                            "HInterID": OperationType == 2 ? "" : data[0]["hmainid"]
                            , "HBillNo": OperationType == 2 ? "" : data[0]["单据号"]
                            , "HDate": formatDate(data[0]["日期"])
                            , "HDeptID": data[0]["HDeptID"]
                            , "HDeptName": data[0]["发起部门"]

 WebTM/views/ÖÊÁ¿¹ÜÀí/°²µÆÖ𼶺ô½Ð¹æÔò/OA_AndengFlowRuleBillMainList.html

@@ -153,6 +153,7 @@
                            <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_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><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>
                                <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>
@@ -232,6 +233,9 @@
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -449,23 +453,7 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            ////动态显示列名
                            //option = {
                            //    elem: '#mainTable'
                            //    , toolbar: '#toolbarDemo'
                            //    , cols: [col]
                            //    , data: data1.data
                            //    , height: 800
                            //    , page: true
                            //    , totalRow: true
                            //    , cellMinWidth: 90
                            //    , limit: 50
                            //    , limits: [50, 500, 5000, 20000]
                            //    , done: function (res, curr, count) {
                            //        soulTable.render(this);
                            //    }
                            //}
                            }                          

                            option.cols = [col];
                            option.data = data1.data;
@@ -602,7 +590,6 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -621,6 +608,28 @@
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '新增' + HPageTitle
                        , shift: 0//弹出动画
                        , content: '../../质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }


            //#region åˆ é™¤
            function set_DeleteBill() {