qihanjiao 6 年之前
父节点
当前提交
89cf8b6669

文件差异内容过多而无法显示
+ 0 - 119
rst/application_delivery.html


+ 0 - 277
rst/confirmation_of_warehousing.html

@@ -1,277 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title>确认入库</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="css/mui.picker.min.css" />
-		<link rel="stylesheet" type="text/css" href="css/mui.picker.css"/>
-		<link rel="stylesheet" type="text/css" href="css/mui.poppicker.css"/>
-		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="css/style.css" />
-		<style>
-			.mui-content>.mui-input-group:first-child{margin-top: 0;}
-			.pro-list>li{border: 0;margin: 10px;}
-			.pro-list>li:first-child{border-top: 0;}
-			.my-input-group .mui-input-row label~input{text-align: left;}
-			.lack{position: absolute;left: 160px;top: 10px;font-size: 14px;color: #f00;}
-		</style>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-	</div>
-	<nav class="mui-bar mui-bar-tab submit">
-		<button type="button">确认入库</button>
-	</nav>
-			<div class="mui-content">
-				<form class="mui-input-group my-input-group view-none">
-					
-					<ul class="pro-list">
-						<li>
-							<div class="mui-input-row my-tit-row no-after">
-								<label style="width:100%;"><h4>订单产品<span class="mui-h5 mui-pull-right">2018-11-11 12:00</span></h4></label>
-								
-							</div>
-							<ul class="pro-iteam-list">
-								<li>
-									<div class="mui-input-row">
-										<label>产品名称</label>
-										<input type="text" readonly="readonly" subparam="itemProductName" value="优尼雅净水机">
-									</div>
-									<div class="mui-input-row">
-										<label>品牌名称</label>
-										<input type="text" readonly="readonly" subparam="itemBrandName" value="美国watero">
-									</div>
-									<div class="mui-input-row">
-										<label>产品型号</label>
-										<input type="text" readonly="readonly" subparam="itemProductModel" value="wb-1">
-									</div>
-									<div class="mui-input-row">
-										<label>产品颜色</label>
-										<input type="text" readonly="readonly" subparam="itemColorName" value="黑色">
-									</div>
-									<div class="mui-input-row">
-										<label>产品数量</label>
-										<input type="tel" readonly="readonly" subparam="itemProductNum" value="100台">
-									</div>
-									<div class="mui-input-row">
-										<label>箱 / 套数</label>
-										<input type="tel" readonly="readonly" subparam="itemProductBoxNumber" value="100">
-									</div>
-									<div class="mui-input-row">
-										<label>已入库</label>
-										<input type="tel" readonly="readonly" subparam="itemProductBoxNumber" value="50台">
-										<span class="lack">缺50台</span>
-									</div>
-									<div class="mui-input-row no-after">
-										<label>入库数量</label>
-										<input type="text" reg="num" subparam="itemProductNum" placeholder="请输入入库数量(1~100台)">
-									</div>
-								</li>
-								<li>
-									<div class="mui-input-row">
-										<label>产品名称</label>
-										<input type="text" readonly="readonly" subparam="itemProductName" value="优尼雅净水机">
-									</div>
-									<div class="mui-input-row">
-										<label>品牌名称</label>
-										<input type="text" readonly="readonly" subparam="itemBrandName" value="美国watero">
-									</div>
-									<div class="mui-input-row">
-										<label>产品型号</label>
-										<input type="text" readonly="readonly" subparam="itemProductModel" value="wb-1">
-									</div>
-									<div class="mui-input-row">
-										<label>产品颜色</label>
-										<input type="text" readonly="readonly" subparam="itemColorName" value="黑色">
-									</div>
-									<div class="mui-input-row">
-										<label>产品数量</label>
-										<input type="tel" readonly="readonly" subparam="itemProductNum" value="100台">
-									</div>
-									<div class="mui-input-row">
-										<label>箱 / 套数</label>
-										<input type="tel" readonly="readonly" subparam="itemProductBoxNumber" value="100">
-									</div>
-									<div class="mui-input-row">
-										<label>已入库</label>
-										<input type="tel" readonly="readonly" subparam="itemProductBoxNumber" value="50台">
-										<span class="lack">缺50台</span>
-									</div>
-									<div class="mui-input-row no-after">
-										<label>入库数量</label>
-										<input type="text" reg="num" subparam="itemProductNum" placeholder="请输入入库数量(1~100台)">
-									</div>
-								</li>
-							</ul>
-						</li>
-
-					</ul>
-				</form>
-			</div>
-	<script type="text/javascript" src="js/mui.min.js"></script>
-	<script type="text/javascript" src="js/mui.picker.min.js"></script>
-	<script type="text/javascript" src="js/mui.picker.js"></script>
-	<script type="text/javascript" src="js/mui.poppicker.js"></script>
-	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
-	<script type="text/javascript" src="js/main.js"></script>
-	<script type="text/javascript">
-	var approvalList=[],selectPro=[];	
-	mui.ready(function(){
-		document.querySelector('.loading-bg').style.display='none';
-	});
-	
-	
-//提交	
-var check = false,msg='';	
-$(document).on('tap','.submit>button',function(){
-check = false,msg='';	
-var parameter = {};
-mui(".mui-input-group>.mui-input-row input[reg]").each(function () {
-  //若当前input为空,则alert提醒
-  var th=this;
-  var label = th.previousElementSibling;
-  if(!th.value||(th.value).trim()==""){
-    msg=label.innerText+"不允许为空";
-    check = false;
-    return false;
-  }else{
-  	checkReg(th,label);
-  	if(th.getAttribute("param")!=null){
-  		parameter[th.getAttribute("param")] = th.value;
-  	}
-  }
-});
-
-//parameter["productionItems"]=arr;
-//校验通过,继续执行业务逻辑
-if(check){
-	parameter["productionApprovalId"]=$("#select-orderName").attr("name");
-	mui(selectPro).each(function (index) {
-		var th=this,ix=index;
-		mui('.pro-iteam-list input[subparam=itemProductNum]').each(function () {
-			if(selectPro[ix].itemId==this.getAttribute("name")){
-				selectPro[ix].itemProductNum=this.value;
-			}
-		});
-	});
-	parameter["listApplyPickItemJson"]=selectPro;
-   if(imgArray.length>0){
-   	console.log("通过");
-   	console.log(parameter);
-   }else{
-   	  mui.alert("请上传提货凭证照片");
-   }
-}else{
-	mui.alert(msg);
-}
-});
-
-function checkReg(th,label){
-	var reg_Tel =/^(0?(13|14|15|18|19)[\d]{9}$|(01|02|03|04|05|06|07|08|09)[\d]{7,10}$|(400|800)[0-9]{7}$)/; //手机,座机(400-800)
-  	var reg_Ch=/^[\u4e00-\u9fa5]{2,}$/;//简体中文(2位以上)
-  	var reg_Int=/^[0-9]\d*$/; //正整数0-9
-  	var reg_Ch_Num=/^[0-9~!@#$%^&*()_+={}|<>?:;'"!@¥…(){}【】《》/`、;‘’:\-—“”,。,.?·_\-\u4e00-\u9fa5]{1,140}$/;//简体中文数字,常用符号(1位以上)
-  	var reg_En_Num=/^[A-Za-z0-9~!@#$%^&*()_+={}|<>?:;'"!@¥…(){}【】《》/`、;‘’:\-—“”,。,.?·]{1,}$/;//英文数字,常用符号(1位以上)
-  	var reg_Ch_En_Num=/^[A-Za-z0-9~!@#$%^&*()_+={}|<>?:;'"!@¥…(){}【】《》/`、;‘’:\-—“”,。,.?·_\-\u4e00-\u9fa5]{1,140}$/;//简体中文英文数字,常用符号(0-140位)
-  	var reg_Date=/^([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8])))/; //日期(2018-11-11)
-  	switch (th.getAttribute("reg")){
-  		case "ch":
-  		if(reg_Ch.test(th.value)){
-  			check = true;
-  			$(th).parent().addClass("check").removeClass("error");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "num":
-  		if(reg_Int.test(th.value)){
-  			check = true;
-  			$(th).parent().addClass("check").removeClass("error");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "ch_num":
-  		if(reg_Ch_Num.test(th.value)){
-  			check = true;
-  			$(th).parent().removeClass("error").addClass("check");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "en_num":
-  		if(reg_En_Num.test(th.value)){
-  			check = true;
-  			$(th).parent().removeClass("error").addClass("check");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "ch_en_num":
-  		if(reg_Ch_En_Num.test(th.value)){
-  			check = true;
-  			$(th).parent().removeClass("error").addClass("check");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "date":
-  		if(reg_Date.test(th.value)){
-  			check = true;
-  			$(th).parent().removeClass("error").addClass("check");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		case "tel":
-  		if(reg_Tel.test(th.value)){
-  			check = true;
-  			$(th).parent().addClass("check").removeClass("error");
-  		}else{
-  			check = false;
-  			$(th).parent().removeClass("check").addClass("error");
-  			msg=label.innerText+"格式错误";
-  		}
-  		break;
-  		default:
-  			break;
-  	}
-}
-$(document).on('input',".mui-input-group input[reg],.mui-input-group .bztextarea",function(){
-   var th=this,val=th.value;
-   var label = th.previousElementSibling;
-   //禁止用户输入空格
-   if(val.indexOf(" ")!=-1){
-		val=val.replace(" ", "");
-		$(th).val(val);
-   }
-	if(!val||val==""){
-		$(th).parent().removeClass("check error");
-	}else{
-		checkReg(th,label);
-	}
-});
-	</script>
-	</body>
-</html>

+ 18 - 8
rst/css/style.css

@@ -22,11 +22,13 @@ ul{list-style: none;padding: 0;margin: 0;}
 .steps>li{float: left;position: relative;background-color: #999;width:55px;height:55px;line-height: 55px;text-align: center;border-radius: 55px;color: #fff;margin: 0 5px;}
 .steps>li.active{background-color: #5882f7;}
 .pro-cp-list{position: relative;padding-left: 3.5em;}
-.pro-cp-list:before{content: '采购产品:';position:absolute;top:0;left:0;;font-size: 2px;color: #999;}
+.pro-cp-list:before{content: '采购产品:';position:absolute;top:0;left:0;;font-size: 12px;color: #999;}
 .pro-cp-list>li{font-size: 12px;color: #999;}
 .pro-bz-list{position: relative;padding-left: 3.5em;}
-.pro-bz-list:before{content: '提货备注:';position:absolute;top:0;left:0;font-size: 2px;color: #999;}
-.pro-bz-list>li{font-size: 12px;color: #999;}
+.pro-bz-list:before{content: '提货备注:';position:absolute;top:0;left:0;font-size: 12px;color: #999;}
+.pro-bz-list.order:before{content: '订单备注:';position:absolute;top:0;left:0;font-size: 12px;color: #999;}
+.pro-bz-list>li{font-size: 12px;color: #999;word-break: break-all;}
+.word-break{word-break: break-all;white-space: pre-wrap;line-height: 1.5;color: #999 !important;}
 .express{color: #ed6a5e;}
 .my-confirm-btn{min-width: 100px;border-radius: 20px;border: 1px solid #63ccde;color: #63ccde;padding: 6px 14px 6px 14px;}
 .my-confirm-btn:active{background-color: #63ccde;color: #fff;}
@@ -153,17 +155,24 @@ article, section, time, aside {display: block;}
 				float: left;
 				position: relative;
 				background: #999;
-				width: 40px;
-				height: 40px;
-				line-height: 40px;
+				width: 50px;
+				height: 50px;
+				line-height: 50px;
 				text-align: center;
-				border-radius: 40px;
+				border-radius: 50px;
 				color: #fff;
 				margin: 5px 40px 5px 0;
 				font-size: 14px;
 			}
+		.name-steps>li.two{width: 110px;background-color: #fff;}
+		.name-steps>li>div{height: 50px;line-height: 50px;width: 50px;display: inline-block;border-radius: 50px;background-color: #999;margin: 0 5px;position: relative;}
+		.name-steps>li>div:first-child{margin-left: 0;}
+		.name-steps>li>div:last-child{margin-right: 0;}
+		.name-steps>li.two:before{position: absolute;content:'';width: 1px;height: 100%;background-color:#5882F7;left:50%;top: 0;-webkit-transform: rotate(17deg);transform: rotate(17deg);}
 		.name-steps>li:last-child{margin-right: 5px;}	
 		.name-steps>li.active{background: #5882f7;}
+		.name-steps>li.two.active{background: #fff;}
+		.name-steps>li.two.active>div{height: 50px;line-height: 50px;width: 50px;display: inline-block;border-radius: 50px;background: #5882f7;color: #fff;}
 		.name-steps>li:after{content:'\e587';position: absolute;right:-30px;top: 0;color: #999; font-family: Muiicons;
     font-size: 20px;
     font-weight: 700;
@@ -206,7 +215,7 @@ article, section, time, aside {display: block;}
     	content: '\e460';color: #f00;
     }
     .no-after:after{display: none;}
-    .textarea{font-size: 14px;}
+    .textarea{font-size: 14px;word-break: break-all;}
     .mui-icon-plusempty{color: #5882f7;border: 0;padding-left: 36px;font-size: 16px !important;}
     .mui-icon-plusempty:before{font-size: 36px;position: absolute;top: 0;left: 0;line-height: 28px;font-weight: bold;}
     .mui-btn.mui-icon-plusempty:enabled:active{background-color: #5882f7;}
@@ -223,6 +232,7 @@ article, section, time, aside {display: block;}
     .pro-list .pro-iteam-list>li:nth-of-type(3):after{content: "产品明细3";}
     .pro-list .pro-iteam-list>li:nth-of-type(4):after{content: "产品明细4";}
     .pro-list .pro-iteam-list>li:nth-of-type(5):after{content: "产品明细5";}
+    .pro-list .pro-iteam-list>li:nth-of-type(6):after{content: "产品明细6";}
     .pro-list .pro-iteam-list>li .mui-input-row:after{display: none;}
 @media (device-height:480px) and (min-width:320px) and (-webkit-min-device-pixel-ratio:2){
 

+ 1 - 1
rst/js/up1.js

@@ -486,7 +486,7 @@ var imgArray=[];//图片src数组
 								console.log(dt)
 								//reqFace = dt.returnMsg.pic;
 								var prm={};
-								prm["contractUrl"]=base_path+dt.returnMsg.imgUrl;
+								prm["contractUrl"]=dt.returnMsg.imgUrl;
 								prm["contractType"]=1;
 								imgArray.push(prm);
 								//$(".info").html($(".info").text()+'<span style="color:#008800;">上传成功!</span>');

+ 1 - 1
rst/js/up2.js

@@ -483,7 +483,7 @@ var imgArray1=[];//图片src数组
 								console.log(dt)
 								//reqFace = dt.returnMsg.pic;
 								var prm={};
-								prm["contractUrl"]=base_path+dt.returnMsg.imgUrl;
+								prm["contractUrl"]=dt.returnMsg.imgUrl;
 								prm["contractType"]=2;
 								imgArray1.push(prm);
 								//$(".info").html($(".info").text()+'<span style="color:#008800;">上传成功!</span>');

文件差异内容过多而无法显示
+ 633 - 0
rst/order_delivery.html


文件差异内容过多而无法显示
+ 378 - 89
rst/pro_order_details.html


文件差异内容过多而无法显示
+ 0 - 121
rst/pro_order_list.html


文件差异内容过多而无法显示
+ 17 - 5
rst/pro_order_list_index.html


文件差异内容过多而无法显示
+ 0 - 108
rst/pro_storage_order_list.html


文件差异内容过多而无法显示
+ 331 - 132
rst/submit_apply_order.html