MES-WEB-LayUI.git

parent: dade29e2 | 补丁 | 提交 | ignore whitespace

yusijie

2022-11-30 2ef6ca3c8309ae7413c58693552fcc5228ff129f

销售订单

2个文件已添加

3个文件已修改

	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_SellStyle.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_SettleStyle.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html	387 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -111,6 +111,8 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_SellStyle.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_SettleStyle.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceListNew.html" />

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

New file
@@ -0,0 +1,103 @@
ï»¿<!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.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">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>-->
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetSellStyleValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', title: 'éå®æ¹å¼ID', hide: true }
                , { field: 'HNumber', title: 'éå®æ¹å¼ä»£ç ' }
                , { field: 'HName', title: 'éå®æ¹å¼åç§°', sort: true }
              ]]
              , page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetSellStyleList_Json",
                    async: true,
                    data: { "SellStyle": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

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

New file
@@ -0,0 +1,103 @@
ï»¿<!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.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">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>-->
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetSettleStyleValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', title: 'ç»ç®æ¹å¼ID', hide: true }
                , { field: 'HNumber', title: 'ç»ç®æ¹å¼ä»£ç ' }
                , { field: 'HName', title: 'ç»ç®æ¹å¼åç§°', sort: true }
              ]]
              , page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetSettleStyleList_Json",
                    async: true,
                    data: { "SettleStyle": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -76,10 +76,10 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">è¾å©åæ®µ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
                                            </div>
                                        </div>
                                       


                                    </div>
                                    <div class="layui-row">
@@ -93,7 +93,7 @@
                                            <label class="layui-form-label">é¨é¨</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -103,13 +103,13 @@
                                            <label class="layui-form-label">å®¢æ·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                      


                                    </div>
                                    <div class="layui-row">
@@ -117,7 +117,7 @@
                                            <label class="layui-form-label">ä¸å¡å</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -127,7 +127,7 @@
                                            <label class="layui-form-label">å¸å«</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -136,19 +136,16 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ±ç</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
                                            </div>
                                        </div>
                                    

                                    </div>

                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ä¸»ç®¡</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -158,7 +155,7 @@
                                            <label class="layui-form-label">éå®æ¹å¼</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -168,21 +165,14 @@
                                            <label class="layui-form-label">ç»ç®æ¹å¼</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ç»ç®æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                       
                                    </div>
                                    <div class="layui-row">
                                    <!--<div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">èç³»äºº</label>
                                            <div class="layui-input-inline">
@@ -196,8 +186,14 @@
                                                <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    </div>-->
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ç»ç®æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs7 layui-inline">
                                            <label class="layui-form-label">å¤æ³¨</label>
                                            <div class="layui-input-block">
@@ -287,13 +283,13 @@

                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <!--<div class="layui-btn-container">

                        <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>

                        </div>-->
                            <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>
@@ -301,6 +297,9 @@
            </div>
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
    </script>

    <script>
        //#region æå æ³¨é
@@ -324,6 +323,7 @@
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var allVal;
            //#endregion


@@ -334,31 +334,9 @@

            //è·åé¡µé¢è·³è½¬åæ°
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//æä½ç±»å
            } else {
                var OperationType = params[params[0]];//æä½ç±»å
                var linterid = params[params[1]];//æºåid
                var HSouceBillType = params[params[2]];//æºåç±»å
            }
            //å¤ææä½ç±»å
            if (OperationType == 1) {//æ æºåæ°å¢
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//ç¼è¾
                $("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
                //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
                RoadBillMain(linterid);
            }
            else if (OperationType == 4) {//æµè§
                $("#HItemID").val(linterid);//
                //ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
            }
            else {
                layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
            }
            var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å  1æ·»å  ä¿å  2å¤å¶  3 ç¼è¾
            var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç 
            
            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);

            //å¤ææ¯å¦æ°å¢
@@ -373,18 +351,67 @@
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HSSDate").val(shijian);
                        $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼
                    }
                });
            }
            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(HInterID);
                /* RoadBillSub(linterid);*/
            } else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                $("#HInterID").val(linterid);
                RoadBillMain(linterid);
            }
            //#endregion

            var rowdata = [{
                "HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "æ°é": "", "HRemark": ""
                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
            }];

             // åå§åç
            set_InitGrid();

            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                //æ°å¢è¡è¡¨æ ¼æ°æ®
                var NewRow = {
                    "HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "æ°é": "", "HRemark": ""
                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "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(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

@@ -424,10 +451,16 @@
                get_checkManager();
            });

          

            //ä¿åæé®
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });

            //è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //è¡åå é¤
                set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
            });

            //#endregion
@@ -459,12 +492,47 @@
            }
            //#endregion

            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: 'HMaterID', title: 'HMaterID', width: 100,hide: true }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150,edit: 'text', event: "HMaterID" }//f7
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°' ,width: 150,}
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100,}
                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
                        , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100,edit: 'text', event: "HUnitID" }//f7
                        , { field: 'HQty', title: 'æ°é', width: 100,edit: 'text' }
                        , { field: 'HPrice', title: 'ä¸å«ç¨åä»·', width: 100,edit: 'text' }
                        , { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text' }
                        , { field: 'HMoney', title: 'éé¢', width: 100,edit: 'text' }
                        , { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text' }
                        , { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·' ,width: 110,}
                        , { field: 'HTaxRate', title: 'ç¨ç', width: 100,edit: 'text' }
                        , { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, }
                        , { field: 'HlineTotal', title: 'ä»·ç¨åè®¡', width: 100, }
                        , { field: 'HlineTotalBB', title: 'æ¬ä½å¸ä»·ç¨åè®¡', width: 120, }
                        , { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                    ]]
                }

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

            //#region å è½½è¡¨å¤´
            function RoadBillMain(linterid) {
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Xs_SeOrderBill/cx",
                    url: GetWEBURL() + "/Xs_SeOrderBill/cx",
                    type: "GET",
                    data: {
                        "HInterID": linterid
@@ -472,12 +540,13 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data[0];
                            allVal = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HSSDate": formatDate(data.ç»ç®æ¥æ)
                                //, "HInnerBillNo": data.åé¨åæ®å·
                                , "HAddress": data.äº¤è´§å°ç¹
                                , "HAddress": data.äº¤è´§å°å
                                , "HDeptName": data.é¨é¨
                                , "HDeptID": data.HDeptID
                                , "HCusID": data.HCusID
@@ -496,7 +565,7 @@
                                , "HLinkMan": data.èç³»äºº
                                , "HLinkPhone": data.èç³»çµè¯
                                , "HInnerBillNo": data.è¾å©åæ®µ
                                , "HRemark": data.è¡¨å¤´å¤æ³¨            
                                , "HRemark": data.è¡¨å¤´å¤æ³¨
                                , "HMaker": data.å¶åäºº
                                , "HChecker": data.å®¡æ ¸äºº
                                , "HCloseMan": data.å³éäºº
@@ -506,6 +575,25 @@
                                , "HUpDateDate": data.ä¿®æ¹æ¥æ
                                , "HDeleteDate": data.ä½åºæ¥æ
                            });

                            //åè¡¨  èµå¼
                            var rowdata = [];
                            for (var i = 0; i < 1; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": data.HMaterID, "ç©æä»£ç ": data.ç©æä»£ç , "ç©æåç§°": data.ç©æåç§°
                                        , "è§æ ¼åå·": data.è§æ ¼åå·, "HUnitID": data.HUnitID
                                        , "è®¡éåä½": data.è®¡éåä½, "HQty": data.æ°é, "HRemark": data.è¡¨ä½å¤æ³¨
                                        , "HPrice": data.åä»·, "HMoney": data.éé¢, "HTaxRate": data.ç¨ç
                                        , "HTaxMoney": data.éé¢ * data.ç¨ç, "HlineTotal": data.éé¢ + data.ç¨é¢, "HlineTotalBB": (data.éé¢ + data.ç¨é¢)* data.æ±ç
                                        , "HTaxPrice": data.å«ç¨åä»·, "HDiscountRate": data.ææ£ç, "HRelTaxPrice": data.å®éå«ç¨åä»·
                                    }
                                )
                            }
                            option.data = rowdata;
                            table.render(option);
                            form.render('select');

                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -518,27 +606,36 @@
                });
            }
            //#endregion
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {

                var sMainStr = JSON.stringify(data.field)+";" + sessionStorage["HUserName"];
             
                //var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                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 sAllStr = JSON.stringify(allVal);
                //var hentryid = linteridSub;//åè¡¨ æåºid
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;

                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    url: GetWEBURL() + "Xs_SeOrder/SeOrderBillEdit", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr },
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);

                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            //ä¿ååæµè§
                            //ReRoadBillMain();
                        }
@@ -554,6 +651,96 @@
                });
            }
            //#endregion

            //è¡åå¿«æ·é®çé
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        //ç©æ
                        if (obj.event == "HMaterID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                                , title: "ç©æåè¡¨"  //æ é¢
                                , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                                , shift: 2 //å¼¹åºå¨ç»
                                , area: ["90%", "90%"] //çªä½å¤§å°
                                , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.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({
                                        "HMaterID": checkStatus.data[0].HItemID
                                        , "ç©æä»£ç ": checkStatus.data[0].HNumber
                                        , "ç©æåç§°": checkStatus.data[0].HName
                                        , "è§æ ¼åå·": checkStatus.data[0].HModel
                                    })
                                    layer.close(index);//å³éå¼¹çª
                                }
                            })
                        }
                        //è®¡éåä½
                        if (obj.event == "HUnitID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                                , title: "è®¡éåä½åè¡¨"  //æ é¢
                                , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                                , shift: 2 //å¼¹åºå¨ç»
                                , area: ["90%", "90%"] //çªä½å¤§å°
                                , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ['../../Baseset/åºç¡èµæ/Gy_UnitList.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({
                                        "è®¡éåä½": checkStatus.data[0].HName
                                        , "HUnitID": checkStatus.data[0].HItemID
                                    })
                                    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 get_checkEmp() {
                layer.open({
@@ -599,7 +786,7 @@
                    , btn2: function (index, layero) { }
                })
            }
           

            function get_checkCur() {
                layer.open({
                    type: 2//å¼¹çªç±»å
@@ -615,14 +802,14 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HCurName").val(checkStatus.data[0].å¸å«);
                        $("#HCurName").val(checkStatus.data[0].è´§å¸åç§°);
                        $("#HCurID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }
         

            function get_checkDept() {
                layer.open({
                    type: 2//å¼¹çªç±»å
@@ -645,7 +832,7 @@
                    , btn2: function (index, layero) { }
                })
            }
         

            function get_checkManager() {
                layer.open({
                    type: 2//å¼¹çªç±»å
@@ -669,6 +856,52 @@
                })
            }

            function get_checkSellS() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'éå®æ¹å¼åè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_SellStyle.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HSellSName").val(checkStatus.data[0].HName);
                        $("#HSellSID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }
            
            function get_checkSS() {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'ç»ç®æ¹å¼åè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_SettleStyle.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HSSName").val(checkStatus.data[0].HName);
                        $("#HSSID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //#region ä¿ååæµè§æ¹æ³
            function ReRoadBillMain() {
                location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -360,8 +360,8 @@
                            layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                                    data: { "HInterID": InterID },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

			@@ -111,6 +111,8 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckProjectListView.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingBillList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingGroup.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_SellStyle.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_SettleStyle.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceListNew.html" />

New file
			@@ -0,0 +1,103 @@
			ï»¿<!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.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">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>-->
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {//éæ©ä»åº
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			RoadQuery($('#Value').val());
			});
			form.on('submit(FH)', function () {//éæ©ä»åº
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			parent.GetSellStyleValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val());
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'HItemID', title: 'éå®æ¹å¼ID', hide: true }
			, { field: 'HNumber', title: 'éå®æ¹å¼ä»£ç ' }
			, { field: 'HName', title: 'éå®æ¹å¼åç§°', sort: true }
			]]
			, page: true
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where) {
			var Value = Where;
			if (Value == null) {
			Value = '';
			}
			$.ajax({
			type: "get",
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
			url: GetWEBURL() + "/Web/GetSellStyleList_Json",
			async: true,
			data: { "SellStyle": Value },
			//data: { "Value": Value },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -360,8 +360,8 @@
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {