添康任务清单修复

llj

2025-12-05 1f6591e90e8ac4b5c04c06265e9464e3a9473ae2

添康任务清单修复

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

@@ -91,7 +91,7 @@
                    type: "Get",
                    url: GetWEBURL() + "/Gy_Mould/SaveBatchGen_MouldFile",
                    async: true,
                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum },
                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum, "user": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill_XW.html

@@ -1775,7 +1775,10 @@
            // åŒæ­¥å­è¡¨SN码到表头
            function syncSubTableToHeader() {
                var tableData = table.cache['mainTable'];
                if (tableData && tableData.length > 0) {
                var isStep=0;
                if ($("#HQCNote1_SN").val() != "" || $("#HQCNote1_SN").val() != null || $("#HQCNote2_SN").val() != "" || $("#HQCNote3_SN").val() != "" || $("#HQCNote4_SN").val() != "")
                    isStep=1
                if (tableData && tableData.length > 0 && isStep!=1) {
                    var firstRow = tableData[0];
                    $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
                    $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html

@@ -1413,7 +1413,7 @@
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(new Date(data.关闭日期), "yyyy-MM-dd")
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd")

                                , "HCheckBillType": data.HCheckBillType
                            });
                            //组织的值HOrgID变化，重新渲染
                            HOrgIDBar = sessionStorage["OrganizationID"];

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_WorkShopICStockBillList.html

@@ -45,6 +45,28 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
                                               style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
                                               style="width:190px;">
                                    </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="HCarBarCode" id="HCarBarCode">
@@ -72,7 +94,7 @@
                                    <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="HWHID" id="HWHID" value="0" style="display:none">
                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHID" id="btnHWHID" style="padding: 0 10px; margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
@@ -82,7 +104,7 @@
                                    <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="HSPID" id="HSPID" value="0" style="display:none">
                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHStockPlaceID" id="btnHStockPlaceID" style="padding: 0 10px; margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
@@ -285,6 +307,23 @@
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
                var today = new Date();
                var twoDaysAgo = new Date();
                twoDaysAgo.setDate(today.getDate() - 2);
                //根据日期间隔设置开始时间与结束时间
                $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格              
                set_InitGrid();
                get_FastQuery();
@@ -357,7 +396,23 @@
                }
            });            
            
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
                for (var i = 0; i < valueList.length; i++) {
                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("-1");
            }
            //#endregion
            //查询
            function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere) {
                var index = layer.load(0, { shade: false });
@@ -370,7 +425,7 @@
                    async:false,
                    data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID, "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                        if (data1.count >-1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
@@ -447,6 +502,10 @@

            //快速查询
            function get_FastQuery() {
                var HWHName = $("#HWHName").val(); 
                var HStockPlaceName = $("#HStockPlaceName").val();
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HCarBarCode = $('#HCarBarCode').val()
                var HBillType = $('#HBillType').val()
                var HProcExBillNo = $('#HProcExBillNo').val()
@@ -525,6 +584,14 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HBeginDate && HEndDate) {
                    sWhere += " and  CONVERT(varchar(100),操作时间, 23) between '" + HBeginDate + "' and  '" + HEndDate + "' "
                }
                if (HStockPlaceName) {
                    sWhere += "and åº“位名称 like '%" + HStockPlaceName + "%'";
                    
                }
                if (HWHName) sWhere += "and ä»“库 like '%" + HWHName + "%'";
                get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere);
                sWhere = "";//调用接口后清空sWhere缓存

@@ -532,6 +599,9 @@
           
            //重置快速查询
            function set_ClearQuery() {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
                $('#HCarBarCode').val("")
                $('#HBillType').val("")
                $('#HProcExBillNo').val("")
@@ -549,6 +619,7 @@
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                sWhere = "";
                get_FastQuery();
            }
          
@@ -569,7 +640,24 @@
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //日期间隔下拉列表监听
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);

                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                    //执行查询方法
                    get_FastQuery();
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
            });
            //仓库
            form.on('submit(btnHWHID)', function () {
                //页面层-自定义