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

yangle

2023-02-27 274af502975f34000a278d6d55ebceba80fe39b8

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

 WebTM/WebTM.csproj

@@ -223,6 +223,8 @@
    <Content Include="views\基础资料\基础资料\Gy_SettleStyleEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Staff.html" />
    <Content Include="views\基础资料\基础资料\Gy_StaffEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxMIX.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxMIXEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionList.html" />

 WebTM/views/index.html

@@ -959,6 +959,7 @@
                                        <dd><a lay-href="基础资料/基础资料/Gy_Staff.html">员工列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_MouldStatus.html">器具状态列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_EquipStatus.html">设备状态列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_TaxMIX.html">税组合列表</a></dd>
                                    </dl>
                                </dd>
                                <dd>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_PaymentConditionList.html

@@ -32,18 +32,27 @@
                                <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="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
                                        <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
                                            <option value="未检测">未检测</option>
                                            <option value="未使用" selected>未使用</option>
                                            <option value="已使用">已使用</option>
                                        </select>
                                    </div>
                                   

                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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">重置</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">付款条件代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
                get_FastQuery();
            });
            //#endregion

            //#region é‡æ–°åŒæ­¥æŒ‰é’®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
             //#endregion

            //#endregion

@@ -316,6 +331,34 @@
            }
            //#endregion

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
                $.ajax({
                    url: GetWEBURL() + '/Gy_PaymentCondition/Gy_PaymentConditionViewApi',
                    type: "GET",
                    data: { "Number": HNumber2, "Type": 'FKTJ' },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SettleStyle.html

@@ -39,6 +39,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">重置</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">结算方式代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
@@ -164,6 +173,12 @@
                get_FastQuery();
            });
            //#endregion

            //#region é‡æ–°åŒæ­¥æŒ‰é’®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
             //#endregion

            //#endregion

@@ -311,6 +326,34 @@
            }
            //#endregion

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
                $.ajax({
                    url: GetWEBURL() + '/Gy_SettleStyle/Gy_SettleStyleViewApi',
                    type: "GET",
                    data: { "Number": HNumber2, "Type": 'JSFS' },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockStatusList.html

@@ -32,18 +32,27 @@
                                <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="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
                                        <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
                                            <option value="未检测">未检测</option>
                                            <option value="未使用" selected>未使用</option>
                                            <option value="已使用">已使用</option>
                                        </select>
                                    </div>
                                   

                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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">重置</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">库存状态代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
                get_FastQuery();
            });
            //#endregion

            //#region é‡æ–°åŒæ­¥æŒ‰é’®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
             //#endregion

            //#endregion

@@ -316,6 +331,34 @@
            }
            //#endregion

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
                $.ajax({
                    url: GetWEBURL() + '/Gy_StockStatus/Gy_StockStatusViewApi',
                    type: "GET",
                    data: { "Number": HNumber2, "Type": 'KCZT' },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_TaxMIX.html

New file
@@ -0,0 +1,602 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>税组合列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </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="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
                                            <option value="未检测">未检测</option>
                                            <option value="未使用" selected>未使用</option>
                                            <option value="已使用">已使用</option>
                                        </select>
                                    </div>

                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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">重置</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">税组合代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">过滤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">包含</option>
                                                    <option value="8">左包含</option>
                                                    <option value="9">右包含</option>
                                                    <option value="10">不包含</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <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-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <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>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
            var sWhere = "";

            var option = [];
            var Organization = sessionStorage["Organization"];
            var HModName = "Gy_Work";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "父级ID","短代码","父级","等级","部门ID"];
            //#endregion

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

            //初始化界面
            set_ClearBill();

            //#endregion

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

            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增按钮
                    case 'btn-Add':
                        set_AddNew();
                        break;
                    case 'btn-Edit':
                        set_ShowBill();
                        break;
                    case 'btn-Delete':
                        set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'btn-Close':
                        parent.layui.admin.events.closeThisTabs();
                        break;
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //#endregion

            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion

            //#region é‡æ–°åŒæ­¥æŒ‰é’®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
             //#endregion

            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法

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

            //#region åˆå§‹åŒ–表格方法
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 500
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                };
            }
            //#endregion

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HUseFlag").val("未使用");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
            }
            //#endregion

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_TaxMIX/TaxMIXList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HUseFlag = $("#HUseFlag").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HNumber) {
                    sWhere += " and ç¨Žç»„合代码 like '%" + HNumber + "%'";
                }
                if (HUseFlag) {
                    sWhere += " and ä½¿ç”¨çŠ¶æ€ like '%" + HUseFlag + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
                $.ajax({
                    url: GetWEBURL() + '/Gy_TaxMIX/Gy_TaxMIXViewApi',
                    type: "GET",
                    data: { "Number": HNumber2, "Type": 'SZH' },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //#region é€»è¾‘删除方法
                        $.ajax({
                            url: GetWEBURL() + 'Gy_TaxMIX/Delete',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                //修改为功后刷新界面
                                get_Display(sWhere);
                                //get_FastQuery(table, option);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        //关闭当前frame
                                        layer.close(wait);
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                }
            }
            //#endregion
            //#endregion

            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增税组合',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../基础资料/Gy_TaxMIXEdit.html',
                    end: function () {
                        //刷新页面,
                        get_Display(sWhere);
                        //get_FastQuery(table, option);
                    },
                    success: function (layero, index) {

                    }
                });
            }
            //#endregion

            //#region ç¼–辑单据
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑税组合'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../基础资料/Gy_TaxMIXEdit.html?hID=' + hID
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                        , end: function () {
                            //刷新页面,
                            get_Display(sWhere);
                            //get_FastQuery(table, option);
                        }
                    })

                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                           /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion
        });
            //#endregion
    </script>

</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_TaxMIXEdit.html

New file
@@ -0,0 +1,447 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>新增/编辑税组合</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <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>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
        }

        .layui-form-item .layui-input-inline {
            width: 50%;
        }

        .layui-inline {
            width: 290px;
        }

        .layui-form-item .layui-inline {
            margin-right: 0px;
        }
    </style>
</head>
<body>
    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="Saver" 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>
                            </div>
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <ul class="layui-tab-title">
                                    <li class="layui-this">基本信息</li>
                                </ul>
                                <h1 style="text-align:center;"><b>税组合</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item" style="padding-top: 10px;">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">代码</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                        <input id="HItemID" name="HItemID" value="0" type="hidden" />
                                                        <input id="HMakeEmp" name="HMakeEmp" value="" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;">名称</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HName" id="HName">
                                                    </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;">
                                                        <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                            <!--动态渲染组织-->
                                                        </select>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å¤‡æ³¨ï¼š</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HRemark" id="HRemark">
                                                    </div>

                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">禁用标志：</label>
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否禁用">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>

                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
                    </form>
                </div>
            </div>
        </div>
        <script type="text/html" id="barDemo">
            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
        </script>
    </div>
</body>
</html>

<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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

        //#endregion

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

        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
        var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码

        //判断是否新增
        if (linterid == null || linterid == 0) {

        }
        else {//如果修改则走下面 new
            //禁用组织选项
            $("#HUSEORGID").attr("disabled", true);
            RoadBillMain(linterid);
        }

        set_ClearBill();

        //#endregion

        var rowdata = [{
            "HTAXBENCHMARK": "", "FTAXRATEID": 0,"税率代码": "","税率名称": "","FTAXBENCHMARKCORRVALUE ": 0
        }];

        // åˆå§‹åŒ–ç•Œ
        set_InitGrid();

        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            //新增行表格数据
            var NewRow = {
                "HTAXBENCHMARK": "", "FTAXRATEID": 0,"税率代码": "", "税率名称": "","FTAXBENCHMARKCORRVALUE": 0
            };
            switch (obj.event) {
                case 'btn-AddLine':
                    table.cache["mainTable"].push(NewRow);
                    option.data = table.cache["mainTable"];

                    table.render(option);
                    //刷新复选框
                    //checkRefresh();
                    break;
                case 'btn-CopyLine':
                    var copydata = JSON.stringify(data);
                    if (data.length <= 0) {
                        layer.msg("请选择需要复制的一行！");
                    }
                    else if (data.length > 1) {
                        layer.msg("只能选择复制一行！");
                    }
                    else {
                        var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                        var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                        table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        table.render(option);//将数据渲染到表格上
                        //刷新复选框
                        //checkRefresh();
                    }
                    break;
                ////列设置
                //case 'set_HideColumn':
                //    get_HideColumn();
                //    break;
            }
        });

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

        //保存提交
        form.on('submit(Saver)', function (data) {//提交
            set_AddNew(data);
        });

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

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj); //行内快捷键筛选

            var data = obj.data;
            if (obj.event == 'HDate') {
                var field = $(this).data('field');
                laydate.render({
                    elem: this.firstChild
                    , show: true //直接显示
                    , closeStop: this
                    , done: function (nowDate) {
                        //时间选择完成，行数据更新
                        data[field] = nowDate;
                        obj.update(data);
                        //刷新复选框
                        //checkRefresh();
                    }
                });
            }
        });
        //#endregion

        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法

        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            Organ();
            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
            $("#HMakeEmp").val(sessionStorage["HUserName"]);
        }

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

        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , limit: 500
                , height: 500
                , loading: false
                , cols: [[ //子表
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                    , { field: 'HTAXBENCHMARK', title: '应纳税额基准', edit: true }
                    , { field: 'FTAXRATEID', title: 'FTAXRATEID ', hide: true, edit: true }
                    , { field: '税率代码', title: '税率代码', edit: true, event: "FTAXRATEID"}                  
                    , { field: '税率名称', title: '税率名称', edit: true }                  
                    , { field: 'FTAXBENCHMARKCORRVALUE', title: '应纳税额基准修正值', edit: true }                  
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                ]]
            }

            option.data = rowdata;
            table.render(option);
        }

        //保存HMaker
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];  

            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_TaxMIX/TaxMIXEdit",
                async: true,
                data: { "msg": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                        layer.close(index);
                        layer.msg("提交成功");
                    }
                    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: "温馨提示" });
                }
            });
        }

        //编辑 é¡µé¢èµ‹å€¼
        function RoadBillMain(linterid)//加载表头
        {
            var sWhere = " and HItemID='" + linterid + "'";
            $.ajax({
                url: GetWEBURL() + "/Gy_TaxMIX/TaxMIXList",
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
                success: function (d) {
                    var IsHStopflag = d.data[0].禁用标记;
                    if (IsHStopflag == 'Y') {
                        $("input[name='HStopflag']").prop("checked", true);
                    } else {
                        d.data[0].禁用标记 = '';
                    }
                    //主表
                    form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                        "HItemID": d.data[0].HItemID
                        , "HNumber": d.data[0].税组合代码
                        , "HName": d.data[0].税组合名称
                        , "HCREATEORGID": d.data[0].HCREATEORGID
                        , "HUSEORGID": d.data[0].HUSEORGID
                        , "HStopflag": d.data[0].禁用标记
                        , "HRemark": d.data[0].备注                      
                    });
                    form.render('checkbox');
                    form.render('select');
                }
            })
        }

        //行内快捷键筛选
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //物料
                    if (obj.event == "FTAXRATEID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "税率列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ['../../基础资料/基础资料/Gy_TaxRateList.html', 'yes']
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }

                                //更新表格缓存的数据
                                obj.update({
                                    "FTAXRATEID": checkStatus.data[0].HItemID
                                    , "税率代码": checkStatus.data[0].代码
                                    , "税率名称": checkStatus.data[0].名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
  
                    obj.event = "";
                    return false;
                }
            })
        }

        //行内删除
        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 {
                        obj.del();
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        table.reload(option);
                        layer.close(index);
                    }
                });
            }
        }

        //获取参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }

        //#endregion

    });
</script>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_TaxRateList.html

@@ -32,18 +32,27 @@
                                <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="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
                                        <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
                                            <option value="未检测">未检测</option>
                                            <option value="未使用" selected>未使用</option>
                                            <option value="已使用">已使用</option>
                                        </select>
                                    </div>
                                   

                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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">重置</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">税率代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
                get_FastQuery();
            });
            //#endregion

            //#region é‡æ–°åŒæ­¥æŒ‰é’®
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
             //#endregion

            //#endregion

@@ -316,6 +331,34 @@
            }
            //#endregion

            //重新同步按钮
            function set_ResCnz() {
                var HNumber2 = $('#HNumber2').val();
                $.ajax({
                    url: GetWEBURL() + '/Gy_TaxRate/Gy_TaxRateViewApi',
                    type: "GET",
                    data: { "Number": HNumber2, "Type": 'SL' },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -350,8 +350,18 @@
                    , { field: '物料名称', title: '物料名称', width: 130 }
                    , { field: '数量', title: '订单数量', width: 100 }
                    , { field: '打印条码数量', title: '打印条码数量', width: 120 }
                    /* å®‰ç‘žæ–°å¢žå­—段 begin */                   
                    , { field: '可打印条码数量', title: '可打印条码数量', width: 120 }
                    /* å®‰ç‘žæ–°å¢žå­—段 end */
                    , { field: '关联数量', title: '已发货数量', width: 120 }
                    , { field: '未关联数量', title: '未已发货数量', width: 120 }
                    , { field: '未关联数量', title: '可发货数量', width: 120 }
                    /* å®‰ç‘žæ–°å¢žå­—段 begin */
                    , { field: '退料数量', title: '退料数量', width: 120 }
                    , { field: '实收数量', title: '实收数量', width: 120 }
                    , { field: '入库数量', title: '入库数量', width: 120 }
                    , { field: '剩余入库数量', title: '剩余入库数量', width: 120 }
                    , { field: '剩余收料数量', title: '剩余收料数量', width: 120 }
                    /* å®‰ç‘žæ–°å¢žå­—段 end */
                    , { field: '完成状态', title: '完成状态', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '规格型号', title: '规格型号', width: 100 }