Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-prescription

consulting-list.html

@@ -35,7 +35,7 @@
                </li>
            </ul>
        </div>
        <form role="form" class="form-inline ptb10">
        <form role="form" class="form-inline ptb10" onsubmit="return false;">
            <div class="form-group">
                <label for="">记录搜索</label>
                <input type="text" class="form-control input-sm" id="searchName" placeholder="可按申请居民搜索">

prescription-detail.html

@@ -114,13 +114,13 @@
	        	<table class="c-wp100 c-999">
	            	<tr>
	            		<td>续方状态：<span class="c-333">{{ prescription.status | setStatus}}</span></td>
	            		<td>失败时间：<span class="c-333">{{prescription.failTime || ''}}</span></td>
	            		<td>失败时间：<span class="c-333">{{prescription.prescribeTime || ''}}</span></td>
	            	</tr>
	            	<tr>
	            		<td colspan="2">续方说明：<span class="c-333">{{prescription.reason}}</span></td>
	            	</tr>
	            	<tr>
	            		<td colspan="2">失败原因：<span class="c-333">{{prescription.failReason}}</span></td>
	            		<td colspan="2">失败原因：<span class="c-333">{{prescription.prescribeReason}}</span></td>
	            	</tr>
	            </table>
	        	{{else}}