工艺

topsun-xt/src/main/webapp/biz/topsun/technology/processDetail.jsp

@@ -9,7 +9,7 @@
 		<x:inputC name="processName" required="true" label="工序名称" labelCol="2" maxLength="64" fieldCol="4" />
 		<x:selectC name="processType" required="true" label="工序类别" labelCol="2" dictionary="processType" fieldCol="4" />
 		<x:inputC name="processContent" required="true" label="工序内容" labelCol="2" maxLength="64" fieldCol="4" />
-		<x:inputC name="workHours" required="true" label="工时" labelCol="2" mask="nnnn" dataOptions="min:0"  maxLength="32" fieldCol="4" />
+		<x:inputC name="workHours" required="true" label="工时" labelCol="2" mask="nnnn.nn" dataOptions="min:0"  maxLength="32" fieldCol="4" />
 		<x:inputC name="processRemark" required="false" label="工序说明" labelCol="2"  maxLength="32" fieldCol="10" />
 	</div>
 	<div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/technology/processList.js

@@ -40,7 +40,7 @@ function loadProcessListGrid() {
      	fixedCellHeight: true,
      	selectRowButtonOnly: true,
      	onDblClickRow : function(data, rowindex, rowobj) {
-			updateHandler(data.id);
+			updateHandler(data);
 		}
     });
     UICtrl.setSearchAreaToggle(gridManager);
@@ -76,14 +76,18 @@ function addHandler(){
 	});
 }
 
-function updateHandler(){
-	var process = DataUtil.getUpdateRow(gridManager);
-	if (!process){ return; }
+function updateHandler(row){
+	if (!row) {
+		row = DataUtil.getUpdateRow(gridManager);
+		if (!row) {
+			return;
+		}
+	}
 	UICtrl.showAjaxDialog({
 		url: web_app.name + '/process/showProcessDetail.load',
 		title: "修改工艺设置",
 		width: 800,
-		param:{processId:process.processId},
+		param:{processId:row.processId},
 		ok: function(div){
 			var _self=this;
 			$('#submitForm',div).ajaxSubmit({url: web_app.name + '/process/saveProcess.ajax',

topsun-xt/src/main/webapp/biz/topsun/technology/technologyList.js

@@ -39,7 +39,7 @@ function loadTechnologyListGrid() {
      	fixedCellHeight: true,
      	selectRowButtonOnly: true,
      	onDblClickRow : function(data, rowindex, rowobj) {
-			updateHandler(data.id);
+			updateHandler(data);
 		}
     });
     UICtrl.setSearchAreaToggle(gridManager);
@@ -78,14 +78,18 @@ function addHandler(){
 	});
 }
 
-function updateHandler(){
-	var technology = DataUtil.getUpdateRow(gridManager);
-	if (!technology){ return; }
+function updateHandler(row){
+	if (!row) {
+		row = DataUtil.getUpdateRow(gridManager);
+		if (!row) {
+			return;
+		}
+	}
 	UICtrl.showAjaxDialog({
 		url: web_app.name + '/technology/showTechnologyDetail.load',
 		title: "修改工艺设置",
 		width: 1000,
-		param:{technologyId:technology.technologyId},
+		param:{technologyId:row.technologyId},
 		ok: function(div){
 			var _self=this;
 			$('#submitForm',div).ajaxSubmit({url: web_app.name + '/technology/updateTechnology.ajax',