MES-WEB-LayUI.git

parent: beb5d80b | 补丁 | 提交 | ignore whitespace

生产订单，工序流转卡增加新白坯规格，新门幅字段，生产订单可以编辑新白坯规格、新门幅，下推（批量下推）工序流转卡带入新白坯规格、新门幅销售订单下推...

duhe

2024-03-11 1cce33606a1191b1eb5fe123f81479b8d4909bec

生产订单，工序流转卡 增加 新白坯规格，新门幅字段，生产订单可以编辑新白坯规格、新门幅，下推（批量下推）工序流转卡带入新白坯规格、新门幅
销售订单下推生产订单，染色要求可以变更

2个文件已修改

	WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -250,7 +250,7 @@
                                        <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="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -263,6 +263,12 @@
                                            <label class="layui-form-label" style="width: 85px;">è®¡åå®å·¥æ</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
                                            </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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -283,6 +289,12 @@
                                            <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="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
                                            </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="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
                                            </div>
                                        </div>
                                    </div>
@@ -1194,6 +1206,8 @@
                            , "HCusModel": d.data[0].å®¢æ·è§æ ¼åå·
                            , "HCusMaterNumber": d.data[0].å®¢æ·ç©æç¼ç 
                            , "HOrderPickRemark": d.data[0].è®¢ååè£å¤æ³¨
                            , "HWidth_New": d.data[0].æ°ç½å¯é¨å¹
                            , "HMaterModel_New": d.data[0].æ°ç½å¯è§æ ¼
                            //å¶ä»ä¿¡æ¯
                            , "hmakers": OperationType == 2 ? "" : d.data[0].å¶åäºº
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBill.html

@@ -140,6 +140,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
                                            </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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">æ»è£å¾å·</label>
                        <div class="layui-input-inline">
@@ -166,6 +172,12 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
                                            </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="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
@@ -2256,6 +2268,8 @@
                                , "HSizing": data.å®åæµæ
                                , "HSellDate": data.äº¤è´§æ¥æ

                                , "HWidth_New": data.æ°ç½å¯é¨å¹
                                , "HMaterModel_New": data.æ°ç½å¯è§æ ¼

                                , "HMaker": data.å¶åäºº
                                , "HChecker": data.å®¡æ ¸äºº
@@ -2564,6 +2578,10 @@
                            $("#HCusNames").val(data.å®¢æ·);
                            $("#HColorRemark").val(data.æè²è¦æ±);
                            $("#HRemark3").val(data.åºé¨å¤æ³¨);

                            $("#HWidth_New").val(data.æ°ç½å¯é¨å¹);
                            $("#HMaterModel_New").val(data.æ°ç½å¯è§æ ¼);

                            $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                            $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:éä¸ false:ä¸éä¸
                            form.render("checkbox");

			@@ -250,7 +250,7 @@
			<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="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark">
			</div>
			</div>
			<div class="layui-inline">
			@@ -263,6 +263,12 @@
			<label class="layui-form-label" style="width: 85px;">è®¡åå®å·¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
			</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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
			</div>
			</div>
			</div>
			@@ -283,6 +289,12 @@
			<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="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
			</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="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
			</div>
			</div>
			</div>
			@@ -1194,6 +1206,8 @@
			, "HCusModel": d.data[0].å®¢æ·è§æ ¼åå·
			, "HCusMaterNumber": d.data[0].å®¢æ·ç©æç¼ç
			, "HOrderPickRemark": d.data[0].è®¢ååè£å¤æ³¨
			, "HWidth_New": d.data[0].æ°ç½å¯é¨å¹
			, "HMaterModel_New": d.data[0].æ°ç½å¯è§æ ¼
			//å¶ä»ä¿¡æ¯
			, "hmakers": OperationType == 2 ? "" : d.data[0].å¶åäºº
			, "hmakedate": OperationType == 2 ? "" : d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")

			@@ -140,6 +140,12 @@
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
			</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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			@@ -166,6 +172,12 @@
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HUnitID" id="HUnitID" value="0">
			</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="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			@@ -2256,6 +2268,8 @@
			, "HSizing": data.å®åæµæ
			, "HSellDate": data.äº¤è´§æ¥æ

			, "HWidth_New": data.æ°ç½å¯é¨å¹
			, "HMaterModel_New": data.æ°ç½å¯è§æ ¼

			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			@@ -2564,6 +2578,10 @@
			$("#HCusNames").val(data.å®¢æ·);
			$("#HColorRemark").val(data.æè²è¦æ±);
			$("#HRemark3").val(data.åºé¨å¤æ³¨);

			$("#HWidth_New").val(data.æ°ç½å¯é¨å¹);
			$("#HMaterModel_New").val(data.æ°ç½å¯è§æ ¼);

			$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
			$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:éä¸ false:ä¸éä¸
			form.render("checkbox");