ECN变更验证多选是否选中；原材料新增，显示中英文长文本

topsun-xt/src/main/resources/log4j.properties

@@ -11,8 +11,8 @@ log4j.appender.LogFileInfo.threshold=INFO
 
 log4j.appender.LogFileError = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.LogFileError.file = /var/project/log/300/Error.log
-#log4j.appender.LogFileInfo.file = /var/project/log/310/Info.log
-#log4j.appender.LogFileInfo.file = /var/project/log/320/Info.log
+#log4j.appender.LogFileError.file = /var/project/log/310/Info.log
+#log4j.appender.LogFileError.file = /var/project/log/320/Info.log
 log4j.appender.LogFileError.DatePattern = '.'yyyy-MM-dd
 log4j.appender.LogFileError.layout = org.apache.log4j.PatternLayout
 log4j.appender.LogFileError.layout.ConversionPattern = [%p] <%d{yyyy-MM-dd HH:mm:ss:SSS}> %C{1}::%M: %m%n

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js

@@ -434,6 +434,32 @@ function getExtendedData(processAction) {
     return extendedData;
 }
 
+function checkConstraints() {
+    if (UICtrl.isApplyProcUnit()) {
+        var chceked = true;
+        // 检查是否有至少一个复选框被选中
+        if ($("input[name='reasonForChange']:checked").length === 0) {
+            chceked = false; // 显示错误消息
+        }
+        if (!chceked) {
+            Public.tip('请选择变更类型');
+            return false;
+        }
+
+        var changeEffectiveChceked = true;
+        // 检查是否有至少一个复选框被选中
+        if ($("input[name='changeEffective']:checked").length === 0) {
+            changeEffectiveChceked = false; // 显示错误消息
+        }
+        if (!changeEffectiveChceked) {
+            Public.tip('请选择生效日期');
+            return false;
+        }
+    }
+    return true;
+}
+
+
 function print(){
     // if ($("#statusId").val() != 3){
     //     Public.tip("请审批完成再打印!");

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js

@@ -354,6 +354,31 @@ function getExtendedData(processAction) {
     return extendedData;
 }
 
+function checkConstraints() {
+    if (UICtrl.isApplyProcUnit()) {
+        var chceked = true;
+        // 检查是否有至少一个复选框被选中
+        if ($("input[name='materialReasonForChange']:checked").length === 0) {
+            chceked = false; // 显示错误消息
+        }
+        if (!chceked) {
+            Public.tip('请选择变更类型');
+            return false;
+        }
+
+        var changeEffectiveChceked = true;
+        // 检查是否有至少一个复选框被选中
+        if ($("input[name='changeEffective']:checked").length === 0) {
+            changeEffectiveChceked = false; // 显示错误消息
+        }
+        if (!changeEffectiveChceked) {
+            Public.tip('请选择生效日期');
+            return false;
+        }
+    }
+    return true;
+}
+
 function print(){
     // if ($("#statusId").val() != 3){
     //     Public.tip("请审批完成再打印!");

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp

@@ -164,12 +164,12 @@
                 <x:hidden name="klart"/>
                 <x:hidden name="classify"/>
             </div>
-        </div>
-        <div class="hg-form-cols">
-            <%--<div class="hg-form-row">
+            <div class="hg-form-row">
                 <x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
                 <x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
-            </div>--%>
+            </div>
+        </div>
+        <div class="hg-form-cols">
             <c:if test="${applyType==2}">
                 <div class="hg-form-row">
                     <x:checkbox name="isAll" label="全选"/>