Merge remote-tracking branch 'origin/dev' into authority

src/main/webapp/resources/tpl/index/sale/sample_send.html

@@ -184,7 +184,7 @@
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button class="btn btn-primary" type="submit" ng-disabled="!sampleSendForm.$dirty && sampleSendForm.$invalid" ng-click="setOrdersRead(sampleItem.id)">确认送样</button>
+		<button class="btn btn-primary" type="submit" ng-disabled="!sampleSendForm.$dirty || sampleSendForm.$invalid" ng-click="setOrdersRead(sampleItem.id)">确认送样</button>
 		<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
 	</div>
 </form>