Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_UI

WeChat/client-side/Retired_list.html

@@ -297,7 +297,7 @@
 								//工单跳转
 								$('.order').on('tap', function() {
 									var index = $(this).attr('data-index');
-									window.location.href = "details.html?id=" + index + '&itype=' + itype;
+									window.location.href = "details.html?id=" + index + '&itype=' + 222;
 
 								});
 							}
@@ -369,7 +369,7 @@
 								//工单跳转
 								$('.order').on('tap', function() {
 									var index = $(this).attr('data-index');
-									window.location.href = "details.html?id=" + index + '&itype=' + itype;
+									window.location.href = "details.html?id=" + index + '&itype=' + 222;
 
 								});
 							}else{

WeChat/client-side/dispose.html

@@ -156,30 +156,17 @@
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row tit">
 						<label class="label">责任单位：</label>
+
 						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>生产</label>-->
-							<input type="checkbox" type="radio" name="unit" checked="checked" value="0" class="size-14" />生产
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>研发</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />研发
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>农化</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />农化
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>物流</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />物流
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>质量管理科</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />质量管理科
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>销售内勤</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />销售内勤
+							<!--<label>生产</label>--> 
+							<input type="checkbox" type="radio" name="unit" value="生产" class="size-14" />生产
+							<input type="checkbox" type="radio" name="unit" value="研发" class="size-14" />研发
+							<input type="checkbox" type="radio" name="unit" value="农化" class="size-14" />农化
+							<input type="checkbox" type="radio" name="unit" value="物流" class="size-14" />物流
+							<input type="checkbox" type="radio" name="unit" value="质量管理科" class="size-14" />质量管理科
+							<input type="checkbox" type="radio" name="unit" value="销售内勤" class="size-14" />销售内勤
 						</div>
+						<input type="hidden" id="zerenSel" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">

WeChat/client-side/js/dispose.js

@@ -27,6 +27,12 @@ $(function() {
 		window.location.href = "details.html?id=" + id + '&itype=' + itype;
 
 	});
+	 $(".order_unit").on("click",function(){
+	      var ichk=$("input:checkbox:checked").map(function(){
+	         return $(this).val();
+	      }).get().join(",");
+	      $("#zerenSel").val(ichk);
+	   })
 	//提交按钮
 	$('#submit').on('tap', function() {
 		if($('#recive_type').val== '') {
@@ -53,7 +59,7 @@ $(function() {
 					isvisit:$('.order_pay').find('input[type="radio"]:checked').val(), //是否回访
 					QualityEventLevel: $('#ower_event').attr('data-index'), //事件等级
 					ClaimAmount: $('#order_money').attr('data-index'), //索赔金额
-					ResponsibleUnit:$('.order_unit').find('input[type="checkbox"]:checked').val(), //责任单位
+					ResponsibleUnit:$("#zerenSel").val(), //责任单位
 					ApprovalOpinions: $('.order_opinion').find('input[type="radio"]:checked').val(), //审批意见
 					ApprovalDisagree:$("#order_idea").val(), //不同意意见
 					CompensationMethod: $('.order_coin').find('input[type="radio"]:checked').val(), //补偿方式
@@ -370,18 +376,18 @@ var  base = [];
 //				});
 //		}, false); 
 //生产基地
-       	var produ = new $.PopPicker();
-			produ.setData(base);
-			var showCityPickerButton6 = doc.getElementById('result');
-			var cityResultc6 = doc.getElementById('ower_result');
-			showCityPickerButton6.addEventListener('tap', function(event) {
-				produ.show(function(items) {
-					cityResultc6.value = items[0].text;
-					cityResultc6.setAttribute("data-index", items[0].text);
-					//返回 false 可以阻止选择框的关闭
-					//return false;
-				});
-		}, false); 	
+//     	var produ = new $.PopPicker();
+//			produ.setData(base);
+//			var showCityPickerButton6 = doc.getElementById('result');
+//			var cityResultc6 = doc.getElementById('ower_result');
+//			showCityPickerButton6.addEventListener('tap', function(event) {
+//				produ.show(function(items) {
+//					cityResultc6.value = items[0].text;
+//					cityResultc6.setAttribute("data-index", items[0].text);
+//					//返回 false 可以阻止选择框的关闭
+//					//return false;
+//				});
+//		}, false); 	
 	
 	
 	

WeChat/client-side/js/redeploy.js

@@ -27,6 +27,12 @@ $(function() {
 		window.location.href = "details.html?id=" + id + '&itype=' + itype;
 
 	});
+	$(".order_unit").on("click",function(){
+      	var ichk=$("input:checkbox:checked").map(function(){
+         return $(this).val();
+      	}).get().join(",");
+      	$("#zerenSel").val(ichk);
+	})
 	//提交按钮
 	$('#submit').on('tap', function() {
 		if($('#recive_type').attr('data-index')== '') {
@@ -59,7 +65,7 @@ $(function() {
 					isvisit:$('.order_pay').find('input[type="radio"]:checked').val(), //是否回访
 					QualityEventLevel: $('#ower_event').attr('data-index'), //事件等级
 					ClaimAmount: $('#order_money').attr('data-index'), //索赔金额
-					ResponsibleUnit:$('.order_unit').find('input[type="checkbox"]:checked').val(), //责任单位
+					ResponsibleUnit:$("#zerenSel").val(), //责任单位
 					ApprovalOpinions: $('.order_opinion').find('input[type="radio"]:checked').val(), //审批意见
 					ApprovalDisagree:$("#order_idea").val(), //不同意意见
 					CompensationMethod: $('.order_coin').find('input[type="radio"]:checked').val(), //补偿方式

WeChat/client-side/redeploy.html

@@ -160,28 +160,14 @@
 						<label class="label">责任单位：</label>
 						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
 							<!--<label>生产</label>-->
-							<input type="checkbox" type="radio" name="unit" checked="checked" value="0" class="size-14" />生产
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>研发</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />研发
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>农化</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />农化
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>物流</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />物流
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>质量管理科</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />质量管理科
-						</div>
-						<div class="mui-input-row mui-radio mui-left radio_box order_unit">
-							<!--<label>销售内勤</label>-->
-							<input type="checkbox" type="radio" name="unit" value="1" class="size-14" />销售内勤
+							<input type="checkbox" type="radio" name="unit" checked="checked" value="生产" class="size-14" />生产
+							<input type="checkbox" type="radio" name="unit" value="研发" class="size-14" />研发
+							<input type="checkbox" type="radio" name="unit" value="农化" class="size-14" />农化
+							<input type="checkbox" type="radio" name="unit" value="物流" class="size-14" />物流
+							<input type="checkbox" type="radio" name="unit" value="质量管理科" class="size-14" />质量管理科
+							<input type="checkbox" type="radio" name="unit" value="销售内勤" class="size-14" />销售内勤
 						</div>
+						<input type="hidden" id="zerenSel" value="" />
 					</div>
 				</li>
 				<li class="mui-table-view-cell">