1

duhe

2024-03-11 8dc28871e65261d716f0f05aa105a39fbd9dc3a2

1

 WebTM/WebTM.csproj

@@ -404,6 +404,7 @@
    <Content Include="views\模治具管理\模治具管理\Gy_SplitBarCode.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MaterialMouldBillMainList.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\工单\Sc_CurrentTicket.html" />
    <Content Include="views\生产管理\工单\Sc_MyTicketList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />

 WebTM/views/IpadIndex.html

@@ -575,8 +575,7 @@
            }
            return result;
        }


               
        //开工按钮点击事件
        function OpenWork(event, obj) {
            if (wktag == 0) {
@@ -983,6 +982,27 @@
            })
        }

        //当前工单按钮点击事件
        function CurrentStatus(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '当前工单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/工单/Sc_CurrentTicket.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

                }                
            });
        }

        //退出
        function Esc(event, obj) {
            parent.location.href = "index.html"
@@ -1124,13 +1144,13 @@
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10" style="display:none;">
                            <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)" >
                            <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-pause imgicon"></span>
                                    <span class="imgtitle">快速开工</span>
                                </div>
                            </div>
                           

                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
@@ -1198,6 +1218,14 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="CurrentStatus(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-console imgicon"></span>
                                    <span class="imgtitle">当前状态</span>
                                </div>
                            </div>
                        </div>
                    </div>
                </fieldset>
            </div>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_AreaSet.html

@@ -35,7 +35,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off" readonly>
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
@@ -138,6 +138,9 @@
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();

                //自动生成流水号
                CreateNumber();
            }
            else if (OperationType == 3) {//编辑
                set_EditFromGrid();
@@ -214,7 +217,7 @@
            //无源单新增
            function set_AddFNew() {
                $("#HItemID").val("0");
                $("#HNumber").val("");
              
            }
            //编辑
            function set_EditFromGrid() {
@@ -278,6 +281,23 @@
                    }
                })
            }

            //#region ç”Ÿæˆæµæ°´å·
            function CreateNumber() {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumber",
                    async: false,
                    type: "GET",
                    //第一个参数:当前列表名称的每个字的首字母  ç¬¬äºŒä¸ª:插入动态列表的列表名称,要存入数据库  ç¬¬ä¸‰ä¸ª:当前列表的表名,要存入数据库
                    data: { "HBillType": 'DQ', "HName": '地区', "TableName":'Gy_AreaSet'},   //根据 HName çš„值去查当前流水号
                    success: function (d) {
                        $("#HNumber").val(d.data[0].HNumber);
                       
                    }
                });
            }
            //#endregion

            //#endregion
        });


 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html

@@ -891,17 +891,17 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function () {

                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                       
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {

 WebTM/views/Éú²ú¹ÜÀí/¹¤µ¥/Sc_CurrentTicket.html

New file
@@ -0,0 +1,549 @@
<!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>
    <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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/echarts.min.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 id="top" style="width:100%;height:calc(44vh);">
                            <div id="top-left" style="width:49.8%;height:calc(44vh);float:left;">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">设备</span></label>                    
                                </div>
                                <div>
                                    <img src="../../../layuiadmin/layui/images/device.png" onerror="javascript:this.src='../../../layuiadmin/layui/images/erro.png';this.onerror = null" style="width:20%;height:calc(35vh);float:left" />
                                    <div style="float:left;margin-left:5%;">
                                        <dl>
                                            <dd>
                                                <h2><span>设备名称</span></h2>
                                                <h3><span>设备编号</span></h3>
                                                <h3><span>设备状态</span></h3>
                                                <h3><span>运行时间</span></h3>
                                            </dd>
                                        </dl>                                        
                                    </div>
                                </div>
                            </div>
                            <div id="top-right" style="width:49.8%;height:calc(44vh);float:left;margin-left:0.2%;">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">工单</span></label>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">å·¥&nbsp;&nbsp;单&nbsp;&nbsp;号</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">当前状态</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">产品名称</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">计划数量</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">产品代码</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">汇报总数</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">领料状态</label>
                                        <span>aaaaaaa</span>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div id="center" style="width: 100%;height:calc(44vh);margin-top:1%;">
                            <div id="center-left" style="width:49.8%;height:calc(44vh);float:left;">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">人员</span></label>
                                </div>
                                <div style="margin-left:25%;">
                                    <dl>
                                        <dd>
                                            <h2><span>部门</span></h2>
                                            <h3><span>班组</span></h3>
                                            <h3><span>操作员</span></h3>
                                            <h3><span>负责人</span></h3>
                                        </dd>
                                    </dl>
                                </div>
                            </div>
                            <div id="center-right" style="width:49.8%;height:calc(44vh);float:left;margin-left:0.2%;">
                                <div id="chart1" style="width: 40%;height: calc(40vh);left: 2%;float:left;"></div>
                                <div id="chart2" style="width: 40%;height: calc(40vh);left: 2%;float:left;"></div>
                            </div>
                        </div>
                        <div id="bottom" style="width: 100%;height:calc(7vh);">
                            <div class="layui-form-item" style="text-align: center;">
                                <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">保存</button>
                                <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">新增</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
            var sWhere = "";        
            //#endregion

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

            var HModName = "Sc_CurrentTicket";
            //不需要显示的字段 å¯æ‰©å±• 
            var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","源单子内码","源单类型","单据类型"];
            //初始化界面
            set_ClearBill();
            //#endregion

            //#region ã€ä»ªè¡¨ç›˜ã€‘
            var chart1 = echarts.init(document.getElementById("chart1"));

            var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];

            var data1 = [{
                name: "完成率",
                value: 55.55,
            }];

            // æŒ‡å®šå›¾è¡¨çš„配置项和数据
            var option = {
                //backgroundColor: "#000",
                tooltip: {                // æœ¬ç³»åˆ—特定的 tooltip è®¾å®šã€‚	
                    show: true,
                    formatter: "{b}：{c}%",
                    backgroundColor: "rgba(50,50,50,0.7)",    // æç¤ºæ¡†æµ®å±‚的背景颜色。注意：series.tooltip ä»…在 tooltip.trigger ä¸º 'item' æ—¶æœ‰æ•ˆã€‚
                    borderColor: "#333",        // æç¤ºæ¡†æµ®å±‚的边框颜色。...
                    borderWidth: 0,                // æç¤ºæ¡†æµ®å±‚的边框宽。...
                    padding: 5,                    // æç¤ºæ¡†æµ®å±‚内边距，单位px，默认各方向内边距为5，接受数组分别设定上右下左边距。...
                    textStyle: {                // æç¤ºæ¡†æµ®å±‚的文本样式。...
                        // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
                    },
                },
                series: [
                    {
                        name: "单仪表盘示例",        // ç³»åˆ—名称,用于tooltip的显示，legend çš„图例筛选，在 setOption æ›´æ–°æ•°æ®å’Œé…ç½®é¡¹æ—¶ç”¨äºŽæŒ‡å®šå¯¹åº”的系列。
                        type: "gauge",            // ç³»åˆ—类型
                        radius: "80%",            // å‚æ•°:number, string。 ä»ªè¡¨ç›˜åŠå¾„,默认 75% ï¼Œå¯ä»¥æ˜¯ç›¸å¯¹äºŽå®¹å™¨é«˜å®½ä¸­è¾ƒå°çš„一项的一半的百分比，也可以是绝对的数值。
                        center: ["50%", "55%"],    // ä»ªè¡¨ç›˜ä½ç½®(圆心坐标)
                        startAngle: 225,        // ä»ªè¡¨ç›˜èµ·å§‹è§’度,默认 225。圆心 æ­£å³æ‰‹ä¾§ä¸º0度，正上方为90度，正左手侧为180度。
                        endAngle: -45,            // ä»ªè¡¨ç›˜ç»“束角度,默认 -45
                        clockwise: true,        // ä»ªè¡¨ç›˜åˆ»åº¦æ˜¯å¦æ˜¯é¡ºæ—¶é’ˆå¢žé•¿,默认 true。
                        min: 0,                    // æœ€å°çš„数据值,默认 0 ã€‚映射到 minAngle。
                        max: 100,                // æœ€å¤§çš„数据值,默认 100 ã€‚映射到 maxAngle。
                        splitNumber: 10,        // ä»ªè¡¨ç›˜åˆ»åº¦çš„分割段数,默认 10。
                        axisLine: {                // ä»ªè¡¨ç›˜è½´çº¿(轮廓线)相关配置。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºä»ªè¡¨ç›˜è½´çº¿(轮廓线),默认 true。
                            lineStyle: {            // ä»ªè¡¨ç›˜è½´çº¿æ ·å¼ã€‚
                                color: colorTemplate1,     //仪表盘的轴线可以被分成不同颜色的多段。每段的  ç»“束位置(范围是[0,1]) å’Œ  é¢œè‰²  å¯ä»¥é€šè¿‡ä¸€ä¸ªæ•°ç»„来表示。默认取值：[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 30,                    //轴线宽度,默认 30。
                                shadowBlur: 20,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            }
                        },
                        splitLine: {            // åˆ†éš”线样式。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºåˆ†éš”线,默认 true。
                            length: 30,                // åˆ†éš”线线长。支持相对半径的百分比,默认 30。
                            lineStyle: {            // åˆ†éš”线样式。
                                color: "#eee",                //线的颜色,默认 #eee。
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 2,                    //线度,默认 2。
                                type: "solid",                //线的类型,默认 solid。 æ­¤å¤–还有 dashed,dotted
                                shadowBlur: 10,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            }
                        },
                        axisTick: {                // åˆ»åº¦(线)样式。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºåˆ»åº¦(线),默认 true。
                            splitNumber: 5,            // åˆ†éš”线之间分割的刻度数,默认 5。
                            length: 8,                // åˆ»åº¦çº¿é•¿ã€‚支持相对半径的百分比,默认 8。
                            lineStyle: {            // åˆ»åº¦çº¿æ ·å¼ã€‚	
                                color: "#eee",                //线的颜色,默认 #eee。
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 1,                    //线度,默认 1。
                                type: "solid",                //线的类型,默认 solid。 æ­¤å¤–还有 dashed,dotted
                                shadowBlur: 10,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            },
                        },
                        axisLabel: {            // åˆ»åº¦æ ‡ç­¾ã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæ ‡ç­¾,默认 true。
                            distance: 5,            // æ ‡ç­¾ä¸Žåˆ»åº¦çº¿çš„距离,默认 5。
                            color: "#1E1E1E",            // æ–‡å­—的颜色,默认 #fff。
                            fontSize: 9,            // æ–‡å­—的字体大小,默认 5。
                            formatter: "{value}",    // åˆ»åº¦æ ‡ç­¾çš„内容格式器，支持字符串模板和回调函数两种形式。 ç¤ºä¾‹:// ä½¿ç”¨å­—符串模板，模板变量为刻度默认标签 {value},如:formatter: '{value} kg'; // ä½¿ç”¨å‡½æ•°æ¨¡æ¿ï¼Œå‡½æ•°å‚数分别为刻度数值,如formatter: function (value) {return value + 'km/h';}
                        },
                        pointer: {                // ä»ªè¡¨ç›˜æŒ‡é’ˆã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæŒ‡é’ˆ,默认 true。
                            length: "70%",            // æŒ‡é’ˆé•¿åº¦ï¼Œå¯ä»¥æ˜¯ç»å¯¹æ•°å€¼ï¼Œä¹Ÿå¯ä»¥æ˜¯ç›¸å¯¹äºŽåŠå¾„的百分比,默认 80%。
                            width: 5,                // æŒ‡é’ˆå®½åº¦,默认 8。
                        },
                        itemStyle: {            // ä»ªè¡¨ç›˜æŒ‡é’ˆæ ·å¼ã€‚
                            color: "auto",            // æŒ‡é’ˆé¢œè‰²ï¼Œé»˜è®¤(auto)取数值所在的区间的颜色
                            opacity: 1,                // å›¾å½¢é€æ˜Žåº¦ã€‚支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                            borderWidth: 0,            // æè¾¹çº¿å®½,默认 0。为 0 æ—¶æ— æè¾¹ã€‚
                            borderType: "solid",    // æŸ±æ¡çš„描边类型，默认为实线，支持 'solid', 'dashed', 'dotted'。
                            borderColor: "#000",    // å›¾å½¢çš„描边颜色,默认 "#000"。支持的颜色格式同 color，不支持回调函数。
                            shadowBlur: 10,            // (发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                            shadowColor: "#fff",    // é˜´å½±é¢œè‰²ã€‚支持的格式同color。
                        },
                        emphasis: {                // é«˜äº®çš„ ä»ªè¡¨ç›˜æŒ‡é’ˆæ ·å¼
                            itemStyle: {
                                //高亮 å’Œæ­£å¸¸  ä¸¤è€…具有同样的配置项,只是在不同状态下配置项的值不同。
                            }
                        },
                        title: {                // ä»ªè¡¨ç›˜æ ‡é¢˜ã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæ ‡é¢˜,默认 true。
                            offsetCenter: [0, "95%"],//相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
                            color: "#1E1E1E",            // æ–‡å­—的颜色,默认 #333。
                            fontSize: 20,            // æ–‡å­—的字体大小,默认 15。
                        },
                        detail: {                // ä»ªè¡¨ç›˜è¯¦æƒ…，用于显示数据。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºè¯¦æƒ…,默认 true。
                            offsetCenter: [0, "70%"],// ç›¸å¯¹äºŽä»ªè¡¨ç›˜ä¸­å¿ƒçš„偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
                            color: "auto",            // æ–‡å­—的颜色,默认 auto。
                            fontSize: 30,            // æ–‡å­—的字体大小,默认 15。
                            formatter: "{value}%",    // æ ¼å¼åŒ–函数或者字符串
                        },
                        data: data1
                    }
                ]
            };
            // ä½¿ç”¨åˆšæŒ‡å®šçš„配置项和数据显示图表
            chart1.setOption(option);


            var chart2 = echarts.init(document.getElementById("chart2"));          

            var data2 = [{
                name: "合格率",
                value: 85,
            }];

            // æŒ‡å®šå›¾è¡¨çš„配置项和数据
            var option2 = {
                //backgroundColor: "#000",
                tooltip: {                // æœ¬ç³»åˆ—特定的 tooltip è®¾å®šã€‚	
                    show: true,
                    formatter: "{b}：{c}%",
                    backgroundColor: "rgba(50,50,50,0.7)",    // æç¤ºæ¡†æµ®å±‚的背景颜色。注意：series.tooltip ä»…在 tooltip.trigger ä¸º 'item' æ—¶æœ‰æ•ˆã€‚
                    borderColor: "#333",        // æç¤ºæ¡†æµ®å±‚的边框颜色。...
                    borderWidth: 0,                // æç¤ºæ¡†æµ®å±‚的边框宽。...
                    padding: 5,                    // æç¤ºæ¡†æµ®å±‚内边距，单位px，默认各方向内边距为5，接受数组分别设定上右下左边距。...
                    textStyle: {                // æç¤ºæ¡†æµ®å±‚的文本样式。...
                        // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
                    },
                },
                series: [
                    {
                        name: "单仪表盘示例",        // ç³»åˆ—名称,用于tooltip的显示，legend çš„图例筛选，在 setOption æ›´æ–°æ•°æ®å’Œé…ç½®é¡¹æ—¶ç”¨äºŽæŒ‡å®šå¯¹åº”的系列。
                        type: "gauge",            // ç³»åˆ—类型
                        radius: "80%",            // å‚æ•°:number, string。 ä»ªè¡¨ç›˜åŠå¾„,默认 75% ï¼Œå¯ä»¥æ˜¯ç›¸å¯¹äºŽå®¹å™¨é«˜å®½ä¸­è¾ƒå°çš„一项的一半的百分比，也可以是绝对的数值。
                        center: ["50%", "55%"],    // ä»ªè¡¨ç›˜ä½ç½®(圆心坐标)
                        startAngle: 225,        // ä»ªè¡¨ç›˜èµ·å§‹è§’度,默认 225。圆心 æ­£å³æ‰‹ä¾§ä¸º0度，正上方为90度，正左手侧为180度。
                        endAngle: -45,            // ä»ªè¡¨ç›˜ç»“束角度,默认 -45
                        clockwise: true,        // ä»ªè¡¨ç›˜åˆ»åº¦æ˜¯å¦æ˜¯é¡ºæ—¶é’ˆå¢žé•¿,默认 true。
                        min: 0,                    // æœ€å°çš„数据值,默认 0 ã€‚映射到 minAngle。
                        max: 100,                // æœ€å¤§çš„数据值,默认 100 ã€‚映射到 maxAngle。
                        splitNumber: 10,        // ä»ªè¡¨ç›˜åˆ»åº¦çš„分割段数,默认 10。
                        axisLine: {                // ä»ªè¡¨ç›˜è½´çº¿(轮廓线)相关配置。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºä»ªè¡¨ç›˜è½´çº¿(轮廓线),默认 true。
                            lineStyle: {            // ä»ªè¡¨ç›˜è½´çº¿æ ·å¼ã€‚
                                color: colorTemplate1,     //仪表盘的轴线可以被分成不同颜色的多段。每段的  ç»“束位置(范围是[0,1]) å’Œ  é¢œè‰²  å¯ä»¥é€šè¿‡ä¸€ä¸ªæ•°ç»„来表示。默认取值：[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 30,                    //轴线宽度,默认 30。
                                shadowBlur: 20,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            }
                        },
                        splitLine: {            // åˆ†éš”线样式。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºåˆ†éš”线,默认 true。
                            length: 30,                // åˆ†éš”线线长。支持相对半径的百分比,默认 30。
                            lineStyle: {            // åˆ†éš”线样式。
                                color: "#eee",                //线的颜色,默认 #eee。
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 2,                    //线度,默认 2。
                                type: "solid",                //线的类型,默认 solid。 æ­¤å¤–还有 dashed,dotted
                                shadowBlur: 10,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            }
                        },
                        axisTick: {                // åˆ»åº¦(线)样式。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºåˆ»åº¦(线),默认 true。
                            splitNumber: 5,            // åˆ†éš”线之间分割的刻度数,默认 5。
                            length: 8,                // åˆ»åº¦çº¿é•¿ã€‚支持相对半径的百分比,默认 8。
                            lineStyle: {            // åˆ»åº¦çº¿æ ·å¼ã€‚	
                                color: "#eee",                //线的颜色,默认 #eee。
                                opacity: 1,                    //图形透明度。支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                                width: 1,                    //线度,默认 1。
                                type: "solid",                //线的类型,默认 solid。 æ­¤å¤–还有 dashed,dotted
                                shadowBlur: 10,                //(发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                                shadowColor: "#fff",        //阴影颜色。支持的格式同color。
                            },
                        },
                        axisLabel: {            // åˆ»åº¦æ ‡ç­¾ã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæ ‡ç­¾,默认 true。
                            distance: 5,            // æ ‡ç­¾ä¸Žåˆ»åº¦çº¿çš„距离,默认 5。
                            color: "#1E1E1E",            // æ–‡å­—的颜色,默认 #fff。
                            fontSize: 9,            // æ–‡å­—的字体大小,默认 5。
                            formatter: "{value}",    // åˆ»åº¦æ ‡ç­¾çš„内容格式器，支持字符串模板和回调函数两种形式。 ç¤ºä¾‹:// ä½¿ç”¨å­—符串模板，模板变量为刻度默认标签 {value},如:formatter: '{value} kg'; // ä½¿ç”¨å‡½æ•°æ¨¡æ¿ï¼Œå‡½æ•°å‚数分别为刻度数值,如formatter: function (value) {return value + 'km/h';}
                        },
                        pointer: {                // ä»ªè¡¨ç›˜æŒ‡é’ˆã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæŒ‡é’ˆ,默认 true。
                            length: "70%",            // æŒ‡é’ˆé•¿åº¦ï¼Œå¯ä»¥æ˜¯ç»å¯¹æ•°å€¼ï¼Œä¹Ÿå¯ä»¥æ˜¯ç›¸å¯¹äºŽåŠå¾„的百分比,默认 80%。
                            width: 5,                // æŒ‡é’ˆå®½åº¦,默认 8。
                        },
                        itemStyle: {            // ä»ªè¡¨ç›˜æŒ‡é’ˆæ ·å¼ã€‚
                            color: "auto",            // æŒ‡é’ˆé¢œè‰²ï¼Œé»˜è®¤(auto)取数值所在的区间的颜色
                            opacity: 1,                // å›¾å½¢é€æ˜Žåº¦ã€‚支持从 0 åˆ° 1 çš„数字，为 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢ã€‚
                            borderWidth: 0,            // æè¾¹çº¿å®½,默认 0。为 0 æ—¶æ— æè¾¹ã€‚
                            borderType: "solid",    // æŸ±æ¡çš„描边类型，默认为实线，支持 'solid', 'dashed', 'dotted'。
                            borderColor: "#000",    // å›¾å½¢çš„描边颜色,默认 "#000"。支持的颜色格式同 color，不支持回调函数。
                            shadowBlur: 10,            // (发光效果)图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY ä¸€èµ·è®¾ç½®å›¾å½¢çš„阴影效果。 
                            shadowColor: "#fff",    // é˜´å½±é¢œè‰²ã€‚支持的格式同color。
                        },
                        emphasis: {                // é«˜äº®çš„ ä»ªè¡¨ç›˜æŒ‡é’ˆæ ·å¼
                            itemStyle: {
                                //高亮 å’Œæ­£å¸¸  ä¸¤è€…具有同样的配置项,只是在不同状态下配置项的值不同。
                            }
                        },
                        title: {                // ä»ªè¡¨ç›˜æ ‡é¢˜ã€‚
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºæ ‡é¢˜,默认 true。
                            offsetCenter: [0, "95%"],//相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
                            color: "#1E1E1E",            // æ–‡å­—的颜色,默认 #333。
                            fontSize: 20,            // æ–‡å­—的字体大小,默认 15。
                        },
                        detail: {                // ä»ªè¡¨ç›˜è¯¦æƒ…，用于显示数据。
                            show: true,                // æ˜¯å¦æ˜¾ç¤ºè¯¦æƒ…,默认 true。
                            offsetCenter: [0, "70%"],// ç›¸å¯¹äºŽä»ªè¡¨ç›˜ä¸­å¿ƒçš„偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
                            color: "auto",            // æ–‡å­—的颜色,默认 auto。
                            fontSize: 30,            // æ–‡å­—的字体大小,默认 15。
                            formatter: "{value}%",    // æ ¼å¼åŒ–函数或者字符串
                        },
                        data: data2
                    }
                ]
            };
            // ä½¿ç”¨åˆšæŒ‡å®šçš„配置项和数据显示图表
            chart2.setOption(option2);

            //#endregion

            //#region å¤´å·¥å…·æ äº‹ä»¶
            //预览
            form.on('submit(btn_view)', function (data) {
                get_print();
            });

            //开工
            form.on('submit(btn_start)', function (data) {
                get_start();
            });

            //汇报
            form.on('submit(btn_report)', function (data) {
                get_report();
            });

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

            //刷新
            form.on('submit(btn_refresh)', function (data) {
                get_Refresh();
            });

            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
            function set_ClearBill() {           
                //查询
                get_FastQuery();
            }

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
           
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + '/Sc_MyTicket/list',
                    type: "GET",
                    async: false,
                    data: { "HSourceID": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
                    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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                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_notStart = {
                                elem: '#mainTable_notStart'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_notStart);
                            ins = table.render(option_notStart);

                            option_finish = {
                                elem: '#mainTable_finish'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill1
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_finish);

                            option_proc = {
                                elem: '#mainTable_proc'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill2
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_proc);

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "我的工单";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //刷新表格数据
                            //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_Refresh() {
                get_FastQuery();
            }
            //#endregion
        
            //以上是layui模块
        });
    </script>
</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -585,8 +585,8 @@
                if (checkStatus.data.length === 1) {
                    console.log(data[0]);
                    var HInterID = data[0].HInterID;
                    var HICMOInID = data[0].HSourceInterID;
                    var HICMOEnID = data[0].HSourceEntryID;
                    var HICMOInID = data[0].HICMOInterID;
                    var HICMOEnID = data[0].HICMOEntryID;
                    var HRelationInterID = data[0].HRelationInterID;    
                    if (HRelationInterID == 1) {
                        layer.msg('单据已报检审核无法修改！');

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -645,15 +645,16 @@
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                           
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -453,7 +453,7 @@
                            "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                            "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                            "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
                            "HSourceBillType": 0
                            "HSourceBillType": 0,"HICMOTempID":0
                        }];
                        table.render(option);
                        //按钮【按钮一】的回调
@@ -484,7 +484,7 @@
                                    table.cache["mainTable"].push({
                                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
                                        "HSourceBillType": 0
                                        "HSourceBillType": 0, "HICMOTempID": 0
                                    });
                                    option.data = table.cache["mainTable"];
                                    table.render(option);
@@ -903,6 +903,7 @@
                    , { field: 'HSourceEntryID', title: '源单子内码', edit: 'text', width: 100, hide: true }
                    , { field: 'HSourceBillNo', title: '源单单号', edit: 'text', width: 100, hide: true }
                    , { field: 'HSourceBillType', title: '源单类型', edit: 'text', width: 100, hide: true }
                    , { field: 'HICMOTempID', title: 'HICMOTempID', edit: 'text', width: 100, hide: true }

                    , { field: 'HRemark', title: '表体备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
@@ -997,7 +998,7 @@
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
                    "HSourceBillType": 0
                    "HSourceBillType": 0,"HICMOTempID":0
                }];
                table.render(option);
            }
@@ -1030,7 +1031,7 @@
                                        "HSourceName": data[i].生产资源名称, "HWorkerid": data[i].操作员ID, "HWorkerCode": data[i].操作员代码,
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量 == '' ? 0 : data[i].不良数量, "HICMOBillNo": data[i].生产订单号,
                                        "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].生产订单号,
                                        "HSourceBillType": 3710
                                        "HSourceBillType": 3710, "HICMOTempID": data[i].HICMOTempID
                                    });
                                }

@@ -1062,7 +1063,7 @@
                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                        "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
                        "HSourceBillType": 0
                        "HSourceBillType": 0, "HICMOTempID": 0
                    }];
                    table.render(option);
                }
@@ -1078,7 +1079,7 @@
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
                    "HSourceBillType": 0
                    "HSourceBillType": 0, "HICMOTempID": 0
                }];
                table.render(option);
            }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -749,6 +749,7 @@
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true });
            columns.push({ field: '规格型号', title: '规格型号', width: 150, sort: true });
@@ -916,7 +917,7 @@
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', width: 150, hide: true });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
           
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -1572,20 +1573,23 @@
                    data: { "sWhere": sWhere },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var HInterID = data.data[0]["HInterID"];
                            if (data.data.length == 0) {
                                return layer.msg("当前物料没有工艺路线!");
                            } else {
                                var HInterID = data.data[0]["HInterID"];

                            layer.open({
                                type: 2
                                , area: ['100%', '100%']
                                , title: '工艺路线-编辑'
                                , shift: 0//弹出动画
                                , content: '../../计划管理/工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
                                , end: function () {
                                    //刷新页面,
                                    //location.reload();
                                }
                            })

                                layer.open({
                                    type: 2
                                    , area: ['100%', '100%']
                                    , title: '工艺路线-编辑'
                                    , shift: 0//弹出动画
                                    , content: '../../计划管理/工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
                                    , end: function () {
                                        //刷新页面,
                                        //location.reload();
                                    }
                                })
                            }
                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/Sc_ShopCalendar.html

@@ -527,7 +527,7 @@
                        if (data.id == "0") {
                            sql = " and æ—¥æœŸ like'%" + HDate + "%'";
                        } else {
                            sql = " and HSourceID='" + data.id + "' and (日期 like'%" + HDate +"%' or  æ—¥æœŸ is null)";
                            sql = " and HSourceID='" + data.id + "' and (日期 like'%" + HDate +"%' or  æ—¥æœŸ is null or  æ—¥æœŸ is not null)";
                        }
                        get_Display(sql);
                    }

 WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦ÊÕµ¥/YS_ReceiveOtherBillMain.html

@@ -15,14 +15,29 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style>
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
    </style>

</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;height :700px">
                    <div style="padding: 2px; ">

                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
@@ -53,7 +68,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">内部单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" >
                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -99,7 +114,7 @@
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                            </div>
                                        </div>   
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -130,19 +145,19 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">不含税金额<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney"  value="0"  autocomplete="off" >
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">税率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate"  value="0"  autocomplete="off" >
                                                <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">总金额<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney"  value="0"  autocomplete="off">
                                                <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -265,10 +280,41 @@
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">项目阶段</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--子表-->
                            <div class="layui-tab-item layui-show">
                                <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>
                                    </div>
                                </script>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <!--子表表：删除-->
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>

    <!--行下拉选择(发票类型)-->
    <script type="text/html" id="HTypeSub">
        <select name="HTypeSub" lay-filter="HTypeSub" id="HTypeSub{{d.LAY_TABLE_INDEX+1}}">
            <option value="普通发票">普通发票</option>
            <option value="增值税发票">增值税发票</option>
            <option value="其他">其他</option>
        </select>
    </script>

    <script>

@@ -307,7 +353,7 @@
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
            //#endregion
            //#endregion

            ColFilter();//发票类型

@@ -324,26 +370,31 @@

                //生成并设置主表的内码和单据号
                createBillNo();
               
                //子表页面初始化
                get_InitGrid();
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
              

            }
            else if (OperationType == 3) {                                                 //编辑

                //子表页面初始化
                get_InitGrid();

                //加载编辑页面
                RoadBillMain(linterid);
            }
            

            //#endregion

            //#region ç»„织初始化
            Organ();
            //#endregion

            

            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
@@ -380,11 +431,214 @@
            });
            //#endregion

            //#region å®¡æ ¸ åå®¡æ ¸
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(0);
            });
            //反审核
            form.on('submit(set_AbandonCheck)', function (data) {
                set_CheckBill(1);
            });
            //#endregion

            //#region å­è¡¨ï¼šå¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                //新增行表格数据
                var NewRow =
                {
                    "HProjectMoneyID": "0"
                    , "HPMoneyName": ""
                    , "HTypeSub": ""
                    , "HMoney": "0"
                    , "HTaxRate": "0"
                    , "HSumMoney": "0"
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
                           
                        }
                        form.render('select');

                        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);//将数据渲染到表格上
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
                               
                            }
                            form.render('select');
                        }
                        break;

                }
            });
            //#endregion

            //#region å­è¡¨ï¼šè¡Œå†…事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选

            });

            //#endregion

            //#region å¤é€‰æ¡†è§¦å‘事件
            //#region ç›‘听单元格编辑  å•å…ƒæ ¼ç¼–辑后 å˜æ›´
            table.on('edit(mainTable)', function (obj) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";

                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段


                switch (field) {
                    case "HMoney":                   //不含税金额
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HMoney: oldText
                            });
                            table.render(option);
                         
                            layer.msg("不含税金额请输入大于0的数字!");
                            return;
                        }


                        //数据校验合格，重算记录
                        var HMoney = value * 1;                           //不含税金额
                        var HTaxRate = obj.data.HTaxRate * 1;           //税率
                        var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //总金额=不含税金额*(1+(税率*0.01))


                        //设置数据小数位数
                        HMoney = dealDoubleToFixed(HMoney, 2);

                        HTaxRate = HTaxRate;
                        HSumMoney = dealDoubleToFixed(HSumMoney, 2);


                        //同步更新表格和缓存对应的值
                        obj.update({
                            HMoney: HMoney
                            , HTaxRate: HTaxRate
                            , HSumMoney: HSumMoney
                        });
                        break;
                    case "HTaxRate":                                                       //单价
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HTaxRate: oldText
                            });
                            table.render(option);
                            
                            layer.msg("税率请输入大于0的数字!");
                            return;
                        }


                        //数据校验合格，重算记录
                        var HTaxRate = value * 1;                           //税率
                        var HMoney = obj.data.HMoney * 1;           //不含税金额
                        var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //总金额=不含税金额*(1+(税率*0.01))


                        //设置数据小数位数
                        HMoney = dealDoubleToFixed(HMoney, 2);

                        HTaxRate = HTaxRate;
                        HSumMoney = dealDoubleToFixed(HSumMoney, 2);


                        //同步更新表格和缓存对应的值
                        obj.update({
                            HMoney: HMoney
                            , HTaxRate: HTaxRate
                            , HSumMoney: HSumMoney
                        });
                        break;
                    case "HSumMoney":                                                       //数量
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp)) {
                            //恢复数据到编辑前
                            obj.update({
                                HSumMoney: oldText
                            });
                            layer.msg("税率请输入不小于0的数字!");
                            return;
                        }


                        //数据校验合格，重算记录
                        var HSumMoney = value * 1;                           //总金额

                        var HTaxRate = obj.data.HTaxRate * 1;           //税率
                        var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));




                        //设置数据小数位数
                        HMoney = dealDoubleToFixed(HMoney, 2);

                        HTaxRate = HTaxRate;
                        HSumMoney = dealDoubleToFixed(HSumMoney, 2);

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HMoney: HMoney
                            , HTaxRate: HTaxRate
                            , HSumMoney: HSumMoney
                        });
                    default:
                }
            });
            //#endregion

            //#region è¡¨æ ¼è¡Œé€‰æ‹©å¤„理（是否取库存）
            form.on('select(HTypeSub)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HTypeSub = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //#endregion

            //#endregion

            //#region æ–‡æœ¬æ¡†ç›‘听
@@ -408,10 +662,10 @@
                    //输入的不含税金额合法，重
                    var HMoney = newHMoney * 1; //算总金额                       //不含税金额
                    var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                    var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) );    //总金额
                    var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //总金额

                    $("#HSumMoney").val(HRelSumMoney);
                

                });
                //#endregion

@@ -449,7 +703,7 @@
                    oldHSumMoney = $("#HSumMoney").val() * 1;   //不含税金额文本框获取焦点时获取修改前的值
                }).on('blur', function (data) {
                    newHSumMoney = $("#HSumMoney").val();       //不含税金额文本框失焦时获取修改后的值
                    if (newHSumMoney!=0) {
                    if (newHSumMoney != 0) {
                        //判断输入的金额是否合法
                        var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                        if (!ref.test(newHSumMoney)) {
@@ -465,25 +719,48 @@

                        $("#HMoney").val(HMoney);
                    }
                   

                });
                //#endregion
                //#endregion
            });
            //#endregion

          

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);

                    var sWhere = " and hmainid = '" + $("#HInterID").val() + "' ";
                    $.ajax({
                        url: GetWEBURL() + '/YS_ReceiveOtherBill/YS_ReceiveOtherBillMainList',
                        async: false,
                        type: "GET",
                        data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                        success: function (data1) {
                            if (data1.count == 1) {
                                if (data1.data.length<1) {
                                    set_AddNew(data);
                                } else {
                                    var starts = data1.data[0].单据状态
                                    if (starts == "创建") {
                                        set_AddNew(data);
                                    }
                                    else {
                                        layer.msg('此单据不是创建状态！无法进行编辑保存!');
                                    }
                                }
                            }
                        }
                    });
                }


            });
            //#endregion

           


            //#region é€€å‡º
            form.on('submit(btnEdit)', function (data) {
@@ -592,8 +869,102 @@
            }
            //#endregion

            
            //#region å…¶ä»–应收单子表初始化
            function get_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HProjectMoneyID', title: '费用项目ID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HPMoneyName', title: '费用项目名称', edit: 'text', event: "HPMoneyName",style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HTypeSub', title: '发票类型', templet: '#HTypeSub' }
                        , { field: 'HMoney', title: '不含税金额', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HTaxRate', title: '税率', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HSumMoney', title: '总金额', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                }

                var rowdata = [
                    {
                        "HProjectMoneyID": "0"
                        , "HPMoneyName": ""
                        , "HTypeSub": ""
                        , "HMoney": "0"
                        , "HTaxRate": "0"
                        , "HSumMoney": "0"
                    }
                ];
                option.data = rowdata;
                table.render(option);

            }
            //#endregion

            //#region è¡Œå†…删除
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除！！！');
                        } else {
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1)
                            option.data = oldData;//将数据绑定到data上
                            table.render(option);
                            layer.close(index);
                        }
                    });
                }
            }
            //#endregion

            //#region å¼¹çª—页面方法

            //#region å­è¡¨ï¼šå¿«æ·é”®(F7)打开弹窗
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        //器具管理
                        if (obj.event == "HPMoneyName") {
                            //打开器具管理小窗体
                            layer.open({
                                type: 2//弹窗类型
                                , skin: 'layui-layer-rim' //加上边框
                                , area: ['90%', '90%']//大小
                                , title: '项目费用列表'//标题
                                , shift: 2//弹出动画
                                , content: ["../../基础资料/公用基础资料/Gy_ProjectMoney.html?OperationType=2", "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('请选择数据');
                                    }

                                    obj.update({
                                        "HProjectMoneyID": checkStatus.data[0].HItemID
                                        , "HPMoneyName": checkStatus.data[0].项目费用名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            });
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }
            //#endregion

            //#region é€‰æ‹©éƒ¨é—¨
            function get_checkDept() {
                layer.open({
@@ -686,10 +1057,10 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                       

                        $("#HCusName").val(checkStatus.data[0].HName);
                        $("#HCusID").val(checkStatus.data[0].HItemID);
                        var HCusID=$("#HCusID").val();
                        var HCusID = $("#HCusID").val();
                        getHTaxRateByCusID(HCusID);//根据客户获取客户对应税率
                        getCustomerByCusID(HCusID);//根据客户获取币别、汇率,税率
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -715,7 +1086,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                       

                        $("#HProjectMoneyID").val(checkStatus.data[0].HItemID);
                        $("#HProjectMoneyName").val(checkStatus.data[0].项目费用名称);

@@ -788,11 +1159,20 @@
                }
                return true;
            }
                //#endregion
            //#endregion
            
            //#endregion

            //#region ä¿å­˜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 refSav = "";
                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -813,9 +1193,10 @@

                //获取表头数据并序列化
                var sMainStr = JSON.stringify(data.field);              //主表数据
            
                //其他应收单子表序列化
                var sSubStr = JSON.stringify(num);
                //拼接序列化的数据
                var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr+';'+ refSav + ';' + sessionStorage["HUserName"];

                $.ajax({
                    type: "POST",
@@ -857,52 +1238,66 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];

                            var data1 = result.data[1];
                            form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.hmainid
                                ,"HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HAccDate": formatDate(data.收款日期)
                                , "HCusID": data.HCusID
                                , "HCusName": data.客户
                                , "HCurID": data.HCurID
                                , "HCurName": data.币别
                                , "HExRate": data.汇率
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.部门
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.经手人
                              
                              
                                , "HProjectMoneyID": data.HProjectMoneyID
                                , "HProjectMoneyName": data.费用项目
                                , "HType": data.发票类型
                                , "HMoney": data.不含税金额
                                , "HTaxRate": data.税率
                                , "HSumMoney": data.总金额
                                , "HExplanation": data.摘要
                                , "HInnerBillNo": data.内部单据号
                                , "HRemark": data.表头备注
                                "HInterID": data[0]["hmainid"]
                                , "HBillNo": data[0]["单据号"]
                                , "HDate": formatDate(data[0]["日期"])
                                , "HAccDate": formatDate(data[0]["收款日期"])
                                , "HCusID": data[0]["HCusID"]
                                , "HCusName": data[0]["客户"]
                                , "HCurID": data[0]["HCurID"]
                                , "HCurName": data[0]["币别"]
                                , "HExRate": data[0]["汇率"]
                                , "HDeptID": data[0]["HDeptID"]
                                , "HDeptName": data[0]["部门"]
                                , "HEmpID": data[0]["HEmpID"]
                                , "HEmpName": data[0]["经手人"]

                                , "HMainSourceInterID": data.HMainSourceInterID == null ? 0 : data.HMainSourceInterID
                                , "HMainSourceEntryID": data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID
                                , "HMainSourceBillNo": data.HMainSourceBillNo
                                , "HMainSourceBillType": data.HMainSourceBillType

                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(new Date(data.制单日期), "yyyy-MM-dd")
                                , "HUpDater": data.修改人
                                , "HUpDateDate": data.修改日期 == null ? "" : Format(new Date(data.修改日期), "yyyy-MM-dd")
                                , "HChecker": data.审核人
                                , "HCheckDate": data.审核日期 == null ? "" : Format(new Date(data.审核日期), "yyyy-MM-dd")
                                , "HCloseMan": data.关闭人
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(new Date(data.关闭日期), "yyyy-MM-dd")
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd")
                                , "HProjectMoneyID": data[0]["HProjectMoneyID"]
                                , "HProjectMoneyName": data[0]["费用项目"]
                                , "HType": data[0]["发票类型"]
                                , "HMoney": data[0]["不含税金额"]
                                , "HTaxRate": data[0]["税率"]
                                , "HSumMoney": data[0]["总金额"]
                                , "HExplanation": data[0]["摘要"]
                                , "HInnerBillNo": data[0]["内部单据号"]
                                , "HRemark": data[0]["表头备注"]

                                , "HMainSourceInterID": data[0]["HMainSourceInterID"] == null ? 0 : data[0]["HMainSourceInterID"]
                                , "HMainSourceEntryID": data[0]["HMainSourceEntryID"] == null ? 0 : data[0]["HMainSourceEntryID"]
                                , "HMainSourceBillNo": data[0]["HMainSourceBillNo"]
                                , "HMainSourceBillType": data[0]["HMainSourceBillType"]

                                , "HMaker": data[0]["制单人"]
                                , "HMakeDate": data[0]["制单日期"] == null ? "" : Format(new Date(data[0]["制单日期"]), "yyyy-MM-dd")
                                , "HUpDater": data[0]["修改人"]
                                , "HUpDateDate": data[0]["修改日期"] == null ? "" : Format(new Date(data[0]["修改日期"]), "yyyy-MM-dd")
                                , "HChecker": data[0]["审核人"]
                                , "HCheckDate": data[0]["审核日期"] == null ? "" : Format(new Date(data[0]["审核日期"]), "yyyy-MM-dd")
                                , "HCloseMan": data[0]["关闭人"]
                                , "HCloseDate": data[0]["关闭日期"] == null ? "" : Format(new Date(data[0]["关闭日期"]), "yyyy-MM-dd")
                                , "HDeleteMan": data[0]["作废人"]
                                , "HDeleteDate": data[0]["作废日期"] == null ? "" : Format(new Date(data[0]["作废日期"]), "yyyy-MM-dd")
                            });

                            HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
                            HOrgIDBar = data[0]["HOrgID"] == null ? 0 : data[0]["HOrgID"];

                            //子表数据赋值
                            option.data = data1;
                            table.render(option);
                            for (var i = 0; i <data1.length; i++) {


                                //延迟原因
                                $('#HTypeSub' + (i + 1)).find("option[value='" + data1[i].HTypeSub + "']").attr("selected", true);
                            }
                            form.render('select');
                            form.render('checkbox');


                           
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -916,7 +1311,36 @@
            }
            //#endregion

      
            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var InterID = $("#HInterID").val();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/YS_ReceiveOtherBill/AuditYS_ReceiveOtherBillMain", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
                    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);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });

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


            //#region æ ¹æ®å®¢æˆ·èŽ·å–客户对应税率
            function getHTaxRateByCusID(HCusID) {
                $.ajax({
@@ -939,7 +1363,7 @@
                    }
                });
            }
        //#endregion
            //#endregion

            //#region æ ¹æ®ç™»å½•ç”¨æˆ· èŽ·å–部门  ç»æ‰‹äºº
            function getCzyglByUser() {
@@ -997,7 +1421,7 @@
                    }
                });
            }
        //#endregion
            //#endregion

            //#endregion

@@ -1015,12 +1439,46 @@
            $("#HEmpID").val(obj[0].HItemID);
        }

        //function GetHSupValue(obj)  //返回客户
        //{
        //    $("#HCusName").val(obj[0].HName);
        //    $("#HCusID").val(obj[0].HItemID);
        //}
                //function GetHSupValue(obj)  //返回客户
                //{
                //    $("#HCusName").val(obj[0].HName);
                //    $("#HCusID").val(obj[0].HItemID);
                //}
        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {
            //用于设置小数位数
            var dotLength = 0;

            if (num == 1) {                                    //当数据为数量时，最多保留6位小数
                //设置最多保留6位小数
                dotLength = 6;
            } else if (num == 2) {                             //当数据为金额时，最多保留2位小数
                //设置最多保留2位小数
                dotLength = 2;
            } else if (num == 3) {                             //当数据为单价时，最多保留4位小数
                //设置最多保留4位小数
                dotLength = 4;
            }

            //判断是否存在小数点及其索引位置
            data = data + "";
            var index = data.indexOf(".");

            //处理数据并返回
            if (index < 0) {
                return data * 1;
            } else {
                //获取小数位数
                var length = data.length - index - 1;
                if (length <= dotLength) {
                    return data * 1;
                } else {
                    data = data * 1;
                    return data.toFixed(dotLength);
                }
            }
        }
            //#endregion
    </script>
</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦ÊÕµ¥/YS_ReceiveOtherBillMain.htmlList.html

@@ -131,7 +131,7 @@
            var HModName = "YS_ReceiveBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HDeptID", "HEmpID",  "HCurID", "HCusID", "HProjectMoneyID",];
            var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID","子费用项目Id"];

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "2002";
@@ -482,23 +482,18 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    if (data[0].单据状态 =="创建") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '编辑' + HPageTitle
                            , shift: 0//弹出动画
                            , content: '../../销售管理/其他应收单/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , btn: [],
                            end: function (index, layero, that) {
                                //刷新页面
                                $("#btnSearch").trigger('click');
                            }
                        })
                    }
                    else {
                        layer.msg('单据不是创建状态！无法编辑！');
                    }
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle
                        , shift: 0//弹出动画
                        , content: '../../销售管理/其他应收单/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }