浏览代码

pref: 处理员工管理增加输入限制和产品导入优化

wangcz 7 年之前
父节点
当前提交
e456643a6a

+ 6 - 6
src/main/webapp/resources/view/admin/stats_data.html

@@ -210,12 +210,12 @@
 							<span ng-bind="start27 | number"></span>
 						</span>
                     </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">手机UU用户数:</span>
-                        <span class="col-sm-6">
-							<span ng-bind="start31 | number"></span>
-						</span>
-                    </div>
+                    <!--<div class="form-group row">-->
+                        <!--<span class="col-sm-6 text-right">手机UU用户数:</span>-->
+                        <!--<span class="col-sm-6">-->
+							<!--<span ng-bind="start31 | number"></span>-->
+						<!--</span>-->
+                    <!--</div>-->
                 </div>
                 <div class="col-sm-4 f14">
                     <div class="form-group row title">

+ 2 - 0
src/main/webapp/resources/view/sso/staffManagement.html

@@ -968,6 +968,7 @@
                                    ng-class="{'has-error': userNameError, 'has-success': userNameSuccess}"
                                    ng-blur="nameValid(newUser.userName)"
                                    ng-model="newUser.userName"
+                                   maxlength="20"
                                    placeholder="用户名">
                         </td>
                         <!--<td>-->
@@ -991,6 +992,7 @@
                                    ng-change="emailValidChange(newUser.userEmail)"
                                    autocomplete="off"
                                    name="newUserEmail" type="text"
+                                   maxlength="50"
                                    placeholder="邮箱">
 
                         </td>

+ 3 - 1
src/main/webapp/resources/view/usercenter/forstore/product_upload.html

@@ -732,7 +732,9 @@
                             <i ng-click="setPersonMedol()"></i>
                         </div>
                         <p><img src="static/img/product/check.png" alt="">上传产品成功!</p>
-                        <div class="result">成功上传<span ng-bind="result.success + result.failure">600</span>个产品(其中标准产品<span ng-bind="result.success">200</span>个,非标产品<span ng-bind="result.failure">300</span>个),下载<a ng-click="downloadExcel()">上传失败产品</a></div>
+                        <div class="result">成功上传<span ng-bind="result.success + result.failure">600</span>个产品
+                            <!--(其中标准产品<span ng-bind="result.success">200</span>个,非标产品<span ng-bind="result.failure">300</span>个)-->
+                            ,下载<a ng-click="downloadExcel()">上传失败产品</a></div>
                         <div class="operate">
                             <span ng-click="setPersonMedol()">留在当前页</span>
                             前往 <a ui-sref="vendor_material_person">我的产品库 <i class="fa fa-long-arrow-right"></i></a>

+ 9 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -632,7 +632,11 @@
                                 </span>
                             </div>-->
                         </div>
-                        <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品(其中标准产品 <span ng-bind="result.success">200</span> 个,非标产品 <span ng-bind="result.failure">400</span> 个)<b class="success-hidden" ng-if="result.filter != 0">,下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
+                        <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">
+                            成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品
+                            <!--(其中标准产品 <span ng-bind="result.success">200</span> 个,非标产品 <span ng-bind="result.failure">400</span> 个)-->
+                            <b class="success-hidden" ng-if="result.filter != 0">,下载 <a ng-click="downloadExcel()">导入失败产品</a></b>
+                        </div>
                         <div ng-show="$$productOn.tab == 'bathOn' && isPcbStore">
                             <table ng-table="relTableParams" class="public-tab table">
                                 <thead>
@@ -754,7 +758,10 @@
                             <i ng-click="setPersonMedol()"></i>
                         </div>
                         <p><img src="static/img/product/check.png" alt="">上传产品成功!</p>
-                        <div class="result">成功上传<span ng-bind="result.success + result.failure">600</span>个产品(其中标准产品<span ng-bind="result.success">200</span>个,非标产品<span ng-bind="result.failure">300</span>个),下载<a ng-click="downloadExcel()">上传失败产品</a></div>
+                        <div class="result">成功上传<span ng-bind="result.success + result.failure">600</span>个产品
+                            <!--(其中标准产品<span ng-bind="result.success">200</span>个,非标产品<span ng-bind="result.failure">300</span>个)-->
+                            ,下载<a ng-click="downloadExcel()">上传失败产品</a>
+                        </div>
                         <div class="operate">
                             <span ng-click="setPersonMedol()">留在当前页</span>
                             前往 <a ui-sref="vendor_material_person">我的产品库 <i class="fa fa-long-arrow-right"></i></a>