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

wtt

2026-03-04 4149b275c53fb2054cd2d8ef44cb6466b1e7dada

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

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -665,6 +665,7 @@
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\成本费用报表\CB_ActualItemMoneyCost.html" />
    <Content Include="views\成本管理\期初在产品表\Gy_WIPBal_Excel.html" />
    <Content Include="views\成本管理\期初在产品表\Kf_WIPBal.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />

 WebTM/WebTM.csproj.user

@@ -16,6 +16,8 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,15 +2,18 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";        //办公室服务器
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
     var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //李林俊本地配置
    //var WEBURL = "http://localhost:8080/API/";        //王仪本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/index_QiaoYi.html

@@ -220,10 +220,11 @@
                                    <a>验收入库</a>
                                    <dl class="layui-nav-child">
                                        <!--<dd><a lay-href="验收入库/外购入库/Kf_POStockInBillList.html">采购入库单维护</a></dd>
                    <dd><a lay-href="验收入库/外购入库/Kf_POStockInBackBillList.html">采购退料单维护</a></dd>
                    <dd><a lay-href="验收入库/产品入库/Kf_ProductInBillList.html">生产入库单维护</a></dd>
                    <dd><a lay-href="生产管理/生产退库单/Sc_ProductionReturnList.html">生产退库单维护</a></dd>-->
                                        <dd><a lay-href="验收入库/外购入库/Kf_POStockInBackBillList.html">采购退料单维护</a></dd>-->
                                        <dd><a lay-href="验收入库/产品入库/Kf_ProductInBillList.html">生产入库单维护</a></dd>
                                        <!--<dd><a lay-href="生产管理/生产退库单/Sc_ProductionReturnList.html">生产退库单维护</a></dd>-->
                                        <dd><a lay-href="验收入库/其他入库/Kf_OtherInBillList.html">其他入库单维护</a></dd>
                                        <!--<dd><a lay-href="仓存管理/生产入库单/Kf_ProductInBillList.html">生产入库单维护</a></dd>-->
                                        <!--<dd><a lay-href="验收入库/委外入库/Kf_EntrustInBillList.html">委外加工入库单维护</a></dd>
                    <dd><a lay-href="领料发货/委外出库/Kf_EntrustOutBillList.html">委外加工出库单维护</a></dd>
                    <dd><a lay-href="仓存管理/分步式调入单/Fb_StepFoldinBillList.html">分步式调入单维护</a></dd>-->

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

@@ -243,14 +243,14 @@
    </script>
    <!--行下拉选择(周转容器标记)-->
    <script type="text/html" id="HTransPackFlag">
        <select name="HTransPackFlag" lay-filter="HTransPackFlag" id="HTransPackFlag{{d.LAY_TABLE_INDEX+1}}">
        <select name="HTransPackFlag" lay-filter="HTransPackFlag" id="HTransPackFlag{{d.LAY_TABLE_INDEX+1}}" disabled>
            <option value="0">否</option>
            <option value="1">是</option>
        </select>
    </script>
    <!--行下拉选择(发货容器标记)-->
    <script type="text/html" id="HSendPackFlag">
        <select name="HSendPackFlag" lay-filter="HSendPackFlag" id="HSendPackFlag{{d.LAY_TABLE_INDEX+1}}">
        <select name="HSendPackFlag" lay-filter="HSendPackFlag" id="HSendPackFlag{{d.LAY_TABLE_INDEX+1}}" disabled>
            <option value="0">否</option>
            <option value="1">是</option>
        </select>
@@ -879,11 +879,31 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }

                                    //判断是否已经存在该容器了
                                    for (var i = 0; i < option.data.length; i++) {
                                        if (option.data[i]["HMouldID"] == checkStatus.data[0].hmainid) {
                                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                            layer.msg("容器【容器代码：" + checkStatus.data[0].模具编号 + "；容器名称：" + checkStatus.data[0].模具名称 + "】：当前容器已经存在，不可重复设置！！");
                                            obj.event = "";
                                            return false;
                                        }
                                    }

                                    //更新数据
                                    obj.update({
                                        "HMouldID": checkStatus.data[0].hmainid,
                                        "HMouldNumber": checkStatus.data[0].模具编号,
                                        "HMouldName": checkStatus.data[0].模具名称,
                                        "HMouldLength": checkStatus.data[0].长,
                                        "HMouldWidth": checkStatus.data[0].宽,
                                        "HMouldHeight": checkStatus.data[0].高,
                                        "HMouldFoldHeight": checkStatus.data[0].折叠高度,
                                        "HTransPackFlag": checkStatus.data[0].周转容器标记 == "Y" ? 1 : 0,
                                        "HSendPackFlag": checkStatus.data[0].发货容器标记 == "Y" ? 1 : 0,
                                    });

                                    setSelectByTableRender();                   //根据子表值重新渲染下拉列表
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                            });
@@ -962,6 +982,30 @@
                $.each(option.data, function (index, value) {
                    if (dataindex == index) {
                        value.HDefaultTransPackFlag = data.value * 1;                           //把选中下拉框id值赋值给表格缓存

                        //判断是否有其他默认的周转容器
                        if (data.value * 1 == 1) {
                            if (value.HTransPackFlag * 1 == 0) {
                                value.HDefaultTransPackFlag = 0;                            //把选中下拉框id值赋值给表格缓存
                                setSelectHDefaultTransPackFlagByTableRender();                      //刷新表格同时根据option中HDefaultTransPackFlag值设置下拉列表
                                layer.msg("当前容器不为周转容器，可以设置为默认周转容器！！！");
                                return;
                            }

                            var count = 0;
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HDefaultTransPackFlag"] * 1 == 1) {
                                    count++;
                                }
                            }
                            if (count > 1) {
                                value.HDefaultTransPackFlag = 0;                            //把选中下拉框id值赋值给表格缓存
                                setSelectHDefaultTransPackFlagByTableRender();                      //刷新表格同时根据option中HDefaultTransPackFlag值设置下拉列表
                                layer.msg("当前已经存在其他默认周转容器，请先取消其他默认周转容器后再设置该容器为默认周转容器！！！");
                                return;
                            }
                        }

                        setSelectHDefaultTransPackFlagByTableRender();                      //刷新表格同时根据option中HDefaultTransPackFlag值设置下拉列表
                    }
                });
@@ -984,6 +1028,31 @@
                $.each(option.data, function (index, value) {
                    if (dataindex == index) {
                        value.HDefaultSendPackFlag = data.value * 1;                            //把选中下拉框id值赋值给表格缓存

                        //判断是否有其他默认的周转容器
                        if (data.value * 1 == 1) {
                            if (value.HSendPackFlag * 1 == 0) {
                                value.HDefaultSendPackFlag = 0;                            //把选中下拉框id值赋值给表格缓存
                                setSelectHDefaultSendPackFlagByTableRender();                       //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                layer.msg("当前容器不为发货容器，不可设为默认发货容器！！！");
                                return;
                            }

                            //判断是否有其他容器已经设置为默认发货容器
                            var count = 0;
                            for (var i = 0; i < option.data.length; i++) {
                                if (option.data[i]["HDefaultSendPackFlag"] * 1 == 1) {
                                    count++;
                                }
                            }
                            if (count > 1) {
                                value.HDefaultSendPackFlag = 0;                            //把选中下拉框id值赋值给表格缓存
                                setSelectHDefaultSendPackFlagByTableRender();                       //刷新表格同时根据option中HisStockGoods值设置下拉列表
                                layer.msg("当前已经存在其他默认发货容器，请先取消其他默认发货容器后再设置该容器为默认发货容器！！！");
                                return;
                            }
                        }

                        setSelectHDefaultSendPackFlagByTableRender();                       //刷新表格同时根据option中HisStockGoods值设置下拉列表
                    }
                });

 WebTM/views/³É±¾¹ÜÀí/³É±¾·ÑÓñ¨±í/CB_ActualItemMoneyCost.html

New file
@@ -0,0 +1,639 @@
<!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">
    <!-- æ³¨æ„ï¼šæ‰€æœ‰å¼•ç”¨è·¯å¾„保持与原项目一致，确保功能完整 -->
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body">
                    <form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!-- ç”Ÿäº§è½¦é—´ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                            <!-- åŠ¨æ€æ¸²æŸ“车间 -->
                                        </select>
                                    </div>
                                </div>
                                <!-- ç‰©æ–™ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float:left;width:150px;">
                                        <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">费用项目</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HItMoneyName" id="HItMoneyName" style="float:left;width:150px;">
                                        <input type="hidden" class="layui-input" name="HItMoneyID" id="HItMoneyID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HItemMoneyList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">成本对象 </label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HCostObjectName" id="HCostObjectName" style="float:left;width:150px;">
                                        <input type="hidden" class="layui-input" name="HCostObjectID" id="HCostObjectID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HCostobjList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float:left;width:150px;">
                                        <input type="hidden" class="layui-input" name="HProcID" id="HProcID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <!-- å¼€å§‹å¹´æœˆ -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">开始年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-start-month" placeholder="选择开始年月" readonly>
                                    </div>
                                </div>

                                <!-- ç»“束年月 -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">结束年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-end-month" placeholder="选择结束年月" readonly>
                                    </div>
                                </div>
                                <!-- æŸ¥è¯¢æŒ‰é’® -->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <!-- é‡ç½®æŒ‰é’® -->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                    </form>
                    <div style="margin-top: 10px;">
                        <table class="" id="mainTable2" lay-filter="mainTable2"></table>
                        <!-- è¡¨æ ¼å¤´å·¥å…·æ  -->
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>导入</button>
                            </div>
                        </script>
                    </div>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/'
        }).extend({
            index: 'lib/index',
        }).use(['index', 'form', 'table', 'element', 'laydate', 'soulTable', 'tableSelect'], function () {
            var $ = layui.$,
                admin = layui.admin,
                layer = layui.layer,
                table = layui.table,
                form = layui.form,
                element = layui.element,
                laydate = layui.laydate,
                soulTable = layui.soulTable,
                tableSelect = layui.tableSelect;

            // æ¨¡å—名（用于列设置存储）
            var HModName2 = "Pay_PaymentEntryReport2";
            // è¡¨æ ¼é€‰é¡¹
            var option2 = {
                elem: '#mainTable2',
                toolbar: '#toolbarDemo2',
                height: 'full-120',      // é€‚当留出底部空间
                page: true,
                cellMinWidth: 90,
                totalRow: true,
                limit: 500,
                limits: [50, 500, 5000, 20000],
                done: function (res, curr, count) {
                    soulTable.render(this);
                },
                cols: [[]]
            };

            // å…¨å±€æŸ¥è¯¢æ¡ä»¶å­—符串
            var sWhere = "";


            function initPage() {
                // æ¸²æŸ“车间下拉框
                loadDeptSelect();

                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹å¹´æœˆä¸º7个月前，结束年月为今天
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 12);

                // æ–°å¢žï¼šæ¸²æŸ“开始年月选择器
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                // æ–°å¢žï¼šæ¸²æŸ“结束年月选择器
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                getFastQuery(2);
                // é‡æ–°æ¸²æŸ“表单元素（select等）
                form.render('select');
            }

            // èŽ·å–车间下拉
            function loadDeptSelect() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] || 1 }, // é»˜è®¤ç»„织1
                    success: function (result) {
                        var html = '<option value="0" style="color:red;" selected>全部车间</option>';
                        if (result.count == 1 && result.data) {
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                html += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                            }
                        }
                        $("#HDeptID").html(html);
                        form.render('select');
                    },
                    error: function () {
                        layer.alert('获取车间列表失败', { icon: 2 });
                    }
                });
            }



            // ä¿®æ”¹åŽçš„getFastQuery函数
            function getFastQuery(type) {
                // ä¿®æ”¹ï¼šä»Žå¹´æœˆé€‰æ‹©å™¨èŽ·å–值，而不是从日期输入框
                var HStartYearMonth = $("#ID-laydate-start-month").val();
                var HEndYearMonth = $("#ID-laydate-end-month").val();

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†å¼€å§‹å¹´æœˆ
                if (!HStartYearMonth) {
                    layer.msg('请选择开始年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†ç»“束年月
                if (!HEndYearMonth) {
                    layer.msg('请选择结束年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šè§£æžå¼€å§‹å¹´æœˆä¸ºå¹´å’Œæœˆ
                var startParts = HStartYearMonth.split('-');
                var HStartYear = startParts[0];
                var HStartPeriod = startParts[1];

                // æ–°å¢žï¼šè§£æžç»“束年月为年和月
                var endParts = HEndYearMonth.split('-');
                var HEndYear = endParts[0];
                var HEndPeriod = endParts[1];

                // æ–°å¢žï¼šéªŒè¯å¹´æœˆèŒƒå›´æ˜¯å¦æœ‰æ•ˆ
                var startValue = parseInt(HStartYear) * 100 + parseInt(HStartPeriod);
                var endValue = parseInt(HEndYear) * 100 + parseInt(HEndPeriod);

                if (startValue > endValue) {
                    layer.msg('开始年月不能大于结束年月', { icon: 2 });
                    return;
                }

                var HCostObjID = $("#HMaterID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HProcID = $("#HProcID").val() || '0';

                // ä¿®æ”¹ï¼šå­˜å‚¨è¿‡ç¨‹å‚数改为开始年、开始月、结束年、结束月、车间、物料
                var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
                    HEndYear + "','" + HEndPeriod + "','" +
                    HWorkShopID + "','" + HCostObjID + "'" + ",'" + HProcID+"'";
                sWhere = spParams;

                if (type == 2) {
                    get_Display(spParams);
                }
            }

            // åŠ è½½é˜¶æ¢¯è®¡ä»¶æ•°æ®
            function get_Display(params) {
                var loadIndex = layer.load(1, { shade: false });

                var sql = "exec h_p_CB_ActualItemMoneyCost" + params;

                $.ajax({
                    url: GetWEBURL() + '/CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList',
                    type: "GET",
                    data: { "sWhere": sql },
                    success: function (data1) {
                        layer.close(loadIndex);
                        if (data1.count == 1) {
                            // è§£æžåˆ—定义
                            var colDefs = []; // å­˜æ”¾ {id, name, Type}
                            if (data1.list && data1.list.length > 0) {
                                for (var k in data1.list) {
                                    colDefs.push({
                                        id: data1.list[k].ColmCols,
                                        name: data1.list[k].ColmCols,
                                        Type: data1.list[k].ColmType
                                    });
                                }
                            }

                            // æž„建表格列
                            var cols = [];
                            // å¤šé€‰æ¡†åˆ—
                            cols.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });

                            // è¾…助判断日期字段(形如"2025-02-20")，原代码用isValidDate但未定义，简单按字段名是否含横线判断，实际根据业务调整
                            for (var i = 0; i < colDefs.length; i++) {
                                var fieldName = colDefs[i].name;
                                var fieldId = colDefs[i].id;
                                var fieldType = colDefs[i].Type;

                                // é’ˆå¯¹é˜¶æ¢¯æŠ¥è¡¨ï¼Œæœ‰äº›åˆ—可能是动态日期(例如“02-20”)，原代码用isValidDate判断，我们简单模拟：如果字段名包含 '-' ä¸”长度<=10 è§†ä¸ºæ—¥æœŸçŸ­åˆ—
                                var isShortDate = (fieldName.indexOf('-') > 0 && fieldName.length <= 10);
                                if (isShortDate) {
                                    // æ˜¾ç¤ºæˆ MM-dd æ ¼å¼ï¼ŒåŽŸä»£ç å°è¯•Format但未定义，此处直接显示原字段名
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,  // åŽŸä»£ç : Format(fieldName,'MM-dd') ä½†Format函数可能未引入，保持原样
                                        width: 70,
                                        totalRow: true,
                                        filter: true,
                                        align: 'center'
                                    });
                                } else if (fieldType == 'DateTime') {
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,
                                        align: 'center',
                                        sort: true,
                                        filter: true,
                                        templet: "<div>{{ d." + fieldId + " == '' ? '' : layui.util.toDateString(d." + fieldId + ", 'yyyy-MM-dd HH:mm:ss') }}</div>",
                                        width: 180
                                    });
                                } else {
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,
                                        align: 'center',
                                        sort: true,
                                        width: 150,
                                        filter: true
                                    });
                                }
                            }

                            // æ›´æ–°è¡¨æ ¼é…ç½®
                            option2.cols = [cols];
                            option2.data = data1.data || [];

                            // åº”用列隐藏设置（如果存在）
                            DisPlay_HideColumn(HModName2, sessionStorage["HUserName"] || 'admin', option2, []);

                            // æ¸²æŸ“表格
                            table.render(option2);
                        } else {
                            layer.alert(data1.code + ' ' + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(loadIndex);
                        layer.alert("接口请求失败", { icon: 5 });
                    }
                });
            }

            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            // ä¿®æ”¹åŽçš„clearQuery函数
            function clearQuery() {
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 7);

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®å¼€å§‹å¹´æœˆé€‰æ‹©å™¨çš„值
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®ç»“束年月选择器的值
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                $("#HDeptID").val(0);
                $("#HMaterID").val("0");
                $("#HMaterName").val("");
                $("#HProcID").val("0");
                $("#HProcName").val("");
                form.render('select');
            }

            // ---------- äº‹ä»¶ç»‘定 ----------
            // æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function () {
                getFastQuery(2);
                return false;
            });

            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function () {
                clearQuery();
                getFastQuery(2);
                return false;
            });

            // ç­ç»„弹出框(保留原有弹窗方式，与tableSelect共存，优先使用tableSelect；同时支持弹窗选择)
            form.on('submit(HGroupList)', function () {
                openGroupDialog();
                return false;
            });

            // èŒå‘˜å¼¹å‡ºæ¡† HItemMoneyList
            form.on('submit(HMaterList)', function () {
                openHMaterDialog();
                return false;
            });

            form.on('submit(HProcList)', function () {
                openHProcDialog();
                return false;
            });

            form.on('submit(HCostobjList)', function () {
                openHCostobjDialog();
                return false;
            });

            form.on('submit(HItemMoneyList)', function () {
                openHItemMoneyDialog();
                return false;
            });
            function openHCostobjDialog() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim',
                    title: '工序',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_CostItem.html?', 'yes'],
                    btn: ['确定', '取消'],
                    btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HCostObjectID").val(checkStatus.data[0].HItemID);
                        $("#HCostObjectName").val(checkStatus.data[0].成本项目名称);
                        layer.close(index);
                    }
                });
            }

            function openHProcDialog() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim',
                    title: '工序',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=HMaterList', 'yes'],
                    btn: ['确定', '取消'],
                    btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        layer.close(index);
                    }
                });
            }

            // æ‰“开班组弹窗（原函数 get_checkGroup）
            function openGroupDialog() {
                layer.open({
                    type: 2,
                    skin: "layui-layer-rim",
                    title: "班组列表",
                    closeBtn: 1,
                    shift: 2,
                    area: ["90%", "90%"],
                    maxmin: true,
                    content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', '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("请选择一条数据");
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index);
                    }
                });
            }

            // æ‰“开职员弹窗 (原 get_checkEmp)
            function openHMaterDialog() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim',
                    title: '职',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_Material.html?Type=HMaterList', 'yes'],
                    btn: ['确定', '取消'],
                    btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        layer.close(index);
                    }
                });
            }

            // å¤´å·¥å…·æ äº‹ä»¶ (mainTable2)
            table.on('toolbar(mainTable2)', function (obj) {
                switch (obj.event) {
                    case 'set_HideColumn2':
                        get_HideColumnNoPage(HModName2, sessionStorage["HUserName"] || 'admin', option2, function () { getFastQuery(2); });
                        break;
                    case 'btn-reload2':
                        getFastQuery(2);
                        break;
                    case 'get_export2':
                        exportExcel2();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    default:
                        break;
                }
            });

            // å¯¼å‡ºExcel (原 get_Export2)
            function exportExcel2() {
                var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option2.data || [];
                            // æ¸…洗数据
                            data.forEach(function (item) {
                                for (var key in item) {
                                    if (item[key] == null) item[key] = "";
                                    if (typeof item[key] === 'string') {
                                        item[key] = item[key].replace(/[\r\n]+/g, '').replace(/,/g, '');
                                    }
                                }
                            });
                            table.exportFile("mainTable2", data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '资料导入'
                    , shift: 0//弹出动画
                    , content: './Gy_WIPBal_Excel.html?OperationType=dao&HSouceBillType='
                })
            }

            // å…¨å±€è¾…助函数 Format (如果不存在，简单定义)
            if (typeof Format !== 'function') {
                window.Format = function (date, fmt) {
                    if (!date) return '';
                    var d = new Date(date);
                    var o = {
                        "M+": d.getMonth() + 1,
                        "d+": d.getDate(),
                        "H+": d.getHours(),
                        "m+": d.getMinutes(),
                        "s+": d.getSeconds()
                    };
                    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
                    for (var k in o)
                        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
                    return fmt;
                };
            }

            // å¯åŠ¨é¡µé¢
            initPage();
        });

        // ä¸‹é¢ä¸¤ä¸ªæ–¹æ³•ä¾›å¼¹çª—回调使用 (Gy_EmployeeList.html å’Œ Gy_Group.html ä¼šè°ƒç”¨)
        function GetHEmpListValue(obj) {
            $("#HEmpID").val(obj.HItemID);
            $("#HEmpName").val(obj.职员名称);
        }
        function GetHGroupValue(obj) {
            if (obj && obj.length > 0) {
                $("#HGroupName").val(obj[0].班组名称);
                $("#HGroupID").val(obj[0].HItemID);
            }
        }
    </script>

</body>
</html>

 WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Gy_WIPBal_Excel.html

@@ -110,22 +110,47 @@

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

      

        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Kf_WIPBal/Kf_WIPBal_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (obj) { // ä¸Šä¼ å‰
                layer.load(1, {
                    shade: [0.3, '#000'] // 0.3透明度黑色遮罩
                });
            },
            done: function (data1) {
                layer.closeAll('loading'); // å…³é—­åŠ è½½å±‚
                if (data1.count == 1) {
                    option.data = data1.data;

                    // èŽ·å–当前年月
                    var now = new Date();
                    var year = now.getFullYear();
                    var month = (now.getMonth() + 1).toString().padStart(2, '0');
                    var currentYearMonth = year + '-' + month;

                    // è®¾ç½®å¹´æœˆè¾“入框的值
                    $('#ID-laydate-type-month').val(currentYearMonth);

                    // ä¸ºå¯¼å…¥çš„数据添加年和月字段
                    for (var i = 0; i < option.data.length; i++) {
                        option.data[i]['å¹´'] = year.toString();
                        option.data[i]['月'] = month;
                    }

                    table.render(option);

                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.closeAll('loading'); // å…³é—­åŠ è½½å±‚
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
@@ -137,6 +162,8 @@

        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {

          
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }

 WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Kf_WIPBal.html

@@ -39,7 +39,7 @@
                                            <!-- åŠ¨æ€æ¸²æŸ“车间 -->
                                        </select>
                                    </div>
                                </div>             
                                </div>
                                <!-- ç‰©æ–™ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料</label>
@@ -51,18 +51,19 @@
                                        </button>
                                    </div>
                                </div>
                                <!-- å¼€å§‹æ—¥æœŸ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
                                <!-- å¼€å§‹å¹´æœˆ -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">开始年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-start-month" placeholder="选择开始年月" readonly>
                                    </div>
                                </div>
                                <!-- ç»“束日期 -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">

                                <!-- ç»“束年月 -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">结束年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-end-month" placeholder="选择结束年月" readonly>
                                    </div>
                                </div>
                                <!-- æŸ¥è¯¢æŒ‰é’® -->
@@ -128,14 +129,40 @@
            // å…¨å±€æŸ¥è¯¢æ¡ä»¶å­—符串
            var sWhere = "";

            // ---------- åˆå§‹åŒ– ----------
            
            function initPage() {
                // æ¸²æŸ“车间下拉框
                loadDeptSelect();
                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹æ—¥æœŸä¸º7天前，结束日期为今天
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
               

                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹å¹´æœˆä¸º7个月前，结束年月为今天
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 12);

                // æ–°å¢žï¼šæ¸²æŸ“开始年月选择器
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                // æ–°å¢žï¼šæ¸²æŸ“结束年月选择器
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                getFastQuery(2);
                // é‡æ–°æ¸²æŸ“表单元素（select等）
                form.render('select');
@@ -167,15 +194,51 @@

           

            // æŸ¥è¯¢å¹¶æ¸²æŸ“阶梯报表
            // ä¿®æ”¹åŽçš„getFastQuery函数
            function getFastQuery(type) {
                var HBeginDate = $("#HBDate").val();
                var HEndDate = $("#HEDate").val();
                // ä¿®æ”¹ï¼šä»Žå¹´æœˆé€‰æ‹©å™¨èŽ·å–值，而不是从日期输入框
                var HStartYearMonth = $("#ID-laydate-start-month").val();
                var HEndYearMonth = $("#ID-laydate-end-month").val();

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†å¼€å§‹å¹´æœˆ
                if (!HStartYearMonth) {
                    layer.msg('请选择开始年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†ç»“束年月
                if (!HEndYearMonth) {
                    layer.msg('请选择结束年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šè§£æžå¼€å§‹å¹´æœˆä¸ºå¹´å’Œæœˆ
                var startParts = HStartYearMonth.split('-');
                var HStartYear = startParts[0];
                var HStartPeriod = startParts[1];

                // æ–°å¢žï¼šè§£æžç»“束年月为年和月
                var endParts = HEndYearMonth.split('-');
                var HEndYear = endParts[0];
                var HEndPeriod = endParts[1];

                // æ–°å¢žï¼šéªŒè¯å¹´æœˆèŒƒå›´æ˜¯å¦æœ‰æ•ˆ
                var startValue = parseInt(HStartYear) * 100 + parseInt(HStartPeriod);
                var endValue = parseInt(HEndYear) * 100 + parseInt(HEndPeriod);

                if (startValue > endValue) {
                    layer.msg('开始年月不能大于结束年月', { icon: 2 });
                    return;
                }

                var HCostObjID = $("#HMaterID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';

                var spParams = "'" + HBeginDate + "','" + HEndDate + "','" + HWorkShopID + "','" + HCostObjID+ "'";
                sWhere = spParams; // ç”¨äºŽå†…部
                // ä¿®æ”¹ï¼šå­˜å‚¨è¿‡ç¨‹å‚数改为开始年、开始月、结束年、结束月、车间、物料
                var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
                    HEndYear + "','" + HEndPeriod + "','" +
                    HWorkShopID + "','" + HCostObjID + "'";
                sWhere = spParams;

                if (type == 2) {
                    get_Display(spParams);
@@ -273,16 +336,33 @@
            }

            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            // ä¿®æ”¹åŽçš„clearQuery函数
            function clearQuery() {
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 7);

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®å¼€å§‹å¹´æœˆé€‰æ‹©å™¨çš„值
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®ç»“束年月选择器的值
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                $("#HDeptID").val(0);
                $("#HEmpID").val(0);
                $("#HEmpName").val("");
                $("#HGroupID").val(0);
                $("#HGroupName").val("");
                $("#HMaterID").val("0");     
                $("#HMaterName").val("");   
                $("#HMaterID").val("0");
                $("#HMaterName").val("");
                form.render('select');
            }


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html

@@ -464,6 +464,20 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">托体积</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HPackV" id="HPackV" value="0">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">托标准容器数量</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HStandardQtyForMouldInPack" id="HStandardQtyForMouldInPack" value="0">
                                        </div>
                                    </div>
                                </div>

                                <div class="layui-row">

@@ -2030,6 +2044,8 @@
                        $("#HMouldWidth").val(d.data[0].宽);
                        $("#HMouldHeight").val(d.data[0].高);
                        $("#HMouldFoldHeight").val(d.data[0].折叠高度);
                        $("#HPackV").val(d.data[0].托体积);
                        $("#HStandardQtyForMouldInPack").val(d.data[0].托标准容器数量);
                        $("#checkboxHTransPackFlag").prop("checked", d.data[0].周转容器标记 == 1);    // è®¾ç½®å‘¨è½¬å®¹å™¨æ ‡è®°
                        $("#HTransPackFlag").val(d.data[0].周转容器标记 == 1 ? "true" : "false");
                        $("#checkboxHSendPackFlag").prop("checked", d.data[0].发货容器标记 == 1);     // è®¾ç½®å‘货容器标记

 WebTM/views/Éú²ú¹ÜÀí/±¦¹¤ÅŲú/JIT_DayPlanPlatForm.html

@@ -1083,8 +1083,8 @@
            var lastDay = new Date(year, month, 0).getDate();               //当月最后一天
            var thisDay = new Date().getDay();                              //当天是本月第几天

            var valueList = [7, lastDay - thisDay+1,31,40,50];
            var titleList = ["7天", "本月","31天","40天","50天"];
            var valueList = [7, lastDay - thisDay + 1, 31, 40, 50, 100];
            var titleList = ["7天", "本月", "31天", "40天", "50天", "100天"];

            var HArrangeProductDayQty_ArrayList = '';
            for (var i = 0; i < valueList.length; i++) {
@@ -1095,7 +1095,7 @@
            $("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
            form.render('select');

            $("#HArrangeProductDayQty").val("40");
            $("#HArrangeProductDayQty").val("100");
        }
        //#endregion

@@ -1368,6 +1368,265 @@
            columns.push({
                field: Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 50 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 50 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'));
                }
            })//0



            columns.push({
                field: Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 51 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 51 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 51 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 52 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 52 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 52 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 53 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 53 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 53 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 54 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 54 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 54 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 55 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 55 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 55 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 56 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 56 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 56 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 57 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 57 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 57 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 58 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 58 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 58 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 59 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 59 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 59 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({
                field: Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 60 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 60 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 60 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 61 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 61 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 61 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 62 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 62 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 62 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 63 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 63 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 63 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 64 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 64 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 64 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 65 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 65 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 65 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 66 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 66 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 66 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 67 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 67 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 67 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 68 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 68 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 68 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 69 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 69 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 69 * oneday, 'yyyy-MM-dd'));
                }
            })//0


            columns.push({
                field: Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 70 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 70 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 70 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 71 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 71 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 71 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 72 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 72 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 72 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 73 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 73 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 73 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 74 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 74 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 74 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 75 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 75 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 75 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 76 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 76 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 76 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 77 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 77 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 77 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 78 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 78 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 78 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 79 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 79 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 79 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({
                field: Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 80 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 80 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 80 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 81 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 81 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 81 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 82 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 82 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 82 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 83 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 83 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 83 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 84 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 84 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 84 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 85 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 85 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 85 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 86 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 86 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 86 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 87 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 87 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 87 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 88 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 88 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 88 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 89 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 89 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 89 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({
                field: Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 90 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 90 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 90 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 91 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 91 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 91 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 92 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 92 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 92 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 93 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 93 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 93 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 94 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 94 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 94 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 95 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 95 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 95 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 96 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 96 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 96 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 97 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 97 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 97 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 98 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 98 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 98 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 99 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 99 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 99 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({
                field: Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 100 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 100 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 100 * oneday, 'yyyy-MM-dd'));
                }
            })//0
            
@@ -3461,6 +3720,7 @@
        }

        function set_AddNew1(num) {
            delete num["LAY_TABLE_INDEX"];

            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = "["+JSON.stringify(num)+"]";

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBill.html

@@ -85,11 +85,11 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                        <label class="layui-form-label" style="width: 85px;">项目代码<label style="color:red"> * </label></label>
                        <div class="layui-input-block" style="margin-left: 120px;">
                            <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
                        </div>
                    </div>-->
            <label class="layui-form-label" style="width: 85px;">项目代码<label style="color:red"> * </label></label>
            <div class="layui-input-block" style="margin-left: 120px;">
                <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
            </div>
        </div>-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目代码<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -220,11 +220,22 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                            <div class="layui-input-block" style="margin-left: 120px; width: 450px;">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 60px;">任务形态</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <select name="HTaskType" id="HTaskType" lay-filter="HTaskType" style="width:120px;">
                                                    <option value="计划" selected>计划</option>
                                                    <option value="后补">后补</option>
                                                    <option value="其他">其他</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织<label style="color:red"> * </label></label>
@@ -1201,6 +1212,7 @@
                            , "HDeleteManDate": tableMain[0]["HDeleteDate"] == null ? "" : Format(new Date(tableMain[0]["HDeleteDate"]), "yyyy-MM-dd")
                            , "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
                            , "HBackRemark": tableMain[0]["HBackRemark"]
                            , "HTaskType": tableMain[0]["HTaskType"]
                        });

                        //组织的值HOrgID变化，重新渲染