bug修改

application/app_broker/view/index/daily_achieve_mdzj.html

@@ -53,6 +53,23 @@
 								<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
 								<td>{{renjun(chengjiao_yue_wancheng)}}</td>
 							</tr>
+							<tr class="table-tr-single">
+								<td colspan="5">当月商场和街铺成交情况</td>
+							</tr>
+							<tr>
+								<td>商场</td>
+								<td>成交单数</td>
+								<td><input type="number" placeholder="填写" /></td>
+								<td>业绩(元)</td>
+								<td><input type="number" placeholder="填写" /></td>
+							</tr>
+							<tr>
+								<td>街铺</td>
+								<td>成交单数</td>
+								<td><input type="number" placeholder="填写" /></td>
+								<td>业绩(元)</td>
+								<td><input type="number" placeholder="填写" /></td>
+							</tr>
 							<tr class="table-tr-textarea tr-padding20">
 								<td>业绩方面<br />的当前工<br />作重点</td>
 								<td colspan="4">

application/index/view/store/index.html

@@ -296,7 +296,7 @@
                         <label class="col-sm-3 control-label">所属部门：</label>
                         <!--<input type="text" value="" name="ss-store" class="form-control btn6" placeholder="所属部门">-->
                         <select name="ss-store" class="form-control btn6"  id="ss-store" >
-                        <option value="0" selected="selected">请选择</option>
+                        <option value="" selected="selected">请选择</option>
                         </select>
                     </div>
 

public/resource/js/shop_edit.js

@@ -70,6 +70,8 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				_imgUploadDujia = $('#dujia_pic_ul'), //独家合同ul
 				_imgMaskObj = $('#img_mask_area'); //预览大图的mask
 			
+			//对商户显示的装让费默认隐藏
+			_foreignZhuanrangPriceObj.closest('.form-group').hide();
 			//处理文件名，长度过长时处理
 			function dealFileName(str) {
 				//如果文件超过30的长度，则用*代替
@@ -816,6 +818,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 					_roomArea1Obj.attr('data-alert','请填写商铺面积！').parent().prev().html('商铺面积');
 					_businessAreaObj.attr('data-alert','请填写项目总面积！').parent().prev().html('项目总面积');
 					$('.shangchang-show-part').show();
+					_foreignZhuanrangPriceObj.closest('.form-group').hide();
 				};
 			});
 
@@ -824,6 +827,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 				if($(this).val() == '1') {
 					//不显示给C端
 					$('.show-c-part').hide();
+					_foreignZhuanrangPriceObj.closest('.form-group').hide();
 				} else {
 					//显示给C端
 					$('.show-c-part').show();
@@ -1015,15 +1019,15 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 							return false;
 						};
 						if(item === _moonPriceObj){
-							if(_zujinTypeObj.val() == 1 && $.trim(item.val) < 1000){
+							if(_zujinTypeObj.val() == 1 && $.trim(item.val()) < 1000){
 								alert('月租金模式不能小于1000');
 								_isBreakFlag = true;
 								return false;
-							}else if(_zujinTypeObj.val() == 2 && $.trim(item.val) > 100){
+							}else if(_zujinTypeObj.val() == 2 && $.trim(item.val()) > 100){
 								alert('营业额扣点不能超过100');
 								_isBreakFlag = true;
 								return false;
-							}else if(_zujinTypeObj.val() == 3 && $.trim(item.val) > 300){
+							}else if(_zujinTypeObj.val() == 3 && $.trim(item.val()) > 300){
 								alert('每天每平米租金不能超过300');
 								_isBreakFlag = true;
 								return false;

public/resource/js/storeList.js

@@ -375,12 +375,12 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 							}
                         });
                         if(obj.type == '2'){
-                        	$("#ss-store").html(_html);
+                        	//为编辑时
+                        	$("#ss-store").html('<option value="" selected="selected">请选择</option>' + _html);
                         }else if(obj.type == '1'){
-                        	$("#qx-store").append(_html);
-                        	$("#qx-store-new").append(_html);
-                        	
-                        	
+                        	//为新增时
+                        	$("#qx-store").html('<option value="" selected="selected">请选择</option>' + _html);
+                        	$("#ss-store").html('<option value="" selected="selected">请选择</option>' + _html);
                         }else{}
                         fn && fn();
                     } else {