1

yxj

2024-04-25 be7ddfe0456fc4eb2ca49fa364e7967f66e5eb00

1

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html

@@ -1199,6 +1199,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    if (OptionData.length>0) {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
@@ -1207,6 +1208,9 @@
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                    
                                }
                            });
                        }
@@ -1232,17 +1236,20 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({

                                        "HPropertyID": checkStatus.data[0].HItemID,
                                        "辅助属性": checkStatus.data[0].辅助属性名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HPropertyID": OptionData.HItemID
                                    , "辅助属性": OptionData.辅助属性名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -1277,10 +1284,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -1313,10 +1324,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                            
@@ -1350,10 +1365,14 @@
                                        layer.close(index);//关闭弹窗
                                    }
                                    , end: function () {
                                        if (OptionData.length > 0) {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                            OptionData = [];
                                        }
                                       
                                    }
                                })
                            }
@@ -1386,10 +1405,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                            , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HSPID": OptionData.HItemID
                                    , "仓位名称": OptionData.仓位名称
                                })
                                        OptionData = [];
                                    }
                               
                            }
                            })
                        }
@@ -1517,7 +1540,29 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");

                        //未审核 å·²å…³é—­çš„单子不允许下推
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            var temp = getPushSource_MoveStockRequestInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                            if (temp != "none") {
                                if (temp.状态 != "已审核") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }

                                if (temp.行状态 != "") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }

                            } else {
                                return;
                            }
                        }

                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1654,6 +1699,33 @@
            }
            //#endregion

            //#region æ ¹æ®ä¸»å†…码与子内码获取源单调拨申请单数据
            function getPushSource_MoveStockRequestInBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
                    url: GetWEBURL() + "/Kf_MoveStockBill/loadKf_MoveStockBillMain_Push",
                    async: false,
                    type: "GET",
                    data: {
                        "HInterID": HSourceInterID
                        , "HSubID": HSourceEntryID
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            res = result.data[0];
                        } else {
                            res = result.data;
                            //layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        res = "none";
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
                return res;
            }
            //#endregion

            //#endregion



 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillList.html

@@ -254,6 +254,8 @@
                        , { field: 'HBillSubType', title: '单据类型', hide: true, sort: true }
                        , { field: '日期', title: '日期', width: 160, sort: true }
                        , { field: '单据号', title: '单据号', width: 160, sort: true }
                        , { field: '状态', title: '状态', width: 160, sort: true }
                        , { field: '行状态', title: '行状态', width: 160, sort: true }
                        , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true, sort: true }
                        , { field: '业务员代码', title: '业务员代码', width: 200, sort: true }
                        , { field: '业务员', title: '业务员', width: 200, sort: true }
@@ -281,6 +283,7 @@
                        , { field: '计量单位', title: '计量单位', width: 200, sort: true }
                        , { field: '应收数量', title: '应收数量', width: 115, sort: true, totalRow: true}
                        , { field: '实收数量', title: '实收数量', width: 200, sort: true, totalRow: true }
                        , { field: '关联数量', title: '关联数量', width: 200, sort: true, totalRow: true }
                        , { field: '单价', title: '单价', width: 200, sort: true, totalRow: true }
                        , { field: '金额', title: '金额', width: 200, sort: true, totalRow: true }
                        , { field: 'HWHID', title: 'HWHID', width: 115, hide: true, sort: true }

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -759,6 +759,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                              , end: function () {
                                    if (OptionData.length>0) {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
@@ -767,6 +768,9 @@
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                    
                                }
                            })
                        }
@@ -798,10 +802,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -833,10 +841,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -868,10 +880,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -903,10 +919,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                                        OptionData = [];
                                    }
                               
                            }
                            })
                        }
@@ -956,7 +976,29 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");

                        //未审核 å·²å…³é—­çš„单子不允许下推
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
                            if (temp != "none") {
                                if (temp.状态 != "已审核") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】单据状态不为已审核状态!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }

                                if (temp.行状态 != "") {
                                    layer.msg("下推失败!单据号【" + temp.单据号 + "】下选中的记录中存在已关闭状态的记录!");
                                    layer.close(index);//关闭弹窗
                                    return;
                                }

                            } else {
                                return;
                            }
                        }

                        //获取分步式调入单通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
@@ -990,7 +1032,7 @@
                                , "HSecManagerName": data.验收
                                , "HKeeperID": data.HKeeperID
                                , "HKeeperName": data.保管员
                                , "HSourceBillType": data.单据类型
                                //, "HSourceBillType": data.单据类型
                            });


@@ -1271,6 +1313,33 @@
            }
            //#endregion

            //#region æ ¹æ®ä¸»å†…码与子内码获取源单采购入库单数据
            function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
                var res = "none";
                $.ajax({
                    url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_Push",
                    async: false,
                    type: "GET",
                    data: {
                        "HInterID": HSourceInterID
                        , "HSubID": HSourceEntryID
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            res = result.data[0];
                        } else {
                            res = result.data;
                            //layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        res = "none";
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
                return res;
            }
            //#endregion

            //#endregion



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

@@ -66,20 +66,20 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HBillNo" style="width:190px;">
                                                <input type="text" class="layui-input" id="HBillNo" name="HBillNo" style="width:190px;">
                                                <input type="hidden" name="HInterID" id="HInterID" class="layui-input" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" id="HDate" style="width:190px;">
                                                <input type="date" class="layui-input" id="HDate" name="HDate" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">指导书名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HName" style="width:190px;">
                                                <input type="text" class="layui-input" id="HName" name="HName" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -97,13 +97,13 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">产品名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HMaterName" style="width:190px;">
                                                <input type="text" class="layui-input" id="HMaterName" name="HMaterName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">规格型号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HMaterModel" style="width:190px;">
                                                <input type="text" class="layui-input" id="HMaterModel" name="HMaterModel" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -122,7 +122,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HRemark" style="width:514px;">
                                                <input type="text" class="layui-input" id="HRemark" name="HRemark" style="width:514px;" value="">
                                            </div>
                                        </div>
                                    </div>
@@ -151,32 +151,18 @@
                                <table id="right_table" border="1" style="border-collapse: collapse;">
                                    <thead>
                                        <tr>
                                            <!--<th>次序号</th>
                                            <th>附件路径</th>
                                            <th>附件文件类型</th>
                                            <th>附件名</th>
                                            <th>上传日期</th>
                                            <th>上传人</th>-->
                                            <th style="min-width:100PX">文件名</th>
                                            <th style="min-width:100PX">大小</th>
                                            <th style="min-width:100PX">状态</th>
                                            <th style="min-width:100PX">操作</th>
                                        </tr>
                                        <!--<tr>
                                            <td><input type="text" class="layui-input" id="test" style="max-width:50px" readonly></td>
                                            <td>2</td>
                                            <td>3</td>
                                            <td>4</td>
                                            <td>5</td>
                                            <td>6</td>
                                        </tr>-->
                                    </thead>
                                    <tbody id="ProImgByList">
                                    </tbody>
                                </table>
                            </div>
                            <div class="right-button">
                                <button type="button" class="layui-btn layui-btn-primary" id="ChoseFile" lay-submit="" lay-filter="Add_Row" style="color:#232389;background-color:#D4D2CF">选择文件</button>
                            <div class="right-button" id="submitbtngroup">
                                <!--<button type="button" class="layui-btn layui-btn-primary" id="ChoseFile" lay-submit="" lay-filter="Add_Row" style="color:#232389;background-color:#D4D2CF">选择文件</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-primary" id="delete" lay-submit="" lay-filter="Add_Row" style="color:#232389">删除</button>-->
                            </div>
                        </div>
@@ -276,7 +262,7 @@
                });
                set_AddFNew();
                set_AddFNew2();
                PicUpload();
                //PicUpload();
            }
            else if (OperationType == 3) {//编辑
                set_EditFromGrid(linterid);
@@ -287,7 +273,11 @@

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                $("#ChoseFile").remove();
                HEntryID = Number($(obj.tr).attr("data-index")) + Number(1);
                //submitbtngroup è¿™ä¸ªæ˜¯ä¸Šä¼ æŒ‰é’®çš„父节点   åŠ¨æ€æ·»åŠ ä¸Šä¼ æŒ‰é’®   è§£å†³ä¸Šä¼ ä¸€æ¬¡ä¹‹åŽchoose方法不执行的bug
                $("#submitbtngroup").append('<button type = "button" class="layui-btn layui-btn-primary" lay-submit lay-filter="ChoseFile" id="ChoseFile" style="color:#232389;background-color:#D4D2CF">选择文件</button>');

                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
@@ -313,7 +303,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "流水号": "", "工序代码": "", "工序": "", "工位": "", "工位代码": "", "工作中心代码": "", "工作中心": "", "备注": "" };
                var NewRow = { "流水号": "", "HProcID": 0, "工序代码": "", "工序": "", "HWorkStationID": 0, "工位": "", "工位代码": "", "HCenterID": 0, "工作中心代码": "", "工作中心": "", "HRemark": "" };
                console.log(NewRow);
                switch (obj.event) {
                    //新增一行
@@ -426,6 +416,9 @@
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);
                        $("#HUnitNumber").val(checkStatus.data[0].计量单位代码)
                        $("#HUnitName").val(checkStatus.data[0].计量单位名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -443,37 +436,36 @@
            
            //保存
            form.on('submit(Saver)', function (data) {//保存
                var HMaterNumber = $('#HMaterNumber').val();
                var HUnitName = $('#HUnitName').val();
                //对象添加属性
                data.field.HBillNo = $("#HBillNo").val();
                data.field.HProcID = HProcID;
                data.field.HWorkStationID = HWorkStationID;
                data.field.HCenterID = HCenterID;
                data.field.HProcNo = HProcNo;
                data.field.HRemark = HRemark;
                var user = sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field)
                var sMainSub = oMain + ';' + 0 + ';' + user;

                if (HMaterNumber == "") {
                    layer.msg("产品没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        num.push(table.cache["mainTable"][i])
                }
                if (HUnitName == "") {
                    layer.msg("单位没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (option.data[0].流水号 == "" && option.data[0].工序代码 == "" && option.data[0].工序 == "" && option.data[0].工位 == "" && option.data[0].工位代码 == "" && option.data[0].工作中心代码 == "" && option.data[0].工作中心 == "" && option.data[0].备注 == "") {
                    layer.msg("没有明细行!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (option.data[0].工作中心 == "") {
                    layer.msg("工作中心不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                //if (HMaterNumber == "") {
                //    layer.msg("产品没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                //if (HUnitName == "") {
                //    layer.msg("单位没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                //if (option.data[0].流水号 == "" && option.data[0].工序代码 == "" && option.data[0].工序 == "" && option.data[0].工位 == "" && option.data[0].工位代码 == "" && option.data[0].工作中心代码 == "" && option.data[0].工作中心 == "" && option.data[0].备注 == "") {
                //    layer.msg("没有明细行!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                //if (option.data[0].工作中心 == "") {
                //    layer.msg("工作中心不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return false;
                //}
                $.ajax({
                    url: GetWEBURL() + '/Gy_SOPBill/ModifyByID',
                    url: GetWEBURL() + '/Gy_SOPBill/Save',
                    type: "POST",
                    data: { "oMain": sMainSub },
                    success: function (data1) {
@@ -496,6 +488,63 @@
                    }
                });
            });

            ////保存
            //form.on('submit(Saver)', function (data) {//保存
            //    var HMaterNumber = $('#HMaterNumber').val();
            //    var HUnitName = $('#HUnitName').val();
            //    //对象添加属性
            //    data.field.HBillNo = $("#HBillNo").val();
            //    data.field.HProcID = HProcID;
            //    data.field.HWorkStationID = HWorkStationID;
            //    data.field.HCenterID = HCenterID;
            //    data.field.HProcNo = HProcNo;
            //    data.field.HRemark = HRemark;
            //    var user = sessionStorage["HUserName"];
            //    var oMain = JSON.stringify(data.field)

            //    var sMainSub = oMain + ';' + 0 + ';' + user;

            //    if (HMaterNumber == "") {
            //        layer.msg("产品没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        return false;
            //    }
            //    if (HUnitName == "") {
            //        layer.msg("单位没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        return false;
            //    }
            //    if (option.data[0].流水号 == "" && option.data[0].工序代码 == "" && option.data[0].工序 == "" && option.data[0].工位 == "" && option.data[0].工位代码 == "" && option.data[0].工作中心代码 == "" && option.data[0].工作中心 == "" && option.data[0].备注 == "") {
            //        layer.msg("没有明细行!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        return false;
            //    }
            //    if (option.data[0].工作中心 == "") {
            //        layer.msg("工作中心不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        return false;
            //    }
            //    $.ajax({
            //        url: GetWEBURL() + '/Gy_SOPBill/ModifyByID',
            //        type: "POST",
            //        data: { "oMain": sMainSub },
            //        success: function (data1) {
            //            if (data1.count == 1) {
            //                option.data = arr;
            //                table.render(option);
            //                //layer.close(wait);
            //                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
            //                $('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);
            //                $('#delete').removeClass("layui-btn-disabled").attr("disabled", false);         
            //                document.getElementById("ChoseFile").style.backgroundColor = 'white'
            //                layer.msg("单据存盘完毕！单据号：" + $("#HBillNo").val())
            //            } else {
            //                //layer.close(wait);
            //                layer.alert(data1.Message, { icon: 5 });
            //            }
            //        }, error: function () {
            //            //layer.close(wait);
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    });
            //});
            //放弃
            form.on('submit(Give_Up)', function (data) {//放弃
                layer.alert('单据尚未保存，是否放弃？', {
@@ -512,9 +561,7 @@
                        $('#HUnitName').val("");
                        $('#HRemark').val("");

                        option.data = [{
                            "流水号": "", "工序代码": "", "工序": "", "工位": "", "工位代码": "", "工作中心代码": "", "工作中心": "", "备注": ""
                        }];
                        option.data = [{ "流水号": "", "HProcID": 0, "工序代码": "", "工序": "", "HWorkStationID": 0, "工位": "", "工位代码": "", "HCenterID": 0, "工作中心代码": "", "工作中心": "", "HRemark": "" }];
                        table.render(option);

                        layer.close(index);
@@ -587,14 +634,17 @@
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                        , { field: '流水号', title: '流水号', width: 200, edit: 'text' }
                        , { field: 'HProcNo', title: '流水号', width: 200, edit: 'text' }
                        , { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
                        , { field: '工序代码', title: '工序代码', width: 200, sort: true, edit: 'text', event: '工序代码' }
                        , { field: '工序', title: '工序', width: 200 }
                        , { field: 'HWorkStationID', title: 'HWorkStationID', width: 200, hide: true }
                        , { field: '工位', title: '工位', width: 200, event: '工位', edit: 'text' }
                        , { field: '工位代码', title: '工位代码', width: 200 }
                        , { field: 'HCenterID', title: 'HCenterID', width: 200, hide: true }
                        , { field: '工作中心代码', title: '工作中心代码', width: 110, event: '工作中心代码', edit: 'text' }
                        , { field: '工作中心', title: '工作中心', width: 110 }
                        , { field: '备注', title: '备注', width: 110, edit: 'text' }
                        , { field: 'HRemark', title: '备注', width: 110, edit: 'text' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width:80 }
                    ]]
                    , limits: [50, 500, 5000, 20000]
@@ -632,9 +682,7 @@
            }
            //无源单新增
            function set_AddFNew() {
                option.data = [{
                    "流水号": "", "工序代码": "", "工序": "", "工位": "", "工位代码": "", "工作中心代码": "", "工作中心": "", "备注": ""
                }];
                option.data = [{ "流水号": "", "HProcID": 0, "工序代码": "", "工序": "", "HWorkStationID": 0, "工位": "", "工位代码": "", "HCenterID": 0, "工作中心代码": "", "工作中心": "", "HRemark": "" }];
                table.render(option);
            }
            function set_AddFNew2() {
@@ -704,6 +752,7 @@
                            return;
                        }
                        , choose: function (obj) {
                           
                            // æ¸…空历史上传文件，解决choose只执行一次的问题！！！
                            uploadListIns.config.elem.next()[0].value = '';                            

@@ -806,6 +855,7 @@
                                    }
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HProcID: checkStatus.data[0].HItemID,
                                        å·¥åºä»£ç : checkStatus.data[0].工序代码,
                                        å·¥åº: checkStatus.data[0].工序名称,
                                    });
@@ -846,6 +896,7 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HWorkStationID: checkStatus.data[0].HItemID,
                                        å·¥ä½: checkStatus.data[0].工位名称,
                                        å·¥ä½ä»£ç : checkStatus.data[0].工位代码,
                                    });
@@ -886,6 +937,7 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HCenterID: checkStatus.data[0].HItemID,
                                        å·¥ä½œä¸­å¿ƒä»£ç : checkStatus.data[0].工作中心代码,
                                        å·¥ä½œä¸­å¿ƒ: checkStatus.data[0].工作中心名称,
                                    });
@@ -912,8 +964,6 @@
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);
                //rows++;
                layer.msg('增加一行按钮！')
            }
            //复制一行
            function btnCopyLine(data) {

 WebTM/views/Éú²ú¹ÜÀí/×÷ÒµÖ¸µ¼Êé/Gy_SOPBill_Video.html

@@ -48,13 +48,13 @@
                        <div class="layui-colla-item">
                            <!--top-->
                            <div class="layui-inline">
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">退出</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393" onclick="Exit(event,this)">退出</button>
                            </div>
                            <div class="layui-inline">
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">自动播放</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto" onclick="Autoplay(event,this)">自动播放</button>
                            </div>
                            <div class="layui-inline">
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo">隐藏视频</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo" onclick="HideVideo(event,this)">隐藏视频</button>
                            </div>
                            <div class="layui-inline">
                                <h1 style="text-align: center;margin-left:100px"><b>工位作业指导书</b></h1>
@@ -181,20 +181,9 @@
            });
            //#endregion

            var vvv = '';
            vvv += '<source src="../../../Files/flower.webm" type="video/webm" />'
            //$("#video").append(vvv);

            var video = document.querySelector("video");

            //开始播放视频
            video.addEventListener("play", (event) => {
                $('#test1').css('opacity', 0.5);
            });
            //结束播放视频
            video.addEventListener("pause", (event) => {
                $('#test1').css('opacity', 1);
            });
            //var vvv = '';
            //vvv += '<source src="../../../Files/flower.webm" type="video/webm" />'
            ////$("#video").append(vvv);           

            //#region åˆ¤æ–­æ“ä½œç±»åž‹(这里没用到)
            if (OperationType == 1 || OperationType == 2) {//无源新增
@@ -214,6 +203,17 @@
                layer.alert("未知操作类型！", { icon: 5 });
            }
            //#endregion

            var video = document.querySelector("video");

            //开始播放视频
            video.addEventListener("play", (event) => {
                $('#test1').css('opacity', 0.5);
            });
            //结束播放视频
            video.addEventListener("pause", (event) => {
                $('#test1').css('opacity', 1);
            });

            //获取当前生产资源的生产订单
            get_Display(sWhere, HID);
@@ -317,21 +317,33 @@
                            }
                            option.data = data1.data;
                            table.render(option);
                            //支持播放的视频格式
                            var videoExtensions = ['.mp4', '.webm', '.Ogg'];

                            for (let i = 0; i < data1.data.length; i++) {
                                var html = '';
                                if (data1.data[i].文件类型 == '.jpeg' || data1.data[i].文件类型 == '.jpg') {
                                    var FileName = data1.data[i].文件名称;
                                    var FilePath = data1.data[i].文件地址;
                                    //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
                                    html += '<div><img src=../SOP作业指导书/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
                                    html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
                                    $("#file").append(html);
                                }
                                if (data1.data[i].文件类型 == '.pdf') {
                                    var FileName2 = data1.data[i].文件名称;
                                    var FilePath2 = data1.data[i].文件地址;
                                    //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
                                    html += '<div><embed src="../SOP作业指导书/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                    html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                    $("#file").append(html);
                                }
                                if (videoExtensions.includes(data1.data[i].文件类型)) {
                                    var FileName3 = data1.data[i].文件名称;
                                    var FilePath3 = data1.data[i].文件地址;
                                    var vvv = '';
                                    vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
                                    $("#video").append(vvv);
                                }

                            }

                            if (data1.data.length == 0) {
@@ -469,6 +481,48 @@
        function GetICMOBillValue(obj) {
            get_Display_All(obj[0].HSourceID_b, obj[0].hmainid);
        }

        //退出按钮点击事件
        function Exit(event, obj) {
            if (linterid == undefined) {
                //关闭页签
                Pub_Close(2);
            }
            else {
                //关闭页签
                Pub_Close(1);
            }
        }

        //隐藏视频
        function HideVideo(event, obj) {
            if (document.getElementById("HideVideo").innerHTML == "隐藏视频") {
                document.getElementById("IsHide").style.display = "none";//隐藏视频
                document.getElementById("HideVideo").innerHTML = "显示视频";
            } else {
                document.getElementById("IsHide").style.display = "inherit";//隐藏视频
                document.getElementById("HideVideo").innerHTML = "隐藏视频";
            }
        }

        //自动播放
        function Autoplay(event, obj) {
            var num = 0;
            if (document.getElementById("auto").innerHTML == "自动播放") {
                //ins.reload({ autoplay: true }) //轮播图播放方式改为自动播放
                document.getElementById("auto").innerHTML = "手动播放";
                var timer = setInterval(function () {
                    set_LoadAgain();
                    if (document.getElementById("auto").innerHTML === "自动播放") {
                        clearInterval(timer); //暂停周期函数
                    }
                }, 120000) //每隔两分钟执行一次
                num = 1;
            } else if (document.getElementById("auto").innerHTML = "手动播放" && num == 0) {
                //ins.reload({ autoplay: false }) //轮播图播放方式改为手动播放
                document.getElementById("auto").innerHTML = "自动播放";
            }
        }
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/MES_ColorRecordBillList.html

@@ -231,7 +231,7 @@

                //加载数据到网格
                get_FastQuery();
                DisPlay_HideColumn();
               
            }

            //列明显示下拉框
@@ -250,6 +250,7 @@

            //加载网格
            function get_Display(sWhere) {
                sWhere += " order by æ—¥æœŸ desc ";
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/ColorRecord/ColorRecordList",
@@ -307,6 +308,8 @@
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            DisPlay_HideColumn();
                        }
                    },
                    error: function (err) {

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -77,10 +77,13 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                <select name="BillType" id="BillType" lay-verify="BillType">
                                                    <!--动态渲染源单类型-->
                                                </select>
                                                <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="1102">采购订单</option>
                                                    <option style="color:blue;" value="1201">采购入库单</option>
                                                </select>
                                                </select>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -108,9 +111,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">采购员</label>
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HEmpName" id="HEmpName"  class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -180,7 +183,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">付款日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input" lay-verify="HPayDate" name="HPayDate" id="HPayDate" style="width:190px;">
                                                <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -379,6 +382,12 @@
            //初始化子表
            set_InitGrid();

            //初始化组织
            Organ();

            //初始化 èŽ·å–源单类型
            HSourceBillType();

            //#region åˆ¤æ–­æ“ä½œç±»åž‹å¹¶åˆå§‹åŒ–界面
            if (OperationType == 1) {                                                   //无源单新增
               /* $("#HItemID").val(0);*/
@@ -411,8 +420,9 @@

            DisPlay_HideColumn();

            //初始化组织
            Organ();
            

            

            //#endregion

@@ -508,7 +518,7 @@
            });
            //#endregion

            //#region é€‰æ‹©é‡‡è´­å‘˜æŒ‰é’®
            //#region é€‰æ‹©ä¸šåŠ¡å‘˜æŒ‰é’®
            form.on('submit(HEmpList)', function () {
                get_checkEmp();
            });
@@ -711,10 +721,7 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            if (OperationType == 1 || OperationType == 4) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
@@ -781,13 +788,13 @@
            }
            //#endregion

            //#region é€‰æ‹©é‡‡è´­å‘˜
            //#region é€‰æ‹©ä¸šåŠ¡å‘˜
            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '采购员列表'//标题
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                })
@@ -867,6 +874,30 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region èŽ·å–源单类型
            function HSourceBillType() {
                var HName = '应付单';
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HSourceBillTypes += '<option  style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
                            }
                            $("#BillType").append(HSourceBillTypes);
                            form.render('select');
                        }
                    }
                })
            }
            //#endregion
@@ -1024,7 +1055,7 @@
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //#endregion
               

                switch (field) {
                    case "HQty":                                         //数量
@@ -1227,7 +1258,7 @@
                                , "HSSName": data.结算方式
                                , "HPSStyleID": data.HPSStyleID
                                , "HPSStyleName": data.采购方式
                                , "HPayDate": formatDate(data.付款日期)
                                , "HReceiveDate": formatDate(data.付款日期)
                                , "HRemark": data.表头备注
                                , "HExplanation": data.摘要
                                , "HInnerBillNo": data.内部单据号
@@ -1346,7 +1377,7 @@
                        , "HMangerID": dataArray[0].HManagerID
                        , "HMangerName": dataArray[0].主管
                        , "HEmpID": dataArray[0].HEmpID
                        , "HEmpName": dataArray[0].采购员
                        , "HEmpName": dataArray[0].业务员
                        , "HSupID": dataArray[0].HSupID
                        , "HSupName": dataArray[0].供应商
                        , "HCurID": dataArray[0].HCurID
@@ -1427,7 +1458,7 @@
                        , "HManagerID": dataArray[0].hmanagerid
                        , "HMangerName": dataArray[0].主管
                        , "HEmpID": dataArray[0].HEmpID
                        , "HEmpName": dataArray[0].采购员
                        , "HEmpName": dataArray[0].业务员
                        , "HSupID": dataArray[0].HSupID
                        , "HSupName": dataArray[0].供应商
                        , "HCurID": dataArray[0].HCurID
@@ -1442,7 +1473,7 @@
                    for (var i = 0; i < dataArray.length; i++) {
                        rowdata.push(
                            {
                                "HMaterID": dataArray[i].hmaterid
                                "HMaterID": dataArray[i].HMaterID
                                , "物料代码": dataArray[i].物料代码
                                , "物料名称": dataArray[i].物料名称
                                , "规格型号": dataArray[i].规格型号
@@ -2134,7 +2165,7 @@

                    , "HDeptID": dataArray[0].HDeptID
                    , "HDeptName": dataArray[0].部门
                    , "HMangerID": dataArray[0].hmanagerid
                    , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
                    , "HMangerName": dataArray[0].主管
                    , "HEmpID": dataArray[0].HEmpID
                    , "HEmpName": dataArray[0].业务员
@@ -2154,13 +2185,13 @@
                for (var i = 0; i < dataArray.length; i++) {
                    rowdata.push(
                        {
                            "HMaterID": dataArray[i].hmaterid
                            "HMaterID": dataArray[i].HMaterID
                            , "物料代码": dataArray[i].物料代码
                            , "物料名称": dataArray[i].物料名称
                            , "规格型号": dataArray[i].规格型号
                            , "HUnitID": dataArray[i].hunitid
                            , "HUnitID": dataArray[i].HUnitID
                            , "计量单位": dataArray[i].计量单位
                            , "HQty": dealDoubleToFixed(dataArray[i].数量-dataArray[i].关联数量, 1)
                            , "HQty": dealDoubleToFixed(dataArray[i].实收数量-dataArray[i].关联数量, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -1114,7 +1114,7 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            //ReRoadBillMain();
                        }

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -711,14 +711,18 @@
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                    if (OptionData.length>0) {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                            "HMaterID": OptionData.HItemID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                   
                                }
                            })
                        }
@@ -750,10 +754,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -785,10 +793,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                         , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -820,10 +832,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    if (OptionData.length > 0) {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                        OptionData = [];
                                    }
                                   
                                }
                            })
                        }
@@ -855,10 +871,15 @@
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                    if (OptionData.length > 0) {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                                        OptionData = [];
                                    }

                                
                            }
                            })
                        }

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillList.html

@@ -266,6 +266,8 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '单据号', title: '单据号', width: 195, sort: true }
                        , { field: '单据类型', title: '单据类型', width: 110, sort: true, hide: true }
                        , { field: '状态', title: '状态', width: 195, sort: true }
                        , { field: '行状态', title: '行状态', width: 195, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 110, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 110, sort: true }
                        //, { field: '仓库代码', title: '仓库代码', width: 125, sort: true }