调整

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

@@ -85,12 +85,13 @@
         <div class="hg-form-cols" id="totalContentDiv">
             <div class="hg-form-row">
                 <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
-               <c:if test="${kind=='product'}">
-                  <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
-               </c:if>
-                <c:if test="${kind!='product'}">
+<%--               <c:if test="${kind=='product'}">--%>
+<%--                  <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>--%>
+<%--               </c:if>--%>
+<%--                <c:if test="${kind!='product'}">--%>
+<%--                    <x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="2"/>--%>
+<%--                </c:if>--%>
                 <x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="2"/>
-                </c:if>
                 <x:hidden name="baseUnit"/>
                 <x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" readonly="true"/>
                 <x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
@@ -140,7 +141,7 @@
                 <x:inputC name="" label="旧料号" labelCol="1" fieldCol="2"/>
 
                 <x:inputC name="mhdrz" label="最小货架寿命" labelCol="1" fieldCol="2"/>
-                <x:inputC name="normt" label="适用标准" labelCol="1" fieldCol="2"/>
+                <x:inputC name="normt" label="适用行业标准" labelCol="1" fieldCol="2"/>
 
 
                     <x:inputC name="klart" label="类型" labelCol="1" fieldCol="2" readonly="true"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -156,13 +156,13 @@ function loadGrid() {
                 editor: {type: "text",maxLength:500 }
             },
             {
-                display: "用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",
+                display: "备注用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",
                 editor: { type: "text",maxLength:500 }
             },
-            {
-               display: "备注", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
-                editor: { type: "text",maxLength:1000 }
-            }
+            // {
+            //    display: "", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
+            //     editor: { type: "text",maxLength:1000 }
+            // }
         ],
         dataAction: "server",
         url: web_app.name + '/nonProducePickItem/queryNonProducePickItems.ajax',