合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

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

@@ -49,15 +49,17 @@
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">仓库代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                
                                

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">仓库代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
@@ -148,6 +150,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -225,6 +228,9 @@
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
@@ -287,6 +293,12 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');

                sWhere = "";
@@ -371,6 +383,23 @@
            });
            //#endregion


            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '仓库代码') {
                    var linterid = data.HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '仓库列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../公用基础资料/Add_Edit_Gy_Warehouse.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                }
            });


            function btnrowDouble(obj) {
                var index = parent.layer.getFrameIndex(window.name);
                var data = obj.data;
@@ -449,6 +478,13 @@
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '仓库代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '仓库代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.仓库代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -682,6 +718,34 @@
            }
            //#endregion

            //#region å¤åˆ¶
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '复制-计量单位列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_Warehouse.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -706,7 +770,7 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==="") {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
@@ -739,7 +803,7 @@

                }
                else {
                    layer.msg('请选择一行数据删除！');
                    layer.msg('请选择一行未审核数据删除！');
                }

            }