Merge branch 'master' of linehang/PC-prescription into master

js/util.js

@@ -176,13 +176,18 @@ function getDaysRemaining(item) {
	var minDrugDay = item.minDrugDay,
		presCreateTime = item.presCreateTime,
		curTime = new Date().getTime();
	if(minDrugDay && presCreateTime) {
		var preTime = new Date(presCreateTime.replace(/-/g,'/')).getTime()
		var remain = Math.round(minDrugDay - parseInt(Math.abs(curTime - preTime)/(24 * 3600 * 1000)))
		if(remain < 0) {
			return '<span style="color: #ff3b30;">已用完</span>'
	if(item.status == 0 || item.status == 2 || item.status == 3 || item.status == 4 || item.status == 10 || item.status == 31) {
		if(minDrugDay && presCreateTime) {
			var preTime = new Date(presCreateTime.replace(/-/g,'/')).getTime();
			var remain = Math.round(minDrugDay - parseInt(Math.abs(curTime - preTime)/(24 * 3600 * 1000)));
			if(remain <= 0){
				return '<span style="color: #ff3b30;">已用完</span>';
			} else {
				return remain;
			}
		} else {
			return '<span style="color: #ff3b30;">-</span>';
		}
		return remain
	} else {
		return '<span style="color: #ff3b30;">-</span>';
	}