yangle
2024-08-05 4a7d15387c3289fab0306fb3e6357af53ca7dcb7
当前工单汇报优化
3个文件已修改
138 ■■■■■ 已修改文件
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产报表/Sc_NutInspectionCCDPassRate.html 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·À´í/Sc_MaterToSourceStepBillList.html
@@ -410,7 +410,7 @@
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '物料批次', title: '物料批次', sort: true }
                        , { field: '流转卡批次', title: '流转卡批次', sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true }
                        , { field: '制单人', title: '制单人', sort: true }
                        , { field: '制单日期', title: '制单日期', templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', sort: true }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_NutInspectionCCDPassRate.html
@@ -208,9 +208,9 @@
        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            set_InitGrid();
            //查询
            //get_FastQuery();
            get_FastQuery();
        }
        function set_InitGrid() {
@@ -242,7 +242,6 @@
                    , { field: '备注', title: '备注', sort: true }
                ]]
            };
            table.render(option);
        }
        // æŸ¥è¯¢
@@ -256,56 +255,62 @@
                data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        col.push({ type: 'numbers', title: '序号' });
                        for (var i = 0; i < data.length; i++) {
                            // 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列
                        if (data1.list.length>0) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    case 'long':
                                    case 'Int32':
                                    case 'Int64':
                                    case 'double':
                                    case 'Decimal':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'numbers', title: '序号' });
                            for (var i = 0; i < data.length; i++) {
                                // 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 {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
                                    }
                                }
                            }
                        }
                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo1'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }
                        } else {
                            set_InitGrid();
                        }
                        table.render(option);
                        //刷新表格数据
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -23,7 +23,7 @@
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div style="width: 65%; height: calc(95vh); float: left; background-color: rgb(255 255 255) ">
                        <div style="width: 65%; height: calc(105vh); float: left; background-color: rgb(255 255 255) ">
                            <div id="top" style="width:100%;height:calc(40vh);">
                                <div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
                                    <div class="layui-inline">
@@ -230,9 +230,37 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">报废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">返工数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HBackWorkQty" id="HBackWorkQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">工废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty_Work" id="HWasterQty_Work" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">料废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWasterQty_Mater" id="HWasterQty_Mater" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
                            <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
                                <div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">人员</span></label>
@@ -252,8 +280,7 @@
                                    <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
                                </div>
                            </div>
                            <div id="bottom" style="width: 100%; height: calc(10vh);float:left;">
                            <div id="bottom" style="width: 100%; height: calc(10vh);">
                                <div id="bottom-left" style="width: 100%; height: calc(10vh);">
                                    <div style="text-align: left; width: 100%; height: calc(10vh); ">
                                        <button type="button" lay-submit="" lay-filter="tg" class="layui-btn layui-btn-radius " style="margin-left: 15%;" id="tg">停工挂起</button>
@@ -265,7 +292,7 @@
                                </div>
                            </div>
                        </div>
                        <div id="center-right-maintable" style="width: 34%; height: calc(95vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                        <div id="center-right-maintable" style="width: 34%; height: calc(105vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                            <div class="layui-tab" lay-filter="tab-POStockInBill">
                                <ul class="layui-tab-title" lay-filter="tab-all">
                                    <li lay-id="1" style="padding:1px;" class="layui-this">扫码记录</li>
@@ -813,7 +840,7 @@
                , totalRow: true
                //, cellMinWidth: 120
                , data: []
                , height: 700
                , height: 780
                , limit: Number.MAX_VALUE
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }