合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/SB_TechnologyParameterList.html

@@ -92,13 +92,13 @@
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                        <div class="layui-inline " style="display:none">
                                            <label class="layui-form-label">开始日期</label>
                                            <div class="layui-input-block">
                                                <input type="datetime" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline" style="display:none">
                                            <label class="layui-form-label">结束日期</label>
                                            <div class="layui-input-block">
                                                <input type="datetime" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;" readonly>
@@ -157,17 +157,22 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HMater; //物料
            var HProc;  //工序
            var HEquId;   //设备
            var HTeachName;   //工艺参数
            var HType;//类型
            var HModName = "SB_TechnologyParameterList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序"];
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var HProcID = params[params[2]]; //从参数中获取 å•æ®å†…码
            var HProcID = params[params[2]]; //从参数中获取 å·¥åº
            HTeachName = decodeURI(params[params[3]]); //从参数中获取 å·¥è‰ºå‚æ•°
            HType = decodeURI(params[params[4]]); //从参数中获取 å·¥è‰ºå‚æ•°
            var ins;                        //用于导出excel
            var HMater; //物料
            var HProc;  //工序
            var HEquId;   //设备
           
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -244,7 +249,11 @@
                set_InitGrid1(); //初始化表格       
                if (OperationType == 3) {
                    Get_SB_EquipICMOTechParamBill(linterid, HProcID);//获取流转卡,工序,设备,物料,开始结束时间
                    Get_TechParam();//获取当前流转卡,物料,工序,设备 å¯¹åº”的产品工艺参数清单
                    $("#HTechParamName").val(HTeachName);
                    $("#HEquipType").val(HType);
                    $('#HEquipType').parents('.layui-inline').hide();
                    form.render('select');
                    Get_TechParam();//获取当前流转卡,物料,工序,设备 å¯¹åº”的产品工艺参数清单                 
                    get_FastQuery();
                    //加载折线图
                    set_Graphics();
@@ -497,7 +506,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -511,7 +520,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -533,7 +542,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -555,7 +564,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -793,11 +802,12 @@
                HMater = $("#HMaterID").val(); 
                HProc = $("#HProcID").val();
                HEquId = $("#HEquipID").val();
                HTeachName = $("#HTechParamName").val() == "" ? "":$("#HTechParamName").val();
                $.ajax({
                    url: GetWEBURL() + "/QC_CustomerAppealReport/Get_TechParamList",
                    type: "GET",
                    async: false,
                    data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId,"user": sessionStorage["HUserName"] },
                    data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId, "HTeachName": HTeachName,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = [];