Merge branch 'dev-mysql' into erp_batchToGoods_20180117

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -2095,6 +2095,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			var idStr = ($scope.choosedIds != null) ? $scope.choosedIds.join(',') : null;
 			var std = $scope.standard_tab == 'standard' ? 1 : 0;
 			Material.batchPutOn({'standard' : std, ids : idStr}, null, function (data) {
+				loadData();
 				toaster.pop('success', '成功', data.message);
 			}, function (response) {
 				toaster.pop('error', '失败', response.data);

src/main/webapp/resources/view/vendor/modal/updateUserEmail.html

@@ -32,11 +32,11 @@
         border-radius: 0;
     }
     .userEmail .modal-body .row.validate-code .col-md-8 .input-sm {
-        width: 162px;
+        width: 63%;
         display: inline-block;
     }
     .userEmail .modal-body .row.validate-code .col-md-8 .code-btn {
-        width: 94px;
+        width: 37%;
         height: 30px;
         text-align: center;
         line-height: 30px;

src/main/webapp/resources/view/vendor/modal/updateUserTel.html

@@ -32,11 +32,11 @@
         border-radius: 0;
     }
     .userTel .modal-body .row.validate-code .col-md-8 .input-sm {
-        width: 162px;
+        width: 63%;
         display: inline-block;
     }
     .userTel .modal-body .row.validate-code .col-md-8 .code-btn {
-        width: 94px;
+        width: 37%;
         height: 30px;
         text-align: center;
         line-height: 30px;