工序：新增/编辑 时,选着检验方案后,保存失败； 检验方案：回显分析方法、缺陷等级 、破坏性检验、重点检查； 工序检验单：选择抽样方案后关闭弹框； 产...

yusijie

2024-05-31 f7bb7e16d29508a3f0642710d9d0ed149f8ee660

工序：新增/编辑 时,选着检验方案后,保存失败；
检验方案：回显分析方法、缺陷等级 、破坏性检验、重点检查；
工序检验单：选择抽样方案后关闭弹框；
产品器具清单：增加工序字段；
维修记录单维护：初始化日期；
维修验收单维护：列表 显示 验收项目  显示不对,编辑 时,子表 验收项目 回显 数据不对

 WebTM/WebTM.csproj

@@ -1449,7 +1449,6 @@
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBill_PDA.html" />
@@ -2483,6 +2482,7 @@
    <Folder Include="Files\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\模治具管理\模具处理出库单\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

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

@@ -814,7 +814,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HQCSchemeName_Fst").val(checkStatus.data[0].检验方案名称);
                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeID_Fst").val(checkStatus.data[0].hmainid);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -839,7 +839,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HQCSchemeName_Proc").val(checkStatus.data[0].检验方案名称);
                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeID_Proc").val(checkStatus.data[0].hmainid);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -864,7 +864,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HQCSchemeName_Patrol").val(checkStatus.data[0].检验方案名称);
                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeID_Patrol").val(checkStatus.data[0].hmainid);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }

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

@@ -83,7 +83,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;width:185px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -162,6 +162,16 @@
                                            <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="HEquipModel" lay-verify="HEquipModel" id="HEquipModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -409,6 +419,12 @@
            });
            //#endregion

            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_Process();
            });
            //#endregion

            //#region é€‰æ‹©è´Ÿè´£äººæŒ‰é’®
            form.on('submit(btnSearchHEmp)', function () {
                get_checkSearchHEmp();
@@ -475,7 +491,7 @@

                //新增行表格数据
                var NewRow = {
                    "HMouldID": "",
                    "HMouldID": 0,
                    "HMouldNumber": "",
                    "HMouldName": "",
                    "HMouldType": "",
@@ -616,6 +632,40 @@

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HDeptName").val(checkStatus.data[0].部门名称);//部门名称

                        layer.close(layer.index);
                    }
                    , btn2: function (index, layero) {
                    },
                    end: function () {

                    }
                });
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_Process() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HProcID").val(checkStatus.data[0].HItemID);//部门id
                        $("#HProcName").val(checkStatus.data[0].工序名称);//部门名称

                        layer.close(layer.index);
                    }
@@ -975,6 +1025,8 @@
                                , "HEmpName": tableMain[0]["负责人"]
                                , "HRemark": tableMain[0]["表头备注"]
                                , "HOrgID": tableMain[0].HOrgID
                                , "HProcID": tableMain[0].HProcID
                                , "HProcName": tableMain[0].工序名称



@@ -1097,6 +1149,28 @@
                    return Result = false;
                }

                var sSubTable = table.cache['mainTable'];
                if (sSubTable.length < 1) {
                    layer.msg("明细信息不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HMouldID) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，器具编码不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (!sSubTable[i].HMouldQty) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，模穴数不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (!sSubTable[i].HRate) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，占比不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                }

                return Result;
            }

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

@@ -136,11 +136,14 @@
                                                    </button>
                                                </div>
                                            </div>

                                            <div class="layui-inline">
                                                <label class="layui-form-label">维修开始日期</label>
                                                <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
@@ -158,19 +161,15 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">维修结束日期</label>
                                                <label class="layui-form-label">维修开始日期</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                    <input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                                <label class="layui-form-label">维修结束日期</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                    <input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                </div>
                                            </div>
                                        </div>
@@ -1006,7 +1005,8 @@
                        $("#HPlanInterID").val(0);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));

                        $("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));                       
                    }
                });
            }

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

@@ -622,7 +622,13 @@
                    success: function (result) {
                        //console.log('gouba' + result);
                        if (result.count == 1) {
                            option.data = result.data;
                            var subarr = [];
                            var data = result.data;
                            for (var i = 0; i < result.data.length; i++) {
                                subarr.push({ "HRepairCheckID": data[i].HRepairCheckID, "HRepairCheckCode": data[i].验收项目代码, "HRepairCheckName": data[i].验收项目, "HRepairCheckContent": data[i].验收内容, "HManagerID": data[i].HManagerSonID, "HManagerCode": data[i].子负责人代码, "HManagerName": data[i].子负责人, "HRemark": data[i].表体备注});
                            }

                            option.data = subarr;
                            table.render(option);

                        } else {
@@ -715,7 +721,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../基础资料/基础资料/Gy_RepairList.html', 'yes'],
                                content: ['../../基础资料/基础资料/Gy_RepairCheckList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -729,8 +735,8 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HRepairCheckID: checkStatus.data[0].hitemid,
                                        HRepairCheckCode: checkStatus.data[0].维修项目代码,
                                        HRepairCheckName: checkStatus.data[0].维修项目,
                                        HRepairCheckCode: checkStatus.data[0].维修验收项目代码,
                                        HRepairCheckName: checkStatus.data[0].维修验收项目,
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -1802,6 +1802,8 @@
                        $("#HRejectQty").val(checkStatus.data[0].拒绝数);
                        $("#HUpLimit").val(checkStatus.data[0].上限值);
                        $("#HDownLimit").val(checkStatus.data[0].下限值);

                        if ($("#HEntryID").val() - 1 >= 0) {
                        option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
                        option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].抽样方案名称;
                        option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].抽样类型;
@@ -1814,6 +1816,7 @@
                        option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].拒绝数;
                        option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].上限值;
                        option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].下限值;
                        }             

                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {

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

@@ -1235,18 +1235,23 @@

            //增加一行
            function btnAddLine(NewRow) {
                //table.cache["mainTable"].push(NewRow);
                //option.data = table.cache["mainTable"];
                //table.render(option);
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);
                for (var i = 1; i <= option.data.length; i++) {
                    $('#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);

                    if (option.data[i - 1].HDestructInspect) {
                        $('#HDestructInspect' + i + '').attr("checked", true);
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
                    if (option.data[i - 1].HKeyInspect) {
                        $('#HKeyInspect' + i + '').attr("checked", true);
                    }                    
                }
                form.render('select');
                form.render('checkbox');
            }

            //复制一行
@@ -1264,6 +1269,20 @@
                    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++) {
                        $('#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);

                        if (option.data[i - 1].HDestructInspect) {
                            $('#HDestructInspect' + i + '').attr("checked", true);
                        }
                        if (option.data[i - 1].HKeyInspect) {
                            $('#HKeyInspect' + i + '').attr("checked", true);
                        }       
                    }
                    form.render('select');
                    form.render('checkbox');
                }
            }


 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -1871,6 +1871,7 @@
                        $("#HUpLimit").val(checkStatus.data[0].上限值);
                        $("#HDownLimit").val(checkStatus.data[0].下限值);

                        if ($("#HEntryID").val() - 1 >= 0) {
                        option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
                        option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].抽样方案名称;
                        option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].抽样类型;
@@ -1883,6 +1884,7 @@
                        option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].拒绝数;
                        option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].上限值;
                        option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].下限值;
                        }                        

                        rowdata_Value = [];
                        for (let i = 1; i <= checkStatus.data[0].样本量; i++) {