MES-WEB-LayUI.git

parent: 33d5a36f | 补丁 | 提交 | ignore whitespace

yangle

2022-06-01 db593ed3cc6d4140e008b0c4ac9c293bfe3e67ae

功能完善

6个文件已修改

	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -317,8 +317,8 @@

            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true });
            columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width:150 });
            columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width:150 });
            columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
            columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
            columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150 });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width:150 });

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBillList.html

@@ -62,9 +62,21 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">ä»»å¡åå·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">åæ®å·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">å·¥åºæµè½¬å¡å·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        </div>
                                    </div>
                                </div>
@@ -114,6 +126,29 @@
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //çäº§è®¢ååè½¦æ¹æ³
            $('#HICMOBillNo').on('keydown', function (event) {
                var HICMOBillNo = $('#HICMOBillNo').val();
                if (event.keyCode == 13) {
                    if (!HICMOBillNo) {
                        layer.msg("ä»»å¡åå·ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //å·¥åºæµè½¬å¡åè½¦æ¹æ³
            $('#HProcExchBillNo').on('keydown', function (event) {
                var HProcExchBillNo = $('#HProcExchBillNo').val();
                if (event.keyCode == 13) {
                    if (!HProcExchBillNo) {
                        layer.msg("å·¥åºæµè½¬å¡å·ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });

            //åå§åè¡¨æ ¼
@@ -171,6 +206,8 @@

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -181,6 +218,8 @@
            function get_FastQuery() {
                var HStatus = $("select[name='HStatus']").val();//ç¶æ
                var HBillNo = $("#HBillNo").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
@@ -200,6 +239,13 @@
                        default:
                    }
                }
                if (HICMOBillNo) {
                    sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }

                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -166,6 +166,12 @@
                                                <input type="hidden" value="0" name="HSupID" id="HSupID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ä¸è¯æ°é</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -241,12 +247,6 @@
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ä¸è¯æ°é</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ¥æ¶æ¶é´</label>
                                            <div class="layui-input-inline">

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBillList.html

@@ -62,9 +62,21 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">ä»»å¡åå·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">åæ®å·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">å·¥åºæµè½¬å¡å·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        </div>
                                    </div>
                                </div>
@@ -117,6 +129,29 @@
                get_FastQuery();
            });

            //çäº§è®¢ååè½¦æ¹æ³
            $('#HICMOBillNo').on('keydown', function (event) {
                var HICMOBillNo = $('#HICMOBillNo').val();
                if (event.keyCode == 13) {
                    if (!HICMOBillNo) {
                        layer.msg("ä»»å¡åå·ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });
            //å·¥åºæµè½¬å¡åè½¦æ¹æ³
            $('#HProcExchBillNo').on('keydown', function (event) {
                var HProcExchBillNo = $('#HProcExchBillNo').val();
                if (event.keyCode == 13) {
                    if (!HProcExchBillNo) {
                        layer.msg("å·¥åºæµè½¬å¡å·ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                    $("#btnSearch").click();
                }
            });


            //åå§åè¡¨æ ¼
            function set_InitGrid() {
@@ -144,6 +179,8 @@
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
                        , { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
                        , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                        , { field: 'æµæ°´å·', title: 'æµæ°´å·' }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
@@ -176,15 +213,19 @@

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HICMOBillNo").val("");
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HProcExchBillNo").val("");
            }

            //å¿«éè¿æ»¤
            function get_FastQuery() {
                var HStatus = $("select[name='HStatus']").val();//ç¶æ
                var HBillNo = $("#HBillNo").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
@@ -204,6 +245,13 @@
                        default:
                    }
                }

                if (HICMOBillNo) {
                    sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -132,7 +132,7 @@
                                            <label class="layui-form-label"><span style="color:red;">*</span>æµè½¬å¡å·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID" >
                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -255,6 +255,14 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ä¸è¯æ°é</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="" id="">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs8 layui-inline">
                                            <label class="layui-form-label">å¤æ³¨</label>
                                            <div class="layui-input-block">
@@ -268,12 +276,6 @@
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ä¸è¯æ°é</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="" id="">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">èå2</label>
                                            <div class="layui-input-inline">

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -195,6 +195,8 @@
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 125 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
                        , { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
                        , {
                            field: 'åºç«æ¶é´', title: 'åºç«æ¶é´', width: 160, templet: function (d) {
                                if (d.åºç«æ¶é´ == null) {

			@@ -317,8 +317,8 @@

			columns.push({ type: 'checkbox', fixed: 'left' });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width:150 });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width:150 });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150 });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width:150 });

			@@ -62,9 +62,21 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä»»å¡åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥åºæµè½¬å¡å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			</div>
			@@ -114,6 +126,29 @@
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});

			//çäº§è®¢ååè½¦æ¹æ³
			$('#HICMOBillNo').on('keydown', function (event) {
			var HICMOBillNo = $('#HICMOBillNo').val();
			if (event.keyCode == 13) {
			if (!HICMOBillNo) {
			layer.msg("ä»»å¡åå·ä¸è½ä¸ºç©ºï¼")
			return;
			}
			$("#btnSearch").click();
			}
			});
			//å·¥åºæµè½¬å¡åè½¦æ¹æ³
			$('#HProcExchBillNo').on('keydown', function (event) {
			var HProcExchBillNo = $('#HProcExchBillNo').val();
			if (event.keyCode == 13) {
			if (!HProcExchBillNo) {
			layer.msg("å·¥åºæµè½¬å¡å·ä¸è½ä¸ºç©ºï¼")
			return;
			}
			$("#btnSearch").click();
			}
			});

			//åå§åè¡¨æ ¼
			@@ -171,6 +206,8 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HICMOBillNo").val("");
			$("#HProcExchBillNo").val("");
			$("#HBillNo").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -181,6 +218,8 @@
			function get_FastQuery() {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ
			var HBillNo = $("#HBillNo").val();
			var HICMOBillNo = $("#HICMOBillNo").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -200,6 +239,13 @@
			default:
			}
			}
			if (HICMOBillNo) {
			sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
			}
			if (HProcExchBillNo) {
			sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
			}

			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			@@ -166,6 +166,12 @@
			<input type="hidden" value="0" name="HSupID" id="HSupID">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			@@ -241,12 +247,6 @@
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ¶æ¶é´</label>
			<div class="layui-input-inline">

			@@ -132,7 +132,7 @@
			<label class="layui-form-label"><span style="color:red;">*</span>æµè½¬å¡å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID" >
			<input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			@@ -255,6 +255,14 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" value="0" name="" id="">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs8 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			@@ -268,12 +276,6 @@
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" value="0" name="" id="">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">èå2</label>
			<div class="layui-input-inline">

			@@ -195,6 +195,8 @@
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
			, { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
			, {
			field: 'åºç«æ¶é´', title: 'åºç«æ¶é´', width: 160, templet: function (d) {
			if (d.åºç«æ¶é´ == null) {