工艺参数子表新增字段

wtt

2024-07-12 885ce08ac3b49c459640c3f99faa09feeba8da66

工艺参数子表新增字段

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>G:\issWeb\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>E:\智云mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html

@@ -311,7 +311,21 @@
            </div>
        </div>
    </div>

    <!--选择框-->
    <script type="text/html" id="HDataForm-select">
        <select name="HDataForm" lay-filter="HDataForm" id="HDataForm{{d.LAY_TABLE_INDEX+1}}">
            <option value="设备采集" selected>设备采集</option>
            <option value="手动输入">手动输入</option>
            <option value="文件引入">文件引入</option>
        </select>
    </script>
    <script type="text/html" id="HDataUnit-select">
        <select name="HDataUnit" lay-filter="HDataUnit" id="HDataUnit{{d.LAY_TABLE_INDEX+1}}">
            <option value="秒" selected>秒</option>
            <option value="分">分</option>
            <option value="时">时</option>
        </select>
    </script>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
@@ -395,7 +409,7 @@
                //禁用按钮
                var num = 1;
                HfBtn(num);

                debugger;
                //初始化表格
                get_InitGrid();

@@ -407,7 +421,7 @@


            //显示列数据
            DisPlay_HideColumn();
            /*DisPlay_HideColumn();*/

            //#endregion

@@ -447,7 +461,7 @@
                get_checkSearchHProc();
            });
            //#endregion
            

            // ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交

@@ -484,6 +498,30 @@
                set_CancelCloseBills(1);
            });

            //#region è¡¨æ ¼è¡Œé€‰æ‹©å¤„理
            form.on('select(HDataForm)', 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.HDataForm = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            form.on('select(HDataUnit)', function (data) {
                console.log(table.cache["mainTable"])
                //获取下拉框选中的值
                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.HDataUnit = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //#endregion

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
@@ -499,6 +537,9 @@
                    "HStd": "0",
                    "HMax": "0",
                    "HMin": "0",
                    "HDataForm": "设备采集",
                    "HDataUnit": "秒",
                    "HDataTimes": "0",
                    "HSourceBillNo": "0",
                    "HSourceBillType": "0",
                    "HSourceEntryID": "0",
@@ -508,9 +549,12 @@
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];

                        table.render(option);

                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
                            $('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
                        }
                        form.render('select');
                        break;
                    case 'btn-CopyLine':
                        var copydata = JSON.stringify(data);
@@ -526,7 +570,11 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上

                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
                                $('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
                            }
                            form.render('select');

                        }
                        break;
@@ -579,7 +627,9 @@
                        , { field: 'HTechParamUnitName', title: '工艺参数单位名称', edit: 'text', event: "HTechParamUnitName" }     //f7
                        , { field: 'HStd', title: '标准值', edit: 'text', totalRow: true }
                        , { field: 'HMax', title: '上限', edit: 'text', totalRow: true }
                        , { field: 'HMin', title: '下限', edit: 'text', totalRow: true }
                        , { field: 'HDataForm', title: '采集来源', templet: '#HDataForm-select' }
                        , { field: 'HDataUnit', title: '采集时间单位', templet: '#HDataUnit-select' }
                        , { field: 'HDataTimes', title: '采集周期频率', edit: 'text', totalRow: true }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                }
@@ -824,7 +874,7 @@
                                        "HTechParamID": checkStatus.data[0].HItemID,
                                        "HTechParamNumber": checkStatus.data[0].工艺参数代码,
                                        "HTechParamName": checkStatus.data[0].工艺参数名称,
                                       

                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -915,6 +965,11 @@
                            oldData.splice(obj.tr.data('index'), 1)
                            option.data = oldData;//将数据绑定到data上
                            table.render(option);
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");;
                                $('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");;
                            }
                            form.render('select');
                            layer.close(index);
                        }
                    });
@@ -1034,6 +1089,7 @@
            //#region ç¼–辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid)//加载表头
            {

                $.ajax({
                    url: GetWEBURL() + "Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
                    async: false,
@@ -1068,9 +1124,6 @@
                                , "HEmpName": tableMain[0]["负责人"]
                                , "HRemark": tableMain[0]["表头备注"]
                                , "HOrgID": tableMain[0].HOrgID



                                , "HMaker": tableMain[0]["制单人"]
                                , "HUpDater": tableMain[0]["修改人"]
                                , "HChecker": tableMain[0]["审核人"]
@@ -1080,12 +1133,15 @@
                                , "HCloseMan": tableMain[0]["关闭人"]
                                , "HCloseDate": tableMain[0]["关闭时间"] == null ? "" : Format(new Date(tableMain[0]["关闭时间"]), "yyyy-MM-dd")
                            });

                            //子表  èµ‹å€¼

                            option.data = tableSub;
                            console.log(tableSub)
                            table.render(option);

                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");;
                                $('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");;
                            }
                            form.render('select');
                            form.render('checkbox');
                        }
                    }
@@ -1362,7 +1418,7 @@
            OptionData = obj;
        }

      

    </script>
</body>
</html>