工序物料

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp

@@ -12,7 +12,15 @@
     <div class="blank_div clearfix"></div>
     <form class="hg-form" method="post" action="" id="submitForm">
 
-        <div><h3>基本信息</h3></div>
+        <div style="display: flex; align-items: center;">
+            <div style="flex: 1;">
+                <h3>基本信息</h3>
+            </div>
+            <div style="text-align: right;padding-right: 50px;">
+                <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
+                <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
+            </div>
+        </div>
         <div style="margin: 10px;">
             <div class="hg-form-cols">
 <%--                <x:hidden name="bizId"/>--%>
@@ -149,10 +157,6 @@
         </div>
 
         <%@ include file="technologyAndBom/technologyAndBom.jsp" %>
-        <div class="blank_div clearfix"></div>
-        <div style="min-height: 40px; text-align: center;" id="formButton">
-            <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
-            <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
-        </div>
+
     </form>
 </div>

topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js

@@ -195,7 +195,7 @@ function showTable(params) {
 		}
 		setTimeout(function() {
 			resolve();
-		}, 1000);
+		}, 1200);
 	});
 	promise.then(function() {
 		let technologyResult = DataUtil.getGridData({
@@ -241,6 +241,10 @@ function showTechnologyTable(productId){
 			processObj.parms={technologyId:-1};//手动切换gridManager
 			reloadGrid(processObj);
 		}
+		if(processBomObj.gridManager!=null){
+			processBomObj.parms={a:-1};//手动切换gridManager
+			reloadGrid(processBomObj);
+		}
 	}else {
 		technologyObj.parms={productId:productId};
 		loadProofingApplyGrid(technologyObj);

topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.jsp

@@ -11,7 +11,15 @@
 
         <x:billTitle title="作业指导书" needStatus="false" needPerson="true"/>
         <div style="margin: 10px;">
-            <x:title title="基本信息" name="group"/>
+            <div style="display: flex; align-items: center;">
+                <div style="flex: 1;">
+                    <x:title title="基本信息" name="group"/>
+                </div>
+                <div style="text-align: right;padding-right: 50px;">
+                    <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
+                    <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
+                </div>
+            </div>
             <div class="hg-form-cols">
                 <x:hidden name="workInstructionApplyId"/>
 
@@ -247,11 +255,6 @@
                           fieldCol="2"/>
             </div>
         </div>
-        <div class="blank_div clearfix"></div>
-        <div style="min-height: 40px; text-align: center;">
-            <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
-            <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
-        </div>
     </form>
 
 </div>

topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.jsp

@@ -8,7 +8,16 @@
 <div class="container-fluid" style="padding: 10px;">
     <form class="hg-form" method="post" action="" id="submitForm">
         <x:billTitle title="作业指导申请书" needStatus="false" needPerson="true"/>
-        <x:title title="基本信息" name="group"/>
+        <div style="display: flex; align-items: center;">
+            <div style="flex: 1;">
+                <x:title title="基本信息" name="group"/>
+            </div>
+            <div style="text-align: right;padding-right: 50px;">
+                <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
+                <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
+            </div>
+        </div>
+
         <div style="margin: 10px;">
             <div class="hg-form-cols">
                 <x:hidden name="proofingApplyId"/>
@@ -49,11 +58,6 @@
                           fieldCol="2"/>
             </div>
         </div>
-        <div class="blank_div clearfix"></div>
-        <div style="min-height: 40px; text-align: center;">
-            <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
-            <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
-        </div>
     </form>
 
 </div>