MES-WEB-LayUI.git

parent: 7ec939d3 | 补丁 | 提交 | show whitespace

yangle

2024-08-05 4a7d15387c3289fab0306fb3e6357af53ca7dcb7

当前工单汇报优化

3个文件已修改

	WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产报表/Sc_NutInspectionCCDPassRate.html	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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,6 +255,8 @@
                data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {

                        if (data1.list.length>0) {
                        var data = [];
                        var col = [];

@@ -275,7 +276,7 @@
                                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 });
                                            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':
@@ -285,7 +286,7 @@
                                        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({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
                                }
                            }
                        }
@@ -306,6 +307,10 @@
                                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 id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
                                        <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(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' }

			@@ -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 }

			@@ -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,6 +255,8 @@
			data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {

			if (data1.list.length>0) {
			var data = [];
			var col = [];

			@@ -275,7 +276,7 @@
			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 });
			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':
			@@ -285,7 +286,7 @@
			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({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
			}
			}
			}
			@@ -306,6 +307,10 @@
			soulTable.render(this);
			}
			}
			} else {
			set_InitGrid();
			}

			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®

			@@ -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 id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
			<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(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' }