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

wtt

2024-09-14 e6c63d0a1cef8ae364e220b2b6128b8bbda44aa9

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

 WebTM/WebTM.csproj

@@ -437,6 +437,7 @@
    <Content Include="views\系统管理\用户管理\Gy_UserDeptList.html" />
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />

 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>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -151,6 +151,7 @@
                                <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_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><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>
@@ -241,6 +242,7 @@
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(0);
@@ -360,6 +362,17 @@
            }
            //#endregion

            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '生产班组导入'
                    , shift: 0//弹出动画
                    , content: '../../计划管理/Excel/Gy_Group_Excel.html?OperationType=dao&HSouceBillType='
                })
            }

            //文件上传
            upload.render({
                elem: '#UpLoad',

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -32,9 +32,9 @@
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <label class="layui-form-label">物料编码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -76,9 +76,9 @@
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料编码</label>
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -100,14 +100,15 @@
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px;display:none;">重置</button>


                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">组织</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                <!--动态渲染组织-->
                                            </select>
                                        <label class="layui-form-label">销售订单</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                        </div>
                                    </div>

                                    <!--显示当前过滤方案-->
                                    <div class="layui-inline" style="margin-left:5px;">
                                        <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -129,6 +130,16 @@
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
                                            </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: 185px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
@@ -1027,6 +1038,7 @@
                var WorkCenter = $("#WorkCenter").val();//单据号
                var HMaterName = $("#HMaterName").val();//单据号
                var HErpID = $("#HERPID").val();//唯一标识
                var HSeOrderBillNo = $("#HSeOrderBillNo").val(); //销售订单
                var HDeptName = $("#HDeptName").val();//单据号
                var HStatus = $("#HStatus").val();//单据号
                var HBillType = $("#HBillType").val();//单据类型
@@ -1137,6 +1149,9 @@
                if (HOrderProcNO) {
                    sWhere += " and è®¢å•è·Ÿè¸ªå· like '%" + HOrderProcNO + "%'";
                }
                if (HSeOrderBillNo) {
                    sWhere += " and é”€å”®è®¢å•å· like '%" + HSeOrderBillNo + "%'";
                }
                if (WorkCenter) {
                    sWhere += " and å•æ®å· like '%" + WorkCenter + "%'";
                }

 WebTM/views/¼Æ»®¹ÜÀí/Excel/Gy_Group_Excel.html

New file
@@ -0,0 +1,234 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>生产班组导入</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">

                                </div>
                            </div>
                        </div>
                    </div>

                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                        </div>
                    </script>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script type="text/html" id="barDemo">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<script>

    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
            , upload = layui.upload


        var option = [];
        //#endregion

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

        //初始化界面
        set_ClearBill();


        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Gy_Process/Gy_Process_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            done: function (data1) {
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.alert('导入出现异常', { icon: 2 });
            }
        });

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
        });

        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
            else {
                layer.msg("无数据,请先导入数据!");
            }
        })

        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })


        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化表格
            set_InitGrid();
        }
        //#endregion


        //初始化表格
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
                    , { field: '组织代码', title: '组织代码', width: 120 }
                    , { field: '组织名称', title: '组织名称', width: 120 }
                    , { field: '班组代码', title: '班组代码', width: 120 }
                    , { field: '班组', title: '班组', width: 120 }
                    , { field: 'HDeptID', title: 'HDeptID', width: 120, hide: true }
                    , { field: '部门代码', title: '部门代码', width: 120, hide: true }
                    , { field: '所属部门', title: '所属部门', width: 120 }
                    , { field: '班组总人数', title: '班组总人数', width: 120}
                    , { field: '工序代码', title: '工序代码', width: 120, hide: true }
                    , { field: '工序', title: '工序', width: 120 }
                    , { field: '备注', title: '备注', width: 120 }
                ]]
            };

            //渲染页面
            table.render(option);
            //DisPlay_HideColumn();
        }

        //行内删除
        function set_GridDelete(obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗？', function (index) {
                    console.log("索引为:" + rowIndex);
                    if (rowIndex === '0') {
                        layer.msg('首行无法删除！！！');
                    } else {
                        var oldData = option.data;
                        oldData.splice(obj.tr.data('index'), 1)
                        option.data = oldData;//将数据绑定到data上
                        table.render(option);
                        layer.close(index);
                    }
                });
            }
        }

        //导入(保存)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                }
            }

            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"];
            var index = layer.load();

            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_Process/Gy_Process_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        layer.close(index);
                        layer.msg(data.Message);
                        option.data = null;
                        table.cache["mainTable"] = null;
                        table.render(option);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }

        //#endregion

    });

</script>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -360,6 +360,13 @@
                                                <input type="text" class="layui-input" name="HModel" id="HModel" value="" style="width: 190px;" readonly>
                                            </div>
                                        </div>

                                        <div class="layui-col-xs8 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs8 layui-inline">
@@ -522,12 +529,7 @@
                                                <input type="text" class="layui-input" value="0" name="" id="">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs8 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                      
                                    </div>
                                </div>
                            </div>