yangle
2024-09-24 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
16个文件已修改
5个文件已添加
1379 ■■■■■ 已修改文件
WebTM/WebTM.csproj 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/indexMenu.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould_Excel.html 230 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/excel/Gy_Customer_Excel.html 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/excel/Gy_Department_excel.html 230 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/excel/Gy_Warehouse_Excel.html 230 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/Gy_ConkReasonList_Excel.html 230 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/销售基础资料/Gy_Customer.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -347,10 +347,16 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Material_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MouldType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Customer_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Department_excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectBasis_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectInstruMent_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectMethod_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_Warehouse_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -378,6 +384,7 @@
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassList.html" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonList_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheck_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Repair_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <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/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
WebTM/views/indexMenu.html
@@ -156,7 +156,7 @@
            <!-- ä¸»ä½“内容 -->
            <div class="layui-body" id="LAY_app_body">
                <div class="layadmin-tabsbody-item layui-show">
                    <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
                    <iframe src="home/console.html" frameborder="0" class="layadmin-iframe" name="mainIFrame"></iframe>
                </div>
            </div>
@@ -232,7 +232,6 @@
            }
            //遍历生成主菜单
            function MenuMain(data) {
                var liStr = '';
                //遍历生成主菜单
                for (var i = 0; i < data.length; i++) {
@@ -253,7 +252,7 @@
                        }
                        liStr += '</dl></li>';
                    } else {
                        liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
                        liStr += '<li class="layui-nav-item"><a class="" id = "' + data[i].Hurl + '"   href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
                    }
                };
                $(".layui-nav-tree").html(liStr);
@@ -274,12 +273,10 @@
                    subStr += '</dl>';
                    subStr += '</dd>';
                } else {
                    subStr += '<dd><a lay-href="' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
                    subStr += '<dd><a lay-href="' + subMenu.Hurl + '" id = "' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
                }
                return subStr;
            }
            //菜单自定义:弹出菜单自定义子页面
            Ul = document.getElementById("MenuDefineID");
@@ -313,6 +310,17 @@
        document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
        document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
        function openChildPage(id) {
            //获取页面
            var num = document.getElementById(id);
            num.href = id;
            num.target = "mainIFrame";
            num.click();
            console.log(num);
        }
    </script>
    <!--<script>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html
@@ -93,6 +93,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></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="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -173,6 +174,9 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //浏览
                    case 'get_PrintReport': get_PrintReport();
@@ -297,6 +301,17 @@
            }
            //#endregion
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '部门导入'
                    , shift: 0//弹出动画
                    , content: '../../基础资料/公用基础资料/excel/Gy_Department_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_PreventErrMould.html
@@ -85,6 +85,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><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" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -167,6 +168,9 @@
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
@@ -431,7 +435,16 @@
                });
            }
            //#endregion
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '防错装置导入'
                    , shift: 0//弹出动画
                    , content: './Gy_PreventErrMould_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_PreventErrMould_Excel.html
New file
@@ -0,0 +1,230 @@
<!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_PreventErrMould/Gy_PreventErrMould_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: '助记码', title: '助记码', width: 120 }
                    , { field: '备注', title: '备注', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            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_PreventErrMould/Gy_PreventErrMould_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/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Warehouse.html
@@ -140,15 +140,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<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" 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="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></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="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="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
@@ -224,9 +220,11 @@
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -408,7 +406,16 @@
            }
            //#endregion
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库导入'
                    , shift: 0//弹出动画
                    , content: '../../基础资料/公用基础资料/excel/Gy_Warehouse_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/excel/Gy_Customer_Excel.html
New file
@@ -0,0 +1,253 @@
<!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_Customer/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: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    , { field: '客户代码', title: '客户代码' }
                    , { field: '客户名称', title: '客户名称' }
                    , { field: '地区代码', title: '地区代码' }
                    , { field: '地区名称', title: '地区名称' }
                    , { field: '默认货币代码', title: '默认货币代码' }
                    , { field: '默认货币名称', title: '默认货币名称' }
                    , { field: '结算方式代码', title: '结算方式代码' }
                    , { field: '结算方式名称', title: '结算方式名称' }
                    , { field: '客户分类代码', title: '客户分类代码' }
                    , { field: '客户分类名称', title: '客户分类名称' }
                    , { field: '简称', title: '简称' }
                    , { field: '领用人', title: '领用人' }
                    , { field: '联系人', title: '联系人' }
                    , { field: '联系电话', title: '联系电话' }
                    , { field: '手机', title: '手机' }
                    , { field: '传真', title: '传真' }
                    , { field: '地址', title: '地址' }
                    , { field: '邮编', title: '邮编' }
                    , { field: '邮箱', title: '邮箱' }
                    , { field: '法人代表', title: '法人代表' }
                    , { field: '银行账号', title: '银行账号' }
                    , { field: '税务登记号', title: '税务登记号' }
                    , { field: '税率', title: '税率' }
                    , { field: '英文名称', title: '英文名称' }
                    , { field: '英文地址', title: '英文地址' }
                    , { field: '国家', title: '国家' }
                    , { field: '助记码', title: '助记码' }
                    , { field: '客户状态', title: '客户状态' }
                     , { field: '备注', title: '备注' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            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"] + '&和' + sessionStorage["OrganizationID"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_Customer/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/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/excel/Gy_Department_excel.html
New file
@@ -0,0 +1,230 @@
<!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_Department/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: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    , { field: '部门代码', title: '部门代码' }
                    , { field: '部门名称', title: '部门名称' }
                    , { field: '负责人代码', title: '负责人代码' }
                    , { field: '负责人名称', title: '负责人名称' }
                    , { field: '条形码', title: '条形码' }
                     , { field: '备注', title: '备注' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            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"] + '&和' + sessionStorage["OrganizationID"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_Department/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/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/excel/Gy_Warehouse_Excel.html
New file
@@ -0,0 +1,230 @@
<!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_Warehouse/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: 'HItemID', title: 'HItemID', sort: true, hide: true }
                     , { field: '仓库代码', title: '仓库代码' }
                     , { field: '仓库名称', title: '仓库名称' }
                     , { field: '联系电话', title: '联系电话' }
                    , { field: '职员代码', title: '职员代码' }
                    , { field: '职员名称', title: '职员名称' }
                     , { field: '备注', title: '备注' }
                     , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            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"] + '&和' + sessionStorage["OrganizationID"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_Warehouse/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/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonList.html
@@ -83,6 +83,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="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="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
@@ -155,6 +156,9 @@
                        break;
                    //删除
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //审核按钮
                    case 'btn-Audit':
@@ -404,7 +408,16 @@
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '故障原因导入'
                    , shift: 0//弹出动画
                    , content: './Gy_ConkReasonList_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonList_Excel.html
New file
@@ -0,0 +1,230 @@
<!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_ConkReason/Gy_ConkReason_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: '助记码', title: '助记码', width: 120 }
                    , { field: '备注', title: '备注', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            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_ConkReason/Gy_ConkReason_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/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html
@@ -130,6 +130,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>流水号新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btn-Edit"><i class="layui-icon layui-icon-form"></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="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -238,6 +239,9 @@
                        break;
                    //编辑
                    case 'btnModify': set_ShowBill();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //删除
                    case 'btndelete': set_DeleteBill();
@@ -472,6 +476,17 @@
            }
            //#endregion
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '客户导入'
                    , shift: 0//弹出动画
                    , content: '../../基础资料/公用基础资料/excel/Gy_Customer_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#region æŸ¥è¯¢ (关联用户)
            function get_Display1(HCusID) {
                var ajaxLoad = layer.load();
@@ -547,6 +562,7 @@
                get_Display1(HCusID);    //带出子表[关联用户]数据
            });
            //#endregion
            //#region é€‰ä¸­è¡Œæ”¹å˜é¢œè‰²
            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
WebTM/views/ϵͳ¹ÜÀí/µ¥¾ÝÀàÐÍ/Xt_BillTypeList.html
@@ -353,7 +353,7 @@
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            ins = table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -814,7 +814,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Xt_SystemLogListExcel";
                var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
                //逻辑审核方法
                $.ajax({
WebTM/views/ϵͳ¹ÜÀí/ÈÕÖ¾¹ÜÀí/Xt_SystemLogList.html
@@ -579,7 +579,7 @@
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            ins = table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -898,7 +898,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Xt_SystemLogListExcel";
                var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
                //逻辑审核方法
                $.ajax({
WebTM/views/ϵͳ¹ÜÀí/Ä£¿é¹ÜÀí/Xt_XtgnbList.html
@@ -395,7 +395,7 @@
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            ins = table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -847,7 +847,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Xt_SystemLogListExcel";
                var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
                //逻辑审核方法
                $.ajax({
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserSuplies.html
@@ -43,7 +43,8 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" >退出</button>-->
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" onclick='window.frames["系统管理/用户管理/Xt_UserSupliesList.html"] '>退出</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel导入</button>
                            </div>
                        </div>
@@ -145,7 +146,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = TabRow;
                var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" };//不能用tabrow代替,layui会自动加上index属性
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -263,13 +264,33 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    var OptionData = checkStatus.data;
                                    if (checkStatus.data.length > 1) {
                                        var rowIndex = $(obj.tr).attr("data-index") * 1;//获取选择列的索引
                                        for (var i = 0; i < OptionData.length; i++) {  //判断选中的数据的长度  ç”¨äºŽéåކcheckStatus.data数组中的每个元素
                                            if (rowIndex + i >= option.data.length) {           //判断rowIndex + i的索引超出了option.data数组的长度,说明option.data数组需要扩展以包含更多行
                                                var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" };  // åˆ›å»ºä¸€ä¸ªæ–°çš„包含数组
                                                table.cache["mainTable"].push(NewRow);    //创建新的包含数组  ä¼ å…¥table.cache["mainTable"]数组
                                                option.data = table.cache["mainTable"];  //把传入 table.cache["mainTable"]数组的值赋值给option.data çš„属性
                                                table.render(option);//渲染界面
                                            }
                                            option.data[rowIndex + i].HSupID = OptionData[i].HItemID;
                                            option.data[rowIndex + i].HSupperNumber = OptionData[i].HNumber;
                                            option.data[rowIndex + i].HSupperName = OptionData[i].HName;
                                        }
                                        table.render(option); //重新渲染表格以显示更新后的数据
                                    } else {
                                        obj.update({
                                            HSupID: checkStatus.data[0].HItemID,
                                            HSupperNumber: checkStatus.data[0].HNumber,
                                            HSupperName: checkStatus.data[0].HName
                                        });
                                    }
                                    //console.log(obj.data);
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HSupID: checkStatus.data[0].HItemID,
                                        HSupperNumber: checkStatus.data[0].HNumber,
                                        HSupperName: checkStatus.data[0].HName
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                }
@@ -345,9 +366,12 @@
            //退出
            form.on('submit(Exit)', function (data) {
                if (params[1] != null) {
                    Pub_Close(1);
                } else if (params[1] == null) {
                    Pub_Close(2);
                } else if (params[1] == null) {
                    var parentWindow = window.parent;
                    Pub_Close(2);
                    parentWindow.openChildPage("系统管理/用户管理/Xt_UserSupliesList.html");
                }               
            });
@@ -384,7 +408,7 @@
            }
            //无源单新增
            function set_AddFNew() {
                option.data = [TabRow];
                option.data = [{ "HSupID": 0, "HSupperNumber": "", "HSupperName": "" }];
                table.render(option);
            }
@@ -444,16 +468,10 @@
            //增加一行
            function btnAddLine(NewRow) {
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                table.cache["mainTable"].push(NewRow);//将NewRow对象添加到table.cache["mainTable"]数组中,  æ•°ç»„存储了表格的所有行数据
                option.data = table.cache["mainTable"];//更新option.data为新的数据数组显示到表格上  //将数据绑定到data上
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
                table.render(option);  //渲染表格
            }
            //复制一行
            function btnCopyLine(data) {
WebTM/views/ϵͳ¹ÜÀí/ϵͳ²ÎÊý¹ÜÀí/Xt_SystemParameterList.html
@@ -402,7 +402,7 @@
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);
                            ins = table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
@@ -876,7 +876,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Xt_SystemLogListExcel";
                var ModRightNameCheck = "Gy_EmployeeList_ExportExcel";
                //逻辑审核方法
                $.ajax({
WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html
@@ -1295,9 +1295,10 @@
                layui.table.reload('mainTable', {
                    data: updatedData
                });
                // å–消编辑状态
                cell.removeAttr('contenteditable');
                //取消冒泡
                event.stopPropagation();
            });
WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html
@@ -1448,13 +1448,7 @@
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
                                    if (linterid == undefined) {
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        location.reload();
                                    }
                                    else {
                                        location.reload();
                                    }
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                });
                            }
                            else {