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

zrg

2024-08-16 3a375fddf701faeae14c9edab442973ed7878767

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -511,6 +511,7 @@
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_BatchSplit.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,13 +5,15 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";     */        //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
  /*  var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
 /*   var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    /*var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/"; */   //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -605,13 +605,24 @@
                                                        <input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否常用材料">
                                                    </div>
                                                </div>

                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> åŠ æƒå¹³å‡ä»·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HAvgStockPrice" lay-verify="HAvgStockPrice" id="HAvgStockPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">默认税率</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HTaxRate" lay-verify="HTaxRate" id="HTaxRate" autocomplete="off" value="13">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">默认利润率</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HProfitRate" lay-verify="HProfitRate" id="HProfitRate" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
@@ -620,7 +631,6 @@
                                                        <input class="layui-input" name="HFootPrice" lay-verify="HFootPrice" id="HFootPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>

                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å«ç¨Žæˆæœ¬ä»·</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
@@ -876,6 +886,39 @@
                }
            });

            //监听不含税成本价
            $("#HNoTaxCost").blur(function (data) {
                // èŽ·å–输入框的值
                var value = $("#HNoTaxCost").val();
                if (!ref.test(value)) {
                    layer.msg("不含税成本价正确数值", { time: 3000, });
                    $("#HNoTaxCost").val("0");
                } else {
                    var TaxRate = $("#HTaxRate").val();
                    var HProfitRate = $("#HProfitRate").val();
                    var HTaxCost = Number((value * (100 + TaxRate*1) / 100).toFixed(4))   //含税成本价 = ä¸å«ç¨Žæˆæœ¬ * ï¼ˆ100 + ç¨ŽçŽ‡ï¼‰/100 
                    var HFootPrice = Number((HTaxCost * (100 + HProfitRate*1) / 100).toFixed(4))// ç»“ç®—ä»· = å«ç¨Žæˆæœ¬ä»· * ï¼ˆ100+ åˆ©æ¶¦çŽ‡ï¼‰/100
                    $("#HTaxCost").val(HTaxCost);
                    $("#HFootPrice").val(HFootPrice);
                }
            });
            //监听含税成本价
            $("#HTaxCost").blur(function (data) {
                // èŽ·å–输入框的值
                var value = $("#HTaxCost").val();
                if (!ref.test(value)) {
                    layer.msg("不含税成本价正确数值", { time: 3000, });
                    $("#HTaxCost").val("0");
                } else {
                    var TaxRate = $("#HTaxRate").val();
                    var HProfitRate = $("#HProfitRate").val();
                    var HNoTaxCost = Number((value / (100 + TaxRate*1) * 100).toFixed(4))//不含税成本价 = å«ç¨Žæˆæœ¬/ ï¼ˆ100 + ç¨ŽçŽ‡ï¼‰/100 ç»“ç®—ä»· 
                    var HFootPrice = Number((value * (100 + HProfitRate*1) / 100).toFixed(4))
                    $("#HNoTaxCost").val(HNoTaxCost);
                    $("#HFootPrice").val(HFootPrice);
                }
            });

            //选择颜色
            colorpicker.render({
                elem: '#HColorNoName'
@@ -1008,9 +1051,11 @@
                                , "HTaxCost": data.含税成本价
                                , "HNoTaxCost": data.不含税成本价
                                , "HOnceRightRate": data.一次合格率标准值
                                , "HQtyDec": data.数量精度 == null ? "0" : data.数量精度
                                , "HPriceDec": data.单价精度 == null ? "0" : data.单价精度
                                , "HMoneyDec": data.金额精度 == null ? "0" : data.金额精度
                                , "HQtyDec": data.数量精度 == null ? "4" : data.数量精度
                                , "HPriceDec": data.单价精度 == null ? "4" : data.单价精度
                                , "HMoneyDec": data.金额精度 == null ? "2" : data.金额精度
                                , "HTaxRate": data.默认税率 == null ? "13" : data.默认税率
                                , "HProfitRate": data.默认利润率 == null ? "0" : data.默认利润率

                                , "HHeight_M": data.毛高
                                , "HInches_M": data.寸数组织

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -422,6 +422,7 @@
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();

                //查询
                //根据页面的打开方式，判断过滤条件sWhere是否需要进行额外的添加
                //获取参数
@@ -948,7 +949,7 @@
            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="0" style="color:red;" selected></option>';
                var HProjectList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",

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

@@ -77,7 +77,7 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <<!--button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Use"><i class="layui-icon layui-icon-ok"></i>使用</button>
@@ -301,6 +301,45 @@
                    }
                });
            }

            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid.toString();
                    var hsubid = data[0].hsubid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Gy_SOPBill/Del", //方法所在页面和方法名
                            data: { "hmainid": hmainid, "hsubid": hsubid, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                }
            }

            //打印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
@@ -360,7 +399,7 @@
                $("#HMaterName").val("");
                $("#HCenterName").val("");
                $("#btnSearch").click();
            }                      
            }

            //预览
            function get_ViewReport() {
@@ -417,7 +456,7 @@
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HCenterName").val("");
                

                sWhere = " ";
                get_Display(sWhere);
            }

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html

@@ -556,7 +556,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../采购基础资料/Gy_Supplier_Edit.html?OperationType=1&HSupTypeID=' + HSupTypeID,
                    content: '../采购基础资料/Gy_Supplier_Edit.html?OperationType=1&linterid=0',
                    end: function () {
                        //刷新页面,
                        location.reload();

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html

@@ -403,12 +403,15 @@
            $("#HCreator").val(sessionStorage["HUserName"]);//创建人
            //判断操作类型
            if (OperationType == 1) {//无源单
                setInitHCurName()
                set_AddFNew();
                //初始化表
                get_InitGrid();

            }

            if (OperationType == 2) {//新增流水号
            else if (OperationType == 2) {//新增流水号
                setInitHCurName()
                var HSupTypeID = params[params[1]];//类型id
                setHNumber(HSupTypeID);
                $("#HNumber").attr("readonly", true);
@@ -793,7 +796,30 @@
                    }
                });
            }

            //新增设置默认税率和货币
            function setInitHCurName() {
                var ajaxLoad = layer.load();
                $("#HTaxRate").val(13);
                $.ajax({
                    url: GetWEBURL() + 'Gy_Currency/list1',
                    type: "GET",
                    async:false,
                    data: { "sWhere": " and è´§å¸åç§° = '人民币'", "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data != null) {
                            layer.close(ajaxLoad);
                            $("#HCurName").val(data1.data[0]["货币名称"])
                            $("#HCurID").val(data1.data[0]["HItemID"])
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //#region è®¡åˆ’表
            function set_GridDelete(obj) {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -267,6 +267,7 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>打印</button>-->
                            <div class="layui-btn-container" id="HideButtonList">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_BatchSplitPushDown" id="set_BatchSplitPushDown"><i class="layui-icon layui-icon-form"></i>批量拆分下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -423,6 +424,9 @@
                    //多行下推
                    case 'set_ShowBill_dh': set_ShowBill_dh();
                        break;
                    //批量拆分下推
                    case 'set_BatchSplitPushDown': set_BatchSplitPushDown();
                        break;                        
                    //履历查询
                    case 'set_Resume': set_Resume();
                        break;
@@ -1263,6 +1267,30 @@
                    layer.msg('请选择一行数据下推！');
                }
            }
            
            //批量拆分下推流转卡
            function set_BatchSplitPushDown() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length > 0) {
                    var linterid = [];

                    for (var i = 0; i < data.length; i++) {
                        linterid.push(data[i].hmainid + '@' + data[i].hsubid);
                    }

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序流转卡-编辑'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html?OperationType=2&linterid=' + linterid.toString() + '&HSouceBillType=3710'
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }

            //履历查询
            function set_Resume() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -290,7 +290,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>上移</button>
@@ -298,6 +298,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>优先级</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>准备排序</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>选产线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>选操作工</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>工艺路线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>工厂日历</button>
@@ -330,6 +331,7 @@
</script>
<script>
    var OptionData = [];
    var OptionData_Emp = [];
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
@@ -565,6 +567,10 @@
                case 'set_Souce':
                    set_Souce(data);
                    break;
                //选操作工
                case 'set_Emp':
                    set_Emp(data);
                    break;                    
                //查看工艺路线
                case 'set_Routing':
                    set_Routing();
@@ -836,7 +842,6 @@
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150, sort: true });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true });
@@ -853,6 +858,7 @@
            columns.push({ field: '昨日数量', title: '昨日数量' });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });
            columns.push({ field: '操作工', title: '操作工', width: 150, edit: 'text', event: "HEmpID" });

            columns.push({
                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
@@ -1009,7 +1015,7 @@
                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: 'T31', title: 'T31', width: 70 });//0
            columns.push({ field: '订单类型', title: '订单类型', width: 150, sort: true });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150, sort: true });
@@ -1040,6 +1046,7 @@
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
@@ -1060,7 +1067,7 @@
                        sWhere = {
                            HORGID: sessionStorage["OrganizationID"]
                            , HBEGINDATE: field
                            , HENDDATE: field                            
                            , HENDDATE: field
                        }
                        get_Display_3(JSON.stringify(sWhere));
                    });
@@ -1079,14 +1086,14 @@
                    //            }
                    //        }
                    //    }
                    //})            
                    //})
                }
            }
        }
 

        //缺料分析表格数据
        function set_InitGrid1(field) {
            var columns = [];         
            var columns = [];
            columns.push({ field: 'HOrgName', title: '采购组织', sort: true });
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true });
            columns.push({ field: 'HMaterName', title: '物料名称', sort: true });
@@ -1095,7 +1102,7 @@
            columns.push({ field: 'CountHQty', title: '合计', sort: true });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true, totalRow: true });
            columns.push({ field: Format(field, 'yyyy-MM-dd'), title: Format(field, 'MM.dd'), width: 70 })
         

            option_columns = columns;
            option3 = {
                elem: '#mainTable_Material'
@@ -1107,7 +1114,7 @@
                , limit: Number.MAX_VALUE//默认显示全部
                , done: function (res, page, count) {
                    soulTable.render(this);
                  

                }
            };
        }
@@ -1722,10 +1729,10 @@
                }
                if (isNaN(data[i]["HSourceID"])) {
                    return layer.msg("选择生产资源!!")
                }               
                }
                HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
            }
           

            $('#HProgressBar').html(`
    <div class="layui-progress" lay-filter="demo-filter-progress">
      <div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1793,7 +1800,7 @@
                                return layer.alert("第" + (i + 1) + '行，小时产能未设置，请核对数据。' + '</br>' + '1.物料未添加工艺路线' + '</br>' + '2.工艺路线中未设置小时产能' + '</br>' + '3.生产资源未设置单班工时' + '</br>' + '4.生产资源中绑定工作中心与工艺路线中设置的工作中心不一致');
                            }
                        }
                        

                    } else {
                        //layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -2726,12 +2733,59 @@
                return layer.msg("请选择数据!")
            }
        }
        
        //选操作工
        function set_Emp(data) {
            if (data != 0) {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "职员列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ["../../基础资料/公用基础资料/Gy_EmployeeList.html?Htype=HEmp", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        OptionData_Emp[0] = checkStatus.data[0];
                        layer.close(index);//关闭弹窗
                    }
                    , end: function () {
                        if (OptionData_Emp.length > 0) {
                            var num = 0;
                            for (var i = 0; i < option.data.length; i++) {
                                if (num >= data.length) {
                                    break;
                                }
                                if (option.data[i]["LAY_CHECKED"] == true) {
                                    option.data[i]["HEmpID"] = OptionData_Emp[0].HItemID;
                                    option.data[i]["操作工"] = OptionData_Emp[0].职员名称;
                                    num += 1;
                                }
                            }
                            table.render(option);
                        }
                    }
                })
            }
            else {
                return layer.msg("请选择数据!")
            }
        }

        //保存
        function set_AddNew() {

            //删除子表数据 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
            var num = [];            
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
@@ -2743,7 +2797,7 @@
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }           
            }

            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
@@ -2852,6 +2906,47 @@
                            }
                        })
                    }

                    //操作工
                    if (obj.event == "HEmpID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "员工列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/公用基础资料/Gy_EmployeeList.html?Htype=HEmp", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                OptionData_Emp[0] = checkStatus.data[0];
                                //更新表格缓存的数据
                                obj.update({
                                    "HEmpID": checkStatus.data[0].HItemID
                                    , "操作工": checkStatus.data[0].职员名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                            , end: function () {
                                if (OptionData_Emp.length > 0) {
                                    obj.update({
                                        "HEmpID": OptionData_Emp[0].HItemID
                                        , "操作工": OptionData_Emp[0].职员名称
                                    })
                                    OptionData_Emp = [];
                                }
                            }
                        })
                    }

                    obj.event = "";
                    return false;
                } else if (event.key == "F8") {
@@ -3145,7 +3240,7 @@
                    item.规格型号 = item.规格型号.replace(/[,]+/g, '，');  // å°†æ¢åˆ†å·æ›¿æ¢ä¸ºç©ºå­—符串
                }
            });
            table.exportFile(ins.config.id, data, "xls"); 
            table.exportFile(ins.config.id, data, "xls");
        }

        //排产功能
@@ -3263,7 +3358,9 @@
                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }                           
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
@@ -3492,7 +3589,7 @@


                        var dataCol = [];//数据库查询出的列数据
                       

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option3.cols[0].length - 1; i++) {
@@ -3513,7 +3610,7 @@
                            } else {
                                option3.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            

                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
@@ -3536,7 +3633,7 @@
                            else {
                                break;
                            }
                        }                      
                        }
                        table.render(option3);
                    } else {
                        table.render(option3);
@@ -3570,4 +3667,9 @@
        OptionData = data
    }

    //双击返回操作工
    function GetHEmpValue(data) {
        OptionData_Emp = data
    }

</script>

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

New file
@@ -0,0 +1,210 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>工序流转卡批量拆分编辑</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-form-item .layui-inline {
            margin-right: 0;
        }

        html {
            background-color: white;
            color: white;
        }

        .layui-table-cell {
            overflow: visible !important;
        }

        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                            <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>打印</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-BatchSplit">
                        <h1 style="text-align: center; padding: 10px 0;"><b>流转卡批量拆分</b></h1>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable" style="margin-top:5px;"></table>
                    <script type="text/html" id="xuhao">
                        {{d.LAY_TABLE_INDEX+1}}
                    </script>
                </form>
            </div>
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var sWhere = "";
            //#endregion


            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            // åˆå§‹åŒ–界面
            set_InitGrid();

            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单主子id
                var HSouceBillType = params[params[2]];//源单类型
            }

            //判断操作类型
            if (OperationType == 1) {//无源单新增
                
            }
            else if (OperationType == 2) {//有源单新增
                get_Display_BatchSplit(linterid)
            }
            else if (OperationType == 3) {//编辑
               
            }          
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }

            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //退出按钮
            form.on('submit(Exit)', function () {
                if (params[1] != null) {
                    Pub_Close(1);
                } else if (params[1] == null) {
                    Pub_Close(2);
                }
            })
            //#endregion

            //#region é¡µé¢æ–¹æ³•
            //初始化页面
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    //, toolbar: '#toolbarDemo'
                    , limit: 500
                    , height: 500
                    , loading: false
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                        , { field: 'HICMOInterID', title: '生产订单内码', width: 100, hide: true }//生产订单内码
                        , { field: 'HICMOEntryID', title: '生产订单子内码', width: 100, hide: true }//生产订单子内码
                        , { field: 'HICMOBillNo', title: '生产订单', width: 120 }//生产订单号
                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                        , { field: '物料代码', title: '物料代码', width: 150 }
                        , { field: '物料名称', title: '物料名称', width: 150 }
                        , { field: '规格型号', title: '规格型号', width: 100, hide: true}
                        , { field: 'HQty', title: '订单总数', width: 110 }
                        , { field: 'HFinishQty', title: '已生成流转卡数', width: 130 }
                        , { field: 'HUsableQty', title: '剩余可用数量', width: 130 }
                        , { field: 'HProQty', title: '流转卡数量', width: 110 }
                        , { field: 'HRoutingInterID', title: '工艺路线内码', width: 150, hide: true }
                        , { field: 'HRoutingName', title: '工艺路线', width: 170 }
                        , { field: 'HSheetQty', title: '拆分流转卡张数', width: 130 }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                }

                //初始表格数据
                var rowdata = [{
                    "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "物料代码": ""
                    , "物料名称": "", "规格型号": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
                    , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
                }];

                option.data = rowdata;
                table.render(option);
            }

            //批量拆分生产订单生成流转卡
            function get_Display_BatchSplit(linterid) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "Sc_ProcessExchangeBill/BatchSpilt",
                    type: "GET",
                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"]},
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //网格数据赋值
                            var subdata = result.data
                            var rowdata = [];
                            for (var i = 0; i < subdata.length; i++) {
                                rowdata.push(
                                    {
                                        "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "物料代码": ""
                                        , "物料名称": "", "规格型号": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
                                        , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
                                    }
                                )
                            }
                            option.data = rowdata;
                            table.render(option);
                            
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //#endregion


            //以上是layui模块
        });

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

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

@@ -121,7 +121,7 @@
                                            </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="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -149,7 +149,7 @@
                                            </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="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -159,7 +159,7 @@
                                            </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="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -1868,10 +1868,10 @@
                    layer.msg("请输入汇率！");
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择业务员员！");
                    return;
                }
                //if ($("#HEmpID").val() == 0) {
                //    layer.msg("请选择业务员员！");
                //    return;
                //}
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择采购部门！");
                    return;
@@ -1880,14 +1880,14 @@
                    layer.msg("请选择供应商！");
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                    layer.msg("请选择采购方式！");
                    return;
                }
                if ($("#HSSID").val() == 0) {
                    layer.msg("请选择结算方式！");
                    return;
                }
                //if ($("#HPSStyleID").val() == 0) {
                //    layer.msg("请选择采购方式！");
                //    return;
                //}
                //if ($("#HSSID").val() == 0) {
                //    layer.msg("请选择结算方式！");
                //    return;
                //}

                temp = $("#HExRate").val() + "";
                if (temp == 0) {

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

@@ -142,7 +142,7 @@

                                    <div class="layui-row">
                                        <div class="layui-col-xs4 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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -1223,10 +1223,10 @@
                    return false;
                }

                if ($("#HManagerID").val() == "0") {
                    layer.msg("主管未选择!");
                    return false;
                }
                //if ($("#HManagerID").val() == "0") {
                //    layer.msg("主管未选择!");
                //    return false;
                //}

                if ($("#HWHID").val() == "0") {
                    layer.msg("仓库未选择!");

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -113,7 +113,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -133,7 +133,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 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="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -162,7 +162,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 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="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -1089,11 +1089,11 @@
                    layer.msg("请输入汇率！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                     //提示请选择采购员，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                    layer.msg("请选择采购员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HEmpID").val() == 0) {
                //     //提示请选择采购员，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                //    layer.msg("请选择采购员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                if ($("#HDeptID").val() == 0) {
                     //提示请选择采购部门，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                    layer.msg("请选择采购部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1104,16 +1104,19 @@
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HPSStyleID").val() == 0) {
                     //提示请选择采购方式，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                    layer.msg("请选择采购方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
                    $("#HPSStyleID").val(0)
                }
                if ($("#HSSID").val() == 0) {
                     //提示请选择结算方式，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HPSStyleID").val() == 0) {
                //     //提示请选择采购方式，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                //    layer.msg("请选择采购方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HSSID").val() == 0) {
                //     //提示请选择结算方式，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                //    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {//遍历option.data数组
@@ -1285,7 +1288,7 @@
                                    //通过供应商id获取税率
                                    var HSupID = $("#HSupID").val();
                                    if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
                                        var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                                        var Dec = getDecByMaterID(OptionData.HItemID) //获取精度
                                        var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                                        var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                                        var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度
@@ -1621,7 +1624,7 @@
                        $("#HSSName").val(checkStatus.data[0].结算方式);
                        $("#HAddress").val(checkStatus.data[0].地区);
                        $("#HPSStyleName").val(checkStatus.data[0].采购方式);
                        $("#HPSStyleID").val(checkStatus.data[0].HPSStyleID);
                        $("#HPSStyleID").val((checkStatus.data[0].HPSStyleID == null) ? 0 : checkStatus.data[0].HPSStyleID);
                       
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -1933,7 +1936,7 @@
           $("#HSSName").val(obj[0].结算方式);
           $("#HAddress").val(obj[0].地区);
           $("#HPSStyleName").val(obj[0].采购方式);
           $("#HPSStyleID").val(obj[0].HPSStyleID);
           $("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
        } 

        

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -113,7 +113,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -123,7 +123,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -133,7 +133,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -167,7 +167,7 @@
            </div>-->
                                        </div>
                                        <div class="layui-col-xs4 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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -2378,22 +2378,22 @@
                    layer.msg("请选择仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerID").val() == 0) {
                    layer.msg("请选择负责人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择业务员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HKeeperID").val() == 0) {
                    layer.msg("请选择保管员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HSecManagerID").val() == 0) {
                    layer.msg("请选择验收员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HManagerID").val() == 0) {
                //    layer.msg("请选择负责人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HEmpID").val() == 0) {
                //    layer.msg("请选择业务员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HKeeperID").val() == 0) {
                //    layer.msg("请选择保管员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HSecManagerID").val() == 0) {
                //    layer.msg("请选择验收员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                if ($("#HDeptID").val() == 0) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;