wip导入，成本费用单导入，增加下拉框年月，不良原因列表增加字段物料分类

llj

2026-02-27 c78e97e5ca1365342ab5e63f5513f9afa954bb35

wip导入，成本费用单导入，增加下拉框年月，不良原因列表增加字段物料分类

 WebTM/views/»ù´¡×ÊÁÏ/³É±¾»ù´¡×ÊÁÏ/CB_Wip_excelImport.html

@@ -32,6 +32,48 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 85px;">å¹´</label>
                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">

                                <select name="HYear" id="HYear" lay-verify="HYear">
                                    <option value="2023">2023å¹´</option>
                                    <option value="2024">2024å¹´</option>
                                    <option value="2025">2025å¹´</option>
                                    <option value="2026" selected="selected">2026å¹´</option>
                                    <option value="2027">2027å¹´</option>
                                    <option value="2028">2028å¹´</option>
                                    <option value="2029">2029å¹´</option>
                                    <option value="2030">2030å¹´</option>
                                    <option value="2031">2031å¹´</option>
                                    <option value="2032">2032å¹´</option>
                                    <option value="2033">2033å¹´</option>
                                    <option value="2034">2034å¹´</option>
                                    <option value="2035">2035å¹´</option>
                                    <option value="2036">2036å¹´</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 85px;">月</label>
                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                    <option value="1">1月</option>
                                    <option value="2">2月</option>
                                    <option value="3">3月</option>
                                    <option value="4">4月</option>
                                    <option value="5">5月</option>
                                    <option value="6">6月</option>
                                    <option value="7">7月</option>
                                    <option value="8">8月</option>
                                    <option value="9">9月</option>
                                    <option value="10">10月</option>
                                    <option value="11">11月</option>
                                    <option value="12">12月</option>
                                </select>

                            </div>
                        </div>
                    </div>

                    <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -133,6 +175,22 @@
        function set_ClearBill() {
            //初始化表格
            set_InitGrid();
            // èŽ·å–当前日期
            var currentDate = new Date();
            var currentYear = currentDate.getFullYear();
            var currentMonth = currentDate.getMonth() + 1; // æœˆä»½ä»Ž0开始，所以要+1

            // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前年份
            var yearSelect = document.getElementById('HYear');
            if (yearSelect) {
                yearSelect.value = currentYear;
            }

            // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前月份
            var monthSelect = document.getElementById('HMonth');
            if (monthSelect) {
                monthSelect.value = currentMonth;
            }
        }
        //#endregion

@@ -205,12 +263,35 @@

        //导入(保存)
        function set_AddNew(data) {
            // èŽ·å–选中的年份和月份
            var year = $("#HYear").val();
            var month = $("#HMonth").val();
            if (!year || !month) {
                layer.msg("请选择年份和月份！");
                return;
            }

            if (!option.data || option.data.length === 0) {
                layer.msg("无数据，请先导入数据！");
                return;
            }

            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                    var item = option.data[i];
                    // ä¸ºæ¯æ¡è®°å½•è®¾ç½®å¹´ä»½å’Œæœˆä»½ï¼ˆè¦†ç›–原有值）
                    item["年份"] = year;
                    item["月份"] = month;
                    num.push(item);
                }
            }
            //var num = [];
            //for (var i = 0; i < option.data.length; i++) {
            //    if (option.data[i] != "") {
            //        num.push(option.data[i])
            //    }
            //}

            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"] + '&和' + sessionStorage["OrganizationID"];

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_BadReason.html

@@ -106,6 +106,16 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">物料类型：</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMaterTypeName" id="HMaterTypeName" lay-verify="HMaterTypeName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterType-BT" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
                                                    </button>
                                                    <input id="HMaterTypeID" name="HMaterTypeID" type="hidden" value="0" />
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">使用状态：</label>
                                                <div class="layui-input-inline">
                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
@@ -264,6 +274,7 @@
                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串
                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
               
                if (AllowLoadData()) {
                    $.ajax(
                        {
@@ -359,7 +370,7 @@
                })
            });

            //选择默认不良类型
            //选择默认不良类型HMaterType-BT
            form.on('submit(HBadType-BT)', function () {//选择部门
                layer.open({
                    type: 2
@@ -389,7 +400,36 @@
                   }
                })
            });
            //选择默认不良类型HMaterType-BT
            form.on('submit(HMaterType-BT)', function () {//选择部门
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '不良类型列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../基础资料/公用基础资料/Gy_MaterType.html?', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterTypeName").val(checkStatus.data[0].物料分类名称);
                        $("#HMaterTypeID").val(checkStatus.data[0].HItemID);
                        //$("#HBadTypeNumber").val(checkStatus.data[0].不良类型代码);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    }
                })
            });
            //选择默认工序
            form.on('submit(HProc-BT)', function () {//选择工序
                layer.open({
@@ -488,6 +528,8 @@
                            $("#HProcNumber").val(data.工序代码);//工序代码
                            $("#HBadTypeName").val(data.不良类型);//默认不良类型
                            $("#HBadTypeID").val(data.HBadTypeID == null ? '0' : data.HBadTypeID);//不良类型ID
                            $("#HMaterTypeName").val(data.物料分类);//默认不良类型
                            $("#HMaterTypeID").val(data.HMaterTypeID == null ? '0' : data.HMaterTypeID);//不良类型ID
                            $("#HBadTypeNumber").val(data.不良类型代码);//不良类型代码
                            $("#HRemark").val(data.备注);//备注
                            $("input[name='HStopflag']").attr("checked", data.禁用标记);//true:选中 false:不选中

 WebTM/views/³É±¾¹ÜÀí/·ÑÓõ¥ÒýÈë/CB_ItemMoneyBill_Excel.html

@@ -32,6 +32,48 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 85px;">å¹´</label>
                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">

                                <select name="HYear" id="HYear" lay-verify="HYear">
                                    <option value="2023">2023å¹´</option>
                                    <option value="2024">2024å¹´</option>
                                    <option value="2025">2025å¹´</option>
                                    <option value="2026" selected="selected">2026å¹´</option>
                                    <option value="2027">2027å¹´</option>
                                    <option value="2028">2028å¹´</option>
                                    <option value="2029">2029å¹´</option>
                                    <option value="2030">2030å¹´</option>
                                    <option value="2031">2031å¹´</option>
                                    <option value="2032">2032å¹´</option>
                                    <option value="2033">2033å¹´</option>
                                    <option value="2034">2034å¹´</option>
                                    <option value="2035">2035å¹´</option>
                                    <option value="2036">2036å¹´</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 85px;">月</label>
                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                    <option value="1">1月</option>
                                    <option value="2">2月</option>
                                    <option value="3">3月</option>
                                    <option value="4">4月</option>
                                    <option value="5">5月</option>
                                    <option value="6">6月</option>
                                    <option value="7">7月</option>
                                    <option value="8">8月</option>
                                    <option value="9">9月</option>
                                    <option value="10">10月</option>
                                    <option value="11">11月</option>
                                    <option value="12">12月</option>
                                </select>

                            </div>
                        </div>
                    </div>

                    <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -133,6 +175,21 @@
        function set_ClearBill() {
            //初始化表格
            set_InitGrid();
            var currentDate = new Date();
            var currentYear = currentDate.getFullYear();
            var currentMonth = currentDate.getMonth() + 1; // æœˆä»½ä»Ž0开始，所以要+1

            // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前年份
            var yearSelect = document.getElementById('HYear');
            if (yearSelect) {
                yearSelect.value = currentYear;
            }

            // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前月份
            var monthSelect = document.getElementById('HMonth');
            if (monthSelect) {
                monthSelect.value = currentMonth;
            }
        }
        //#endregion

@@ -155,7 +212,8 @@
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: '部门代码', title: '部门代码', width: 150 }
                    , { field: '部门', title: '部门', width: 150 }

                    , { field: '年份', title: '年份', width: 200, hide: true }
                    , { field: '月份', title: '月份', hide: true }
                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
                    , { field: '职员代码', title: '职员代码', width: 150 }
                    , { field: '职员', title: '职员', width: 150 }
@@ -219,12 +277,30 @@

        //导入(保存)
        function set_AddNew(data) {
            // èŽ·å–选中的年份和月份
            var year = $("#HYear").val();
            var month = $("#HMonth").val();
            if (!year || !month) {
                layer.msg("请选择年份和月份！");
                return;
            }

            if (!option.data || option.data.length === 0) {
                layer.msg("无数据，请先导入数据！");
                return;
            }

            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                    var item = option.data[i];
                    // ä¸ºæ¯æ¡è®°å½•è®¾ç½®å¹´ä»½å’Œæœˆä»½ï¼ˆè¦†ç›–原有值）
                    item["年份"] = year;
                    item["月份"] = month;
                    num.push(item);
                }
            }
            

            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"] + '&和' + sessionStorage["OrganizationID"];