安瑞 增加 物料编码显示

王 垚

2021-12-29 db34c41cbb3df2c21b57d10bbe83ea206d9428d6

安瑞 增加  物料编码显示

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -206,13 +206,13 @@
        var type = params[params[2]];
        //原生成条码方法(送货单默认)
        var mainUrl = "GetHBarCodeShowBillMain"; //表头数据加载ajax
        var subUrl = "GetHBarCodeShowBillSub";//表体数据加载ajax
        var subUrl = "GetHBarCodeShowBillSub";//表体数据加载ajax h_v_SRM_POInStockBillSub_ForWeb2
        var saveBarCode = "GetBarcodeSaveBillBox";//条码生成保存方法ajax
        var openTmpListType = "SRM_POInStockBillList"; //条码打印按钮 弹出界面
        //采购订单条码生成规则
        if (type == 'SRM_POOrderBillList') {
            mainUrl = 'GetHBarCodeShowBillMainBycg';
            subUrl = "GetHBarCodeShowBillSubBycg";
            subUrl = "GetHBarCodeShowBillSubBycg"; //h_v_Cg_POOrderBillSub_ForWeb2
            saveBarCode = "GetBarcodeSaveBillBoxBycg";
            openTmpListType = 'SRM_POOrderBillList';

@@ -220,7 +220,7 @@
        //委外订单
        else if (type == 'SRM_EntrustOrderBill') {
            mainUrl = 'GetHBarCodeShowBillMainBywy';
            subUrl = "GetHBarCodeShowBillSubBywy";
            subUrl = "GetHBarCodeShowBillSubBywy"; //h_v_srm_EntrustOrderBillSub_ForWeb2
            saveBarCode = "GetBarcodeSaveBillBoxBycg";//调用采购数据
            openTmpListType = 'SRM_POOrderBillList';
        }
@@ -430,7 +430,7 @@
                                });
                                table.render({
                                    elem: '#subTable'
                                    , url: GetWEBURL() + 'GetHBarCodeShowBillSub3'
                                    , url: GetWEBURL() + 'GetHBarCodeShowBillSub3'  //h_v_Web_BarCodeBill_ForWeb1
                                    , toolbar: '#toolbarDemo1'
                                    , defaultToolbar: ['filter', 'exports']
                                    , where: { sMsg: linterid }
@@ -569,9 +569,10 @@
                , where: { sMsg: linterid, sMsg2: lentryid }
                , cols: [[
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 200 }
                    , { field: 'HMaterModel', title: '规格型号', width: 200 }
                    , { field: 'HMaterShortNumber', title: '物料编码', width: 120 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 120 }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html

@@ -54,13 +54,19 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
@@ -358,6 +364,8 @@
                    sqlWhere += " and 条码编号 like ^^%" + $("#HBarCode").val() + "%^^";
                if ($("#HSourceBillNo").val() != "")
                    sqlWhere += " and 源单单号 like ^^%" + $("#HSourceBillNo").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html

@@ -90,7 +90,7 @@
                                            </div>
                                        </div>

                                    </form>                                   
                                    </form>
                                </div>
                                <div class="layui-tab-item">
                                    <form id="form2" class="layui-form layui-form-pane" action="">
@@ -173,28 +173,28 @@
                                            </div>
                                        </div>

                                    </form>                                 
                                    </form>
                                </div>

                            </div>
                        </div>
                    </div>
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>                                       
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>

                                    </div>
                                </script>
                                <blockquote class="layui-elem-quote">采购订单</blockquote>

                            </div>
                        </div>
                    </script>
                    <blockquote class="layui-elem-quote">采购订单</blockquote>

                </div>
            </div>
        </div>
    </div>
    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -210,9 +210,9 @@
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'form', 'element'], function () {
            var table = layui.table
            , $ = layui.$
            , form = layui.form
            , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
                , $ = layui.$
                , form = layui.form
                , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块

            form.on('submit(Saver)', function (data) {//保存
                //debugger;
@@ -221,105 +221,104 @@
                var sMainSub = sMainStr + ';' + sSubStr;
                layer.load(3)
                $.ajax(
                {
                    type: "POST",
                    url: GetWEBURL()+"SaverPOOrder", //方法所在页面和方法名
                    async: true,
                    data: { "msg": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 说明验证成功了，
                            layer.msg(data.Message, { icon: 1 });
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaverPOOrder", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // 说明验证成功了，
                                layer.msg(data.Message, { icon: 1 });
                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            f_alert("错误:" + err);
                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        f_alert("错误:" + err);
                    }
                });
                    });
                return false;
            });

        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            return vars;
        }
        var params = getUrlVars();
        var linterid = params[params[0]];
        var lentryid = params[params[1]];
        RoadBillMain(linterid);
        RoadBillSub(linterid);
            var params = getUrlVars();
            var linterid = params[params[0]];
            var lentryid = params[params[1]];
            RoadBillMain(linterid);
            RoadBillSub(linterid);
            // debugger;
        function RoadBillMain(linterid)
        {
        $.ajax({
            url: GetWEBURL()+"GetEntrustOrderShowBillMain",
            type: "GET",
            data: { "sMsg": linterid },
            success: function (d) {
                console.log(d.data);
                //$("#HDate").val(d.)
                $("#HInterID").val(d.data[0].HInterID);
                $("#HBillNo").val(d.data[0].HBillNo);
                $("#HRemark").val(d.data[0].HRemark);
                $("#HDate").val(d.data[0].HDateForWeb);
                $("#HStatus").val(d.data[0].HStatus);               
                $("#HSupID").val(d.data[0].HSupID);
                $("#HSupName").val(d.data[0].HSupName);
                $("#HEmpID").val(d.data[0].HEmpID);
                $("#HEmpName").val(d.data[0].HEmpName);
                $("#HManagerID").val(d.data[0].HManagerID);
                $("#HManagerName").val(d.data[0].HManagerName);
                $("#HMaker").val(d.data[0].HMaker);
                $("#HMakeDate").val(d.data[0].HMakeDate)
                $("#HChecker").val(d.data[0].HChecker);
                $("#HCheckDate").val(d.data[0].HCheckDate);
                $("#HUpDater").val(d.data[0].HUpDater);
                $("#HUpDateDate").val(d.data[0].HUpDateDate);
                $("#HConfirmMan").val(d.data[0].HConfirmMan);
                $("#HConfirmDate").val(d.data[0].HConfirmDate);
                $("#HBacker").val(d.data[0].HBacker);
                $("#HBackDate").val(d.data[0].HBackDate);
                $("#HBackRemark").val(d.data[0].HBackRemark);
            function RoadBillMain(linterid) {
                $.ajax({
                    url: GetWEBURL() + "GetEntrustOrderShowBillMain",  //H_v_SRM_EntrustOrderBillMain_ForWeb
                    type: "GET",
                    data: { "sMsg": linterid },
                    success: function (d) {
                        console.log(d.data);
                        //$("#HDate").val(d.)
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HRemark").val(d.data[0].HRemark);
                        $("#HDate").val(d.data[0].HDateForWeb);
                        $("#HStatus").val(d.data[0].HStatus);
                        $("#HSupID").val(d.data[0].HSupID);
                        $("#HSupName").val(d.data[0].HSupName);
                        $("#HEmpID").val(d.data[0].HEmpID);
                        $("#HEmpName").val(d.data[0].HEmpName);
                        $("#HManagerID").val(d.data[0].HManagerID);
                        $("#HManagerName").val(d.data[0].HManagerName);
                        $("#HMaker").val(d.data[0].HMaker);
                        $("#HMakeDate").val(d.data[0].HMakeDate)
                        $("#HChecker").val(d.data[0].HChecker);
                        $("#HCheckDate").val(d.data[0].HCheckDate);
                        $("#HUpDater").val(d.data[0].HUpDater);
                        $("#HUpDateDate").val(d.data[0].HUpDateDate);
                        $("#HConfirmMan").val(d.data[0].HConfirmMan);
                        $("#HConfirmDate").val(d.data[0].HConfirmDate);
                        $("#HBacker").val(d.data[0].HBacker);
                        $("#HBackDate").val(d.data[0].HBackDate);
                        $("#HBackRemark").val(d.data[0].HBackRemark);
                    }
                });
            }
        });
        }

            ///加载显示数据
        function RoadBillSub(linterid) {
            $.ajax({
                type: "get",
                url: GetWEBURL()+"GetEntrustOrderShowBillSub",
                async: true,
                data: { sMsg: linterid },
                success: function (result) {
                    ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                    table.reload('mainTable', {
                        data: ajaxReturnData
                        , height: 'full-10'
                        , loading: false
                        , done: function (index, res) {
            function RoadBillSub(linterid) {
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "GetEntrustOrderShowBillSub",//[h_v_srm_EntrustOrderBillSub_ForWeb2]
                    async: true,
                    data: { sMsg: linterid },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                        }
                    });
                },
                error: function (result) {
                    console.log(result);
                    //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                }
            });
        }
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            }

 



            //监听提交
@@ -335,44 +334,45 @@
            layer.load(3)
            table.render({
                elem: '#mainTable'
              , url:  GetWEBURL()+'GetEntrustOrderShowBillSub'
                , url: GetWEBURL() + 'GetEntrustOrderShowBillSub'
                , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
                , defaultToolbar: ['filter', 'exports']
              , where: { sMsg: linterid }
              ,cols: [[
                , { field: 'HMTONO', title: '计划跟踪单号', width: 100, sort: true, fixed: true , hide: true }
                , { field: 'HMaterID', title: '物料ID', width: 100,  hide: true }
                , { field: 'HMaterNumber', title: '物料代码', width: 200 }
                , { field: 'HMaterName', title: '物料名称', width: 200 }
                , { field: 'HMaterModel', title: '规格型号', width: 200 }
                , { field: 'HUnitName', title: '计量单位', width: 100 }
                , { field: 'HUnitNumber', title: '计量单位代码', width: 100,  hide: true }
                , { field: 'HUnitID', title: '计量单位ID', width: 100,  hide: true }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HPrice', title: '单价', width: 100 }
                , { field: 'HMoney', title: '金额', width: 100 }
                , { field: 'HDate', title: '要求交货日期', width: 150 }
                //, { field: 'HDate2', title: '确认交货日期', width: 150 }
                , { field: 'HPURCHASEORGID', title: '采购组织', width: 150 }
                , { field: 'HSTOCKINORGID', title: '入库组织', width: 150 }
                , { field: 'HINSTOCKOWNERID', title: '入库货主', width: 150 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }
                , { field: 'HSourceBillNo', title: '源单单号', width: 200, hide: true }
                , { field: 'HSourceInterID', title: '源单主内码', width: 150, hide: true }
                , { field: 'HSourceEntryID', title: '源单子内码', width: 150, hide: true }
                , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200, hide: true }
                , { field: 'HSeOrderInterID', title: '销售订单主内码', width: 150, hide: true }
                , { field: 'HSeOrderEntryID', title: '销售订单子内码', width: 150, hide: true }
                , where: { sMsg: linterid }
                , cols: [[
                    , { field: 'HMTONO', title: '计划跟踪单号', width: 100, sort: true, fixed: true, hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterShortNumber', title: '物料编码', width: 120 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 120 }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100 }
                    , { field: 'HMoney', title: '金额', width: 100 }
                    , { field: 'HDate', title: '要求交货日期', width: 150 }
                    //, { field: 'HDate2', title: '确认交货日期', width: 150 }
                    , { field: 'HPURCHASEORGID', title: '采购组织', width: 150 }
                    , { field: 'HSTOCKINORGID', title: '入库组织', width: 150 }
                    , { field: 'HINSTOCKOWNERID', title: '入库货主', width: 150 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 200, hide: true }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150, hide: true }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150, hide: true }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200, hide: true }
                    , { field: 'HSeOrderInterID', title: '销售订单主内码', width: 150, hide: true }
                    , { field: 'HSeOrderEntryID', title: '销售订单子内码', width: 150, hide: true }

              ]]
              // , data: [linterid]
                 //, page: true //是否显示分页
                 //, limits: [10, 20, 50, 100]
                 //, limit: 50 //每页默认显示的数量
                 //, height: 500
                 , done: function () {
                     layer.closeAll("loading");
                 }
                ]]
                // , data: [linterid]
                //, page: true //是否显示分页
                //, limits: [10, 20, 50, 100]
                //, limit: 50 //每页默认显示的数量
                //, height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            });
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
@@ -385,27 +385,27 @@
                        window.open("../../views/WarM/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEntrustOrderBill");
                        break;

                        //自定义头工具栏右侧图标 - 提示
                    //自定义头工具栏右侧图标 - 提示
                    case 'btn-reload':
                        RoadBillMain(linterid);
                        RoadBillSub(linterid);
                        var demoReload = $('#mainTable');
                        //执行重载
                        table.reload('mainTable', {
                              where: {
                              key: {
                                  id: demoReload.val()
                              }
                          }
                            where: {
                                key: {
                                    id: demoReload.val()
                                }
                            }
                        });
                        break;
                    case 'btn-confirm':
                        var HBillNo = $("#HBillNo").val()
                        if ($("#HStatus").val() == "未确认") {
                            layer.confirm('是否确认单据?', { icon: 3, title: '提示' }, function (index) {
                               $.ajax({
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"EntrustOrderAccept",
                                    url: GetWEBURL() + "EntrustOrderAccept",
                                    data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) { // 说明验证成功了，
@@ -442,7 +442,7 @@
                                HBackRemark = value.toString();
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"EntrustOrderRefuse",
                                    url: GetWEBURL() + "EntrustOrderRefuse",
                                    data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
                                    success: function (result) {
                                        if (result.count == 1) { // 说明验证成功了，
@@ -465,7 +465,7 @@
                        }
                        break;
                    case 'btn-details':
                      

                    case 'btn-exit':
                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                        parent.layer.close(index); //再执行关闭
@@ -479,7 +479,7 @@
            //    layer.load(3)
            //    $.ajax(
            //    {
            //        type: "POST",            
            //        type: "POST",
            //        url: GetWEBURL()+"SaverEntrustOrder", //方法所在页面和方法名
            //        async:true,
            //        data: { msg: sMainSub },
@@ -538,7 +538,7 @@
            //    return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
            //   // return false;
            //});
 

            //function f_SaveBefore() {
            //    //保存前处理(字段格式：int类型不能为空，日期类型符合格式，bool类型)
            //    if ($("#HInterID").val() == '') {
@@ -552,7 +552,7 @@
            //    var type = $(this).data('type');
            //    active[type] ? active[type].call(this) : '';
            //});
           });
        });
    </script>
</body>
</html>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html

@@ -46,13 +46,19 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
@@ -542,6 +548,8 @@
                    sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
                if ($("#HBillNo").val() != "")
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html

@@ -297,15 +297,16 @@
                , cols: [[
                    // , { field: 'HMTONO', title: '计划跟踪单号', width: 100,, sort: true, fixed: true edit: 'text', hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 100, edit: 'text', hide: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 200 }
                    , { field: 'HMaterModel', title: '规格型号', width: 200 }
                    , { field: 'HMaterShortNumber', title: '物料编码', width: 120 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 120 }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100 }
                    , { field: 'HMoney', title: '金额', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true}
                    , { field: 'HMoney', title: '金额', width: 100, hide: true}
                    , { field: 'HWHName', title: '收料仓库', width: 100 }
                    , { field: 'HWHNumber', title: '收料仓库代码', width: 100, hide: true }
                    , { field: 'HWHID', title: '收料仓库ID', width: 100, hide: true }

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -57,13 +57,19 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
@@ -100,15 +106,15 @@
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">状态</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" id="HStatus" lay-filter="">
                                            <option value="">全部</option>
                                            <option value="未打印" selected="">未打印</option>
                                            <option value="已打印">已打印</option>
                                        </select>
                                    </div>
                                </div>-->
        <label class="layui-form-label">状态</label>
        <div class="layui-input-block">
            <select name="HStatus" id="HStatus" lay-filter="">
                <option value="">全部</option>
                <option value="未打印" selected="">未打印</option>
                <option value="已打印">已打印</option>
            </select>
        </div>
    </div>-->

                                <div class="layui-inline">
                                    <label class="layui-form-label">采购组织</label>
@@ -497,6 +503,8 @@
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                if ($("#HInnerBillNo").val() != "")
                    sqlWhere += " and 送货单号 like ^^%" + $("#HInnerBillNo").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html

@@ -90,7 +90,7 @@
                                            </div>
                                        </div>

                                    </form>                                   
                                    </form>
                                </div>
                                <div class="layui-tab-item">
                                    <form id="form2" class="layui-form layui-form-pane" action="">
@@ -173,28 +173,28 @@
                                            </div>
                                        </div>

                                    </form>                                 
                                    </form>
                                </div>

                            </div>
                        </div>
                    </div>
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>                                       
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>

                                    </div>
                                </script>
                                <blockquote class="layui-elem-quote">采购订单</blockquote>

                            </div>
                        </div>
                    </script>
                    <blockquote class="layui-elem-quote">采购订单</blockquote>

                </div>
            </div>
        </div>
    </div>
    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -210,9 +210,9 @@
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'form', 'element'], function () {
            var table = layui.table
            , $ = layui.$
            , form = layui.form
            , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
                , $ = layui.$
                , form = layui.form
                , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块

            form.on('submit(Saver)', function (data) {//保存
                //debugger;
@@ -221,105 +221,104 @@
                var sMainSub = sMainStr + ';' + sSubStr;
                layer.load(3)
                $.ajax(
                {
                    type: "POST",
                    url: GetWEBURL()+"SaverPOOrder", //方法所在页面和方法名
                    async: true,
                    data: { "msg": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 说明验证成功了，
                            layer.msg(data.Message, { icon: 1 });
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaverPOOrder", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // 说明验证成功了，
                                layer.msg(data.Message, { icon: 1 });
                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            f_alert("错误:" + err);
                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        f_alert("错误:" + err);
                    }
                });
                    });
                return false;
            });

        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            return vars;
        }
        var params = getUrlVars();
        var linterid = params[params[0]];
        var lentryid = params[params[1]];
        RoadBillMain(linterid);
        RoadBillSub(linterid);
            var params = getUrlVars();
            var linterid = params[params[0]];
            var lentryid = params[params[1]];
            RoadBillMain(linterid);
            RoadBillSub(linterid);
            // debugger;
        function RoadBillMain(linterid)
        {
        $.ajax({
            url: GetWEBURL()+"GetPOOrderShowBillMain",
            type: "GET",
            data: { "sMsg": linterid },
            success: function (d) {
                console.log(d.data);
                //$("#HDate").val(d.)
                $("#HInterID").val(d.data[0].HInterID);
                $("#HBillNo").val(d.data[0].HBillNo);
                $("#HRemark").val(d.data[0].HRemark);
                $("#HDate").val(d.data[0].HDateForWeb);
                $("#HStatus").val(d.data[0].HStatus);               
                $("#HSupID").val(d.data[0].HSupID);
                $("#HSupName").val(d.data[0].HSupName);
                $("#HEmpID").val(d.data[0].HEmpID);
                $("#HEmpName").val(d.data[0].HEmpName);
                $("#HManagerID").val(d.data[0].HManagerID);
                $("#HManagerName").val(d.data[0].HManagerName);
                $("#HMaker").val(d.data[0].HMaker);
                $("#HMakeDate").val(d.data[0].HMakeDate)
                $("#HChecker").val(d.data[0].HChecker);
                $("#HCheckDate").val(d.data[0].HCheckDate);
                $("#HUpDater").val(d.data[0].HUpDater);
                $("#HUpDateDate").val(d.data[0].HUpDateDate);
                $("#HConfirmMan").val(d.data[0].HConfirmMan);
                $("#HConfirmDate").val(d.data[0].HConfirmDate);
                $("#HBacker").val(d.data[0].HBacker);
                $("#HBackDate").val(d.data[0].HBackDate);
                $("#HBackRemark").val(d.data[0].HBackRemark);
            function RoadBillMain(linterid) {
                $.ajax({
                    url: GetWEBURL() + "GetPOOrderShowBillMain",
                    type: "GET",
                    data: { "sMsg": linterid },
                    success: function (d) {
                        console.log(d.data);
                        //$("#HDate").val(d.)
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HRemark").val(d.data[0].HRemark);
                        $("#HDate").val(d.data[0].HDateForWeb);
                        $("#HStatus").val(d.data[0].HStatus);
                        $("#HSupID").val(d.data[0].HSupID);
                        $("#HSupName").val(d.data[0].HSupName);
                        $("#HEmpID").val(d.data[0].HEmpID);
                        $("#HEmpName").val(d.data[0].HEmpName);
                        $("#HManagerID").val(d.data[0].HManagerID);
                        $("#HManagerName").val(d.data[0].HManagerName);
                        $("#HMaker").val(d.data[0].HMaker);
                        $("#HMakeDate").val(d.data[0].HMakeDate)
                        $("#HChecker").val(d.data[0].HChecker);
                        $("#HCheckDate").val(d.data[0].HCheckDate);
                        $("#HUpDater").val(d.data[0].HUpDater);
                        $("#HUpDateDate").val(d.data[0].HUpDateDate);
                        $("#HConfirmMan").val(d.data[0].HConfirmMan);
                        $("#HConfirmDate").val(d.data[0].HConfirmDate);
                        $("#HBacker").val(d.data[0].HBacker);
                        $("#HBackDate").val(d.data[0].HBackDate);
                        $("#HBackRemark").val(d.data[0].HBackRemark);
                    }
                });
            }
        });
        }

            ///加载显示数据
        function RoadBillSub(linterid) {
            $.ajax({
                type: "get",
                url: GetWEBURL()+"GetPOOrderShowBillSub",
                async: true,
                data: { sMsg: linterid },
                success: function (result) {
                    ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                    table.reload('mainTable', {
                        data: ajaxReturnData
                        , height: 'full-10'
                        , loading: false
                        , done: function (index, res) {
            function RoadBillSub(linterid) {
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "GetPOOrderShowBillSub",
                    async: true,
                    data: { sMsg: linterid },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                        }
                    });
                },
                error: function (result) {
                    console.log(result);
                    //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                }
            });
        }
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            }

 



            //监听提交
@@ -335,44 +334,45 @@
            layer.load(3)
            table.render({
                elem: '#mainTable'
              , url:  GetWEBURL()+'GetPOOrderShowBillSub'
                , url: GetWEBURL() + 'GetPOOrderShowBillSub'  //H_v_SRM_POOrderBillSub_ForWeb
                , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
                , defaultToolbar: ['filter', 'exports']
              , where: { sMsg: linterid }
              ,cols: [[
                , { field: 'HMTONO', title: '计划跟踪单号', width: 100, sort: true, fixed: true , hide: true }
                , { field: 'HMaterID', title: '物料ID', width: 100,  hide: true }
                , { field: 'HMaterNumber', title: '物料代码', width: 200 }
                , { field: 'HMaterName', title: '物料名称', width: 200 }
                , { field: 'HMaterModel', title: '规格型号', width: 200 }
                , { field: 'HUnitName', title: '计量单位', width: 100 }
                , { field: 'HUnitNumber', title: '计量单位代码', width: 100,  hide: true }
                , { field: 'HUnitID', title: '计量单位ID', width: 100,  hide: true }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HPrice', title: '单价', width: 100 }
                , { field: 'HMoney', title: '金额', width: 100 }
                , { field: 'HDate', title: '要求交货日期', width: 150 }
                //, { field: 'HDate2', title: '确认交货日期', width: 150 }
                , { field: 'HREQUIREORGID', title: '需求组织', width: 150 }
                , { field: 'HSTOCKORGID', title: '收料组织', width: 150 }
                , { field: 'HSETTLEORGID', title: '结算组织', width: 150 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }
                , { field: 'HSourceBillNo', title: '源单单号', width: 200, hide: true }
                , { field: 'HSourceInterID', title: '源单主内码', width: 150, hide: true }
                , { field: 'HSourceEntryID', title: '源单子内码', width: 150, hide: true }
                , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200, hide: true }
                , { field: 'HSeOrderInterID', title: '销售订单主内码', width: 150, hide: true }
                , { field: 'HSeOrderEntryID', title: '销售订单子内码', width: 150, hide: true }
                , where: { sMsg: linterid }
                , cols: [[
                    , { field: 'HMTONO', title: '计划跟踪单号', width: 100, sort: true, fixed: true, hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterShortNumber', title: '物料编码', width: 120 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 120 }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100 }
                    , { field: 'HMoney', title: '金额', width: 100 }
                    , { field: 'HDate', title: '要求交货日期', width: 150 }
                    //, { field: 'HDate2', title: '确认交货日期', width: 150 }
                    , { field: 'HREQUIREORGID', title: '需求组织', width: 150 }
                    , { field: 'HSTOCKORGID', title: '收料组织', width: 150 }
                    , { field: 'HSETTLEORGID', title: '结算组织', width: 150 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 200, hide: true }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150, hide: true }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150, hide: true }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200, hide: true }
                    , { field: 'HSeOrderInterID', title: '销售订单主内码', width: 150, hide: true }
                    , { field: 'HSeOrderEntryID', title: '销售订单子内码', width: 150, hide: true }

              ]]
              // , data: [linterid]
                 //, page: true //是否显示分页
                 //, limits: [10, 20, 50, 100]
                 //, limit: 50 //每页默认显示的数量
                 //, height: 500
                 , done: function () {
                     layer.closeAll("loading");
                 }
                ]]
                // , data: [linterid]
                //, page: true //是否显示分页
                //, limits: [10, 20, 50, 100]
                //, limit: 50 //每页默认显示的数量
                //, height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            });
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
@@ -385,7 +385,7 @@
                        window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid + "&Type=HPOOrderBill");
                        break;

                        //自定义头工具栏右侧图标 - 提示
                    //自定义头工具栏右侧图标 - 提示
                    case 'btn-reload':
                        RoadBillMain(linterid);
                        RoadBillSub(linterid);
@@ -394,9 +394,9 @@
                        var HBillNo = $("#HBillNo").val()
                        if ($("#HStatus").val() == "未确认") {
                            layer.confirm('是否确认单据?', { icon: 3, title: '提示' }, function (index) {
                               $.ajax({
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"POOrderAccept",
                                    url: GetWEBURL() + "POOrderAccept",
                                    data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) { // 说明验证成功了，
@@ -433,7 +433,7 @@
                                HBackRemark = value.toString();
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"POOrderRefuse",
                                    url: GetWEBURL() + "POOrderRefuse",
                                    data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
                                    success: function (result) {
                                        if (result.count == 1) { // 说明验证成功了，
@@ -457,7 +457,7 @@
                        }
                        break;
                    case 'btn-details':
                      

                    case 'btn-exit':
                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                        parent.layer.close(index); //再执行关闭
@@ -470,26 +470,26 @@
                //jiuajax从服务器获取
                layer.load(3)
                $.ajax(
                {
                    type: "POST",            
                    url: GetWEBURL()+"SaverPOOrder", //方法所在页面和方法名
                    async:true,
                    data: { msg: sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 说明验证成功了，
                            layer.msg(data.Message, { icon: 1 });
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaverPOOrder", //方法所在页面和方法名
                        async: true,
                        data: { msg: sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // 说明验证成功了，
                                layer.msg(data.Message, { icon: 1 });
                            }
                            else {
                                // $("#verifycode").click();
                                layer.msg(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            f_alert("错误:" + err);
                        }
                        else {
                            // $("#verifycode").click();
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        f_alert("错误:" + err);
                    }
                });
                    });
            }
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });
@@ -530,7 +530,7 @@
            //    return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
            //   // return false;
            //});
 

            //function f_SaveBefore() {
            //    //保存前处理(字段格式：int类型不能为空，日期类型符合格式，bool类型)
            //    if ($("#HInterID").val() == '') {
@@ -544,7 +544,7 @@
            //    var type = $(this).data('type');
            //    active[type] ? active[type].call(this) : '';
            //});
           });
        });
    </script>
</body>
</html>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -47,13 +47,19 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
@@ -587,6 +593,8 @@
                    sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
                if ($("#HBillNo").val() != "")
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")