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

yusijie

2025-10-31 2e1310631f2f518db35557e9677a0b46844b8e75

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,11 +7,11 @@
    //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:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //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/grf/ÎïÁÏÌõÂë_º£³Ï (2).grf

New file
@@ -0,0 +1,581 @@
Object Report
    Version='6.8.2.2'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=135000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=8
        Height=5
        LeftMargin=0
        TopMargin=0
        RightMargin=0
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        ShowColLine=F
        ShowRowLine=F
        Object Border
            Styles=[]
        End
        Object Recordset
            Items Field
                Item
                    Name='条码编号'
                End
                Item
                    Name='供应商'
                End
                Item
                    Name='物料代码'
                End
                Item
                    Name='物料名称'
                End
                Item
                    Name='规格型号'
                End
                Item
                    Name='数量'
                    Type=Float
                    Format='0'
                End
                Item
                    Name='日期'
                    Type=DateTime
                    Format='yyyy/MM/dd'
                End
                Item
                    Name='客户编号'
                End
                Item
                    Name='款号'
                End
                Item
                    Name='分组'
                End
                Item
                    Name='采购单号'
                End
                    End
    End
    Items Column
        Item
            Name='Column3'
            Width=7.99042
        End
    End
Object ColumnContent
    Height=4.9
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.264583
                    Top=0.15875
                    ColumnCount=2
                    RowCount=16
                    ShowColLine=F
                    ShowRowLine=F
                    Items FreeGridColumn
                        Item[2]
                            Width=4.5
                        End
                                    End
                Items FreeGridRow
                    Item[1]
                        Height=0.38
                    End
                    Item[2]
                        Height=0.2
                    End
                    Item[3]
                        Height=0.38
                    End
                    Item[4]
                        Height=0.2
                    End
                    Item[5]
                        Height=0.38
                    End
                    Item[6]
                        Height=0.2
                    End
                    Item[7]
                        Height=0.38
                    End
                    Item[8]
                        Height=0.2
                    End
                    Item[9]
                        Height=0.38
                    End
                    Item[10]
                        Height=0.2
                    End
                    Item[11]
                        Height=0.38
                    End
                    Item[12]
                        Height=0.2
                    End
                    Item[13]
                        Height=0.38
                    End
                    Item[14]
                        Height=0.2
                    End
                    Item[15]
                        Height=0.38
                    End
                    Item[16]
                        Height=0.2
                    End
                            End
            Items FreeGridCell
                Item[1,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='供应商:'
                End
                Item[2,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Supplier)'
                End
                Item[3,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料编码:'
                End
                Item[4,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Material Code)'
                End
                Item[5,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料名称:'
                End
                Item[6,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Material Code)'
                End
                Item[7,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='款号:'
                End
                Item[7,2]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='采购单号:'
                End
                Item[8,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Style No.)'
                End
                Item[8,2]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Purchase Order No.)'
                End
                Item[9,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='分组:'
                End
                Item[9,2]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='规格:'
                End
                Item[10,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Group)'
                End
                Item[10,2]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(SKU NO.)'
                End
                Item[11,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='数量:'
                End
                Item[11,2]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='日期:'
                End
                Item[12,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Quantity)'
                End
                Item[12,2]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Date)'
                End
                Item[13,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='检验员:'
                End
                Item[13,2]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='客户编号:'
                End
                Item[14,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(QC)'
                End
                Item[14,2]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Consumer No.)'
                End
                Item[15,1]
                    Object Font
                        Name='宋体'
                        Size=90000,0
                        Weight=400
                        Charset=134
                    End
                    Text='检验结果:'
                End
                Item[16,1]
                    Object Font
                        Name='Arial'
                        Size=52500,0
                        Weight=400
                    End
                    Text='(Inspection status)'
                End
                    End
    End
    Item
        Type=Barcode
        Name='Barcode1'
        Left=6.00604
        Top=0.211667
        Width=1.5875
        Height=1.5
        BarcodeType=QRCode
        CaptionPosition=None
        Text='[#条码编号#]'
    End
    Item
        Type=FieldBox
        Name='FieldBox9'
        Left=1.5875
        Top=0.15875
        Width=4.20688
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='供应商'
    End
    Item
        Type=StaticBox
        Name='StaticBox5'
        Left=3.20146
        Top=4.20688
        Width=3.99521
        Height=0.45
        Object Font
            Name='宋体'
            Size=90000,0
            Weight=400
            Charset=134
        End
        Text='□合格 â–¡ä¸åˆæ ¼ â–¡ç‰¹é‡‡'
    End
    Item
        Type=StaticBox
        Name='StaticBox6'
        Left=3.41313
        Top=4.60375
        Width=3.99521
        Height=0.211667
        Object Font
            Name='Arial'
            Size=52500,0
            Weight=400
        End
        Text='(Pass)               (Fail)             (Spec.accepted)'
    End
    Item
        Type=FieldBox
        Name='FieldBox10'
        Left=2.19604
        Top=0.714375
        Width=3.59833
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='物料代码'
    End
    Item
        Type=FieldBox
        Name='FieldBox11'
        Left=1.79917
        Top=1.29646
        Width=3.99521
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='物料名称'
    End
    Item
        Type=FieldBox
        Name='FieldBox12'
        Left=1.19063
        Top=1.905
        Width=2.61938
        Height=0.45
        Object Font
            Name='宋体'
            Size=120000,0
            Bold=T
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='款号'
    End
    Item
        Type=FieldBox
        Name='FieldBox13'
        Left=1.19063
        Top=2.48708
        Width=2.61938
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='分组'
    End
    Item
        Type=FieldBox
        Name='FieldBox14'
        Left=4.78896
        Top=1.87854
        Width=2.80458
        Height=0.45
        Object Font
            Name='宋体'
            Size=90000,0
            Bold=T
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='采购单号'
    End
    Item
        Type=FieldBox
        Name='FieldBox15'
        Left=4.20688
        Top=2.46063
        Width=3.38667
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='规格型号'
    End
    Item
        Type=FieldBox
        Name='FieldBox16'
        Left=4.20688
        Top=3.04271
        Width=3.38667
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='日期'
    End
    Item
        Type=FieldBox
        Name='FieldBox17'
        Left=4.78896
        Top=3.62479
        Width=2.80458
        Height=0.45
        Object Font
            Name='宋体'
            Size=105000,0
            Weight=400
            Charset=134
        End
        ShrinkFontToFit=T
        DataField='客户编号'
    End
    Item
        Type=MemoBox
        Name='MemoBox1'
        Left=1.19063
        Top=3.06917
        Width=2.61938
        Height=0.45
        Object Font
            Name='宋体'
            Size=120000,0
            Bold=T
            Charset=134
        End
        Text='[#数量#]'
    End
End
End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End

 WebTM/views/Éú²ú¹ÜÀí/ÖÆÔìÖÜÆÚ±¨±í/Sc_ProductionCycleBillList.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>制造周期报表</title>
@@ -15,8 +16,9 @@
    <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>
</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -31,51 +33,85 @@
                                    </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 ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo"
                                            id="HSeOrderBillNo">
                                    </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 ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber"
                                            id="HMaterNumber">
                                    </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="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
                                            class="ForFilteringSchemes">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                <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>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
                                        id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                <select name="ColName" id="ColName" lay-filter="ColName"
                                                    style="width:190px;" class="ForFilteringSchemes">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator"
                                                style="width:190px;" class="ForFilteringSchemes">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="<=">
                                                    <=< /option>
                                                <option value="<">
                                                    << /option>
                                                <option value="<>">
                                                    <>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
@@ -83,26 +119,33 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
                                                    lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
                                                lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="<=">
                                                    <=< /option>
                                                <option value="<">
                                                    << /option>
                                                <option value="<>">
                                                    <>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
@@ -110,7 +153,8 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

@@ -118,19 +162,25 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
                                                    lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
                                                lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="<=">
                                                    <=< /option>
                                                <option value="<">
                                                    << /option>
                                                <option value="<>">
                                                    <>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
@@ -138,7 +188,8 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
                                                name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
@@ -179,7 +230,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {

            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
@@ -199,7 +250,7 @@
            var HBillType = "Sc_ProductionCycleBillList";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//需要设置的按钮的父级节点的id
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID","HParentID", 'sorderid', 'HInterID', 'HEntryID','HProcExchInterID'];
            var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID", 'sorderid', 'HInterID', 'HEntryID', 'HProcExchInterID'];
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
@@ -215,7 +266,7 @@

            //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            var Htype = "";
            //获取页面跳转参数
            var params = get_UrlVars();
@@ -228,14 +279,14 @@
            //初始化界面
            set_ClearBill();

        //#endregion
            //#endregion


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

            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {        
                switch (obj.event) {
                    //导出excel
                    case 'get_export':
                        get_Export();
@@ -248,7 +299,7 @@
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;                  
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
                        break;
@@ -290,7 +341,7 @@
                //存储条件
                get_WriteConfigFile();
                get_FastQuery(2);
                

            });
            //#endregion

@@ -308,6 +359,25 @@
                }
            });

            //日期间隔下拉列表监听
            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);
                }
            });

            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
@@ -319,23 +389,39 @@
                btnrowDouble(obj);
            })

        //#endregion
            //#endregion

       

        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#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);
                }

                //根据日期间隔设置开始时间与结束时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化组织
                Organ();          
                Organ();
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);

                get_DefaultModule();//加载方案
             

            }
            //#endregion

@@ -369,7 +455,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                   , page: false
                    , page: false
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -430,7 +516,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=3&linterid='+linterid+'&HSouceBillType='  //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , content: '../生产基础资料/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(table, option);
@@ -441,7 +527,7 @@
                    })
                }
            });
             //#endregion
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
@@ -450,7 +536,7 @@
                    url: GetWEBURL() + '/Gy_Source/list',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -532,7 +618,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }

                }); 
                });
            }
            //#endregion

@@ -668,12 +754,12 @@
            }


       


            function btnrowDouble(obj) {
                var data = [];
                data.push(obj.data);
               //返回方法
                //返回方法
                parent.GetGySource(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
@@ -681,7 +767,8 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
           
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HSeOrderBillNo = $("#HSeOrderBillNo").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var HOrgID = "";
@@ -758,7 +845,7 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
       

                //if (number == 1) {
                //    HOrgID = sessionStorage["OrganizationID"];
                //}
@@ -779,7 +866,11 @@
                    sWhere += " and é”€å”®è®¢å•å· like '%" + HSeOrderBillNo + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and æˆå“ç‰©æ–™ç¼–码 like '%" + HMaterNumber + "%'";                
                    sWhere += " and æˆå“ç‰©æ–™ç¼–码 like '%" + HMaterNumber + "%'";
                }

                if (HBeginDate && HEndDate) {
                    sWhere += " and  CONVERT(varchar(100),生产订单日期, 23) between '" + HBeginDate + "' and  '" + HEndDate + "'"
                }

                sWhere += addSWhereByOpenType();
@@ -793,8 +884,10 @@
            //#endregion

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {         

            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"));  //结束日期
                $("#HSeOrderBillNo").val("");
                $("#HMaterNumber").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -812,7 +905,7 @@
                $("#btnSearch").click();
            }
            //#endregion
    

            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
@@ -860,8 +953,8 @@
                get_FastQuery(2);
            }
            //#endregion
    
     


            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
@@ -1140,8 +1233,27 @@
                })
            }

            //#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("29");
            }
            //#endregion
        //以上是layui模块


            //#endregion
            //以上是layui模块
        });
        //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
        function HFilterScheme(obj)  //返回过滤方案
@@ -1181,10 +1293,11 @@
            });
        }
        //#endregion
        



    </script>

</body>
</html>

</html>

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

@@ -314,6 +314,18 @@
            <option value="1" selected>合格</option>
        </select>
    </script>
    <!--行下拉选择(状态)-->
    <script type="text/html" id="HCompareSymbol">
        <select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
            <option value="1" selected="selected">=</option>
            <option value="2">></option>
            <option value="3=">>=</option>
            <option value="4"><</option>
            <option value="5"><=</option>
            <option value="6"><></option>
            <option value="7">between</option>
        </select>
    </script>
    <!--复选框（重点检查）-->
    <script type="text/html" id="HKeyInspect">
        <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
@@ -428,7 +440,7 @@
                var NewRow = {
                    "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
                    , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "="
                    , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
                    , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -762,6 +774,17 @@
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HStatus = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //行选择处理（状态）
            form.on('select(HCompareSymbol)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HCompareSymbol = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
@@ -1142,7 +1165,7 @@
                    , { field: 'HSampleSchemeID', title: '抽样方案ID', edit: 'text', hide: true }
                    , { field: 'HSampleSchemeName', title: '抽样方案', edit: 'text', event: 'HSampleSchemeName' }
                    , { field: 'HStatus', title: '状态', templet: '#HStatus' }
                    , { field: 'HCompareSymbol', title: '比较符', edit: 'text' }
                    , { field: 'HCompareSymbol', title: '比较符', templet: '#HCompareSymbol'}
                    , { field: 'HTargetVal', title: '目标值', edit: 'text' }
                    , { field: 'HUpLimit', title: '上限值', edit: 'text' }
                    , { field: 'HDownLimit', title: '下限值', edit: 'text' }
@@ -1257,7 +1280,7 @@
                option.data = [{
                    "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
                    , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "1"
                    , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
                    , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -1278,7 +1301,7 @@
                option.data = [{
                    "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
                    , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
                    , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "1"
                    , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
                    , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
                    , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -1498,6 +1521,8 @@
                                $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].分析方法) + "']").attr("selected", true);
                                $('#HDefectLevel' + i + '').find("option[value='" + (data[(i - 1)].缺陷等级) + "']").attr("selected", true);
                                $('#HStatus' + i + '').find("option[value='" + (data[(i - 1)].状态) + "']").attr("selected", true);
                                $('#HCompareSymbol' + i + '').find("option[value='" + (data[(i - 1)].比较符) + "']").attr("selected", true);


                                if (data[(i - 1)].破坏性检验) {
                                    $('#HDestructInspect' + (i)).attr("checked", true);
@@ -1529,6 +1554,7 @@
                    $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                    $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                    $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
                    $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);

                    if (option.data[i - 1].HDestructInspect) {
                        $('#HDestructInspect' + i + '').attr("checked", true);
@@ -1560,6 +1586,7 @@
                        $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                        $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                        $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
                        $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);

                        if (option.data[i - 1].HDestructInspect) {
                            $('#HDestructInspect' + i + '').attr("checked", true);
@@ -1701,6 +1728,7 @@
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                                $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                                $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
                                $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);

                                if (option.data[i - 1].HDestructInspect) {
                                    $('#HDestructInspect' + i + '').attr("checked", true);
@@ -1715,6 +1743,7 @@
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                                $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
                                $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
                                $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);

                                if (option.data[i - 1].HDestructInspect) {
                                    $('#HDestructInspect' + i + '').attr("checked", true);

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_batch.html

@@ -233,7 +233,7 @@
            , element = layui.element;

        //定义全局变量
        var params = getUrlVars();
        var params = get_UrlVars();
        var HModName = "Cj_ProcessItemStationPlatform_batch";
        var option = [];
        //#endregion
@@ -260,35 +260,8 @@
        });
        //批次码回车方法
        $('#HBarCode_Batch').on('keydown', function (event) {
            var HBarCode = $('#HBarCodeSN').val();
            var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
            var HBarCode = $('#HBarCode_Batch').val();
            if (event.keyCode == 13) {
                if (!HBardCodeProcExchBillNo) {
                    layer.msg(get_MessageError("[0000-2-034]请先扫流转卡！", sessionStorage["HTranSlate"]))
                    return;
                } else {
                    HBarCode = HBarCode.toUpperCase();
                    if (!HBarCode) {
                        layer.msg(get_MessageError("[0000-2-019]条形码不能为空！", sessionStorage["HTranSlate"]))
                        return;
                    } else {
                        if (HBarCode.length != 29 && HBarCode.length != 50) {
                            layer.alert(get_MessageError("[3791-2-012]子件条码长度不为29位或50位!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]退出', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
                            return;
                        }

                        if (HBarCode.match(/[^\x00-\xff]/g) != null) {
                            layer.alert(get_MessageError("[3791-2-013]必须是半角字符!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]退出', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
                            return;
                        }
                    }
                }
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HBatchNo"] == "") {
                        layer.msg(get_MessageError("[3791-2-014]当前工序批次不能为空！", sessionStorage["HTranSlate"]))
                        return;
                    }
                }
                txtHBarCode_KeyDown(HBarCode);
            }
        });
@@ -341,7 +314,20 @@
        form.on('submit(btnHProc)', function () {
            btnHProc();
        });

        //变更
        form.on('submit(btnChange)', function (data) {
            $("#HBarCode_Batch").val("");
            $("#HBarCode_Batch").prop("readonly", false);
            $("#HBarCode_BatchSec").val("");
            $("#HBatchNo").val("");
            $("#HMaterNumber").val("");
            $("#HMaterName").val("");
            $("#HMaterModel").val("");
            $("#HSupID").val(0)
            $("#HSupName").val(0)
            //进入页面默认光标在流转卡上
            $("#HBarCode_Batch").focus();
        });

        //退出
        form.on('submit(btnExit)', function (data) {
@@ -443,53 +429,31 @@
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {

            var HProcExchBillNo = $("#HProcExchBillNo").val();
            var indexs = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
                url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
                async: false,
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                data: { "HBarCode": HBarCode,"user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(indexs);
                        var index = layer.load();

                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HBarCode_P").val(HBarCode);
                                    if (AllowLoadData()) {
                                        //保存数据
                                        set_AddAssemblyBill();
                                    }
                                }
                                else {
                                    layer.close(index);
                                    layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]确认', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]温馨提示", sessionStorage["HTranSlate"]) });
                                }
                                $("#HBarCodeSN").val("");
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg(get_MessageError("错误:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]确认', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]温馨提示", sessionStorage["HTranSlate"]) });
                            }
                        });
                        $("#HBarCode_BatchSec").val(HBarCode);
                        const parts = HBarCode.split('@');
                        $("#HBatchNo").val(parts[2]);
                        $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
                        $("#HMaterName").val(data1.data[0]["HMaterName"])
                        $("#HMaterModel").val(data1.data[0]["HMaterModel"])
                        $("#HSupID").val(data1.data[0]["HSupID"])
                        $("#HSupName").val(data1.data[0]["HSupName"])
                        $("#HBarCode_Batch").prop("readonly", true);
                    }
                    else {
                        layer.close(indexs);
                        layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
                    }
                    //光标跳转到SN条码文本框上
                    //$("#HBarCodeSN").focus();
                    $("#HBarCodeSN").val("");
                   
                },
                error: function (err) {
                    layer.close(indexs);