Merge branch 'test'

application/app_broker/view/index/daily_achieve_dz.html

@@ -74,7 +74,7 @@
 								<tr>
 									<td>成交单数</td>
 									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td>
-									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" readonly="" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
 									<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
 									<td>{{renjun(chengjiao_yue_wancheng)}}</td>
 								</tr>

application/app_broker/view/index/daily_achieve_mdzj.html

@@ -49,7 +49,7 @@
 							<tr>
 								<td>成交单数</td>
 								<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td>
-								<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" readonly="" /></td>
+								<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
 								<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
 								<td>{{renjun(chengjiao_yue_wancheng)}}</td>
 							</tr>

application/app_broker/view/index/daily_achieve_ywy.html

@@ -71,7 +71,7 @@
 								<tr>
 									<td>成交单数</td>
 									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td>
-									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" readonly="" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
 									<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
 								</tr>
 							</tbody>

application/app_broker/view/index/weekly_achieve_dz.html

@@ -42,7 +42,7 @@
 								<td>本月目标单数</td>
 								<td><input type="number" placeholder="填写" v-model.number="dsmb" /></td>
 								<td>本月完成单数</td>
-								<td><input type="number" placeholder="填写" v-model.number="dswc" readonly /></td>
+								<td><input type="number" placeholder="填写" v-model.number="dswc" /></td>
 							</tr>
 							<tr>
 								<td>单数差额</td>

application/app_broker/view/index/weekly_achieve_mdzj.html

@@ -88,7 +88,7 @@
 								<td>本月目标单数</td>
 								<td><input type="number" placeholder="填写" class="danshu_mubiao" /></td>
 								<td>本月完成单数</td>
-								<td><input type="number" placeholder="填写" class="danshu_wancheng" readonly /></td>
+								<td><input type="number" placeholder="填写" class="danshu_wancheng" /></td>
 							</tr>
 							<tr>
 								<td>单数差额</td>
@@ -207,7 +207,7 @@
 						<td>本月目标单数</td>
 						<td><input type="number" placeholder="填写" class="danshu_mubiao"></td>
 						<td>本月完成单数</td>
-						<td><input type="number" placeholder="填写" class="danshu_wancheng" value="{danshu_benyue}" readonly="" /></td>
+						<td><input type="number" placeholder="填写" class="danshu_wancheng" value="{danshu_benyue}" /></td>
 					</tr>
 					<tr>
 						<td>单数差额</td>

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="" selected="selected">请选择</option>
+                        <option value="0" selected="selected">请选择</option>
                         </select>
                     </div>
 

public/app/js/common.js

@@ -244,10 +244,10 @@ function hideTel(str){
 //业绩周报日报里用到，处理金额的数字，最多三位小数
 function dealJineNum(num){
 	if(isFinite(num)){
-		if(parseInt(num)==num || num.toString().split(".")[1].length < 4){
+		if(parseInt(num)==num || num.toString().split(".")[1].length < 3){
 			return num;
 		}else{
-			return Number((num).toFixed(3));
+			return Number((num).toFixed(2));
 		}
 	}else{
 		return 0;

public/resource/js/storeList.js

@@ -60,7 +60,6 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 
 			});
 			$ (document).delegate (".edit", "click", function () {//点击编辑
-
 				store.house_id = $ (this).attr ("data-id");
 				$("#modal-title").html("编辑门店信息");
 				store.Edit();
@@ -91,6 +90,8 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 
             $ (document).delegate (".add", "click", function () {//list2消失
                 document.getElementById('form_id').reset();
+				$("#modal-title").html("新增门店");
+                $('#ss-store').val('');
             });
 
 			/************************************************百度地址定位相关*************************************************************/
@@ -221,7 +222,7 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 						$("input[name = name]").val(data.data.store_name);//门店名
 						$("#pid-select").val(data.data.scale)//规模
 						$("input[name=store-name]").val(data.data.agents_name);//店长
-						// $("input[name=ss-store]").val(data.data.district_name);//所属部门
+						$("input[name=ss-store]").val(data.data.district_name);//所属部门
 						$("#province_internal").val(data.data.province)//地址1
 						$("#city_internal").val(data.data.city)//地址1
 						$("#disc_internal").val(data.data.district)//地址1
@@ -375,6 +376,9 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
                         	$("#ss-store").html(_html);
                         }else if(obj.type == '1'){
                         	$("#qx-store").append(_html);
+                        	$("#qx-store-new").append(_html);
+                        	
+                        	
                         }else{}
                         fn && fn();
                     } else {