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

WeChat/client-side/dispose.html

@@ -247,13 +247,6 @@
 		    </ul>
 	<!--抽检类市场管理科-->	
 			<ul class="mui-table-view" style="display: none;"  id="cccc">
-				<li class="mui-table-view-cell" id="result">
-					<div class="mui-input-row">
-						<label class="label">生产基地：</label>
-						<input type="text" id='ower_result' class="ui-alert type_con size-14" data-index="" readonly="readonly" placeholder="请选择"/>
-						<a href=""><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
-					</div>
-				</li>
 				<li class="mui-table-view-cell">
 					<div class="mui-input-row">
 						<label class="label">超出质保期限：</label>

WeChat/client-side/js/dispose.js

@@ -63,7 +63,7 @@ $(function() {
 					ImprovementRequirements:$("#order_demand").val(), //改进要求
 					CApprovalNo:$("#order_odd").val(), //审批工作流单号
 //			抽检类市场管理科
-                    ProductBase: $('#ower_result').attr('data-index'), //生产基地
+//                  ProductBase: $('#ower_result').attr('data-index'), //生产基地
 //					QualityMonth:$("#order_spection").val(), //自检结果
 //			抽检类质量管理部		
                     isvisit: $('.order_return').find('input[type="radio"]:checked').val(), //是否否回访
@@ -162,6 +162,7 @@ function Ajax() {
 						if($("#Work_classname").text()=="抽检"){	
 						   if($("#section").text()=="市场管理科"){
 							  $("#cccc").show(); 
+							  $("#aaaa").show();
 						   }
 						}else if($("#Work_classname").text()=="投诉"){
 						   if($("#section").text()=="市场管理科"){
@@ -337,7 +338,7 @@ var  base = [];
 				showCityPickerButton2.addEventListener('tap', function(event) {
 					matrix.show(function(items) {
 						cityResultc2.value = items[0].text;
-						cityResultc2.setAttribute("data-index", items[0].value);
+						cityResultc2.setAttribute("data-index", items[0].text);
 						//返回 false 可以阻止选择框的关闭
 						//return false;
 					});

WeChat/client-side/js/redeploy.js

@@ -430,7 +430,7 @@ var  parallelism = [];
 			showCityPickerButton.addEventListener('tap', function(event) {
 				cityPicker3.show(function(items) {
 					cityResult3.value = items[0].text;
-					cityResult3.setAttribute("data-index", items[0].value);
+					cityResult3.setAttribute("data-index", items[0].text);
 					//返回 false 可以阻止选择框的关闭
 					//return false;
 				});