Просмотр исходного кода

处理产品管理单位字段去掉,改库存为库存(PCS),处理手机号改手机

wangcz 7 лет назад
Родитель
Сommit
b93bda052b

+ 1 - 1
src/main/webapp/resources/js/common/query/bill.js

@@ -15,7 +15,7 @@ define([ 'ngResource' ], function() {
 				method : 'POST'
 			},
 			getListPersonal : {
-				url : 'trade/bill/list/personal',
+				url : 'trade/bill/list',
 				method : 'GET',
 				isArray : 'true'
 			},

+ 1 - 1
src/main/webapp/resources/view/sso/forstore/ssoCenter.html

@@ -191,7 +191,7 @@
                 <tr>
                     <th>用户名</th>
                     <th>UU账号</th>
-                    <th>手机</th>
+                    <th>手机</th>
                     <th>邮箱</th>
                     <th>操作</th>
                 </tr>

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

@@ -937,7 +937,7 @@
                 </div>
                 <div class="searchUser-group">
                     <span ng-click="onSearch(keyword, filterRole)">搜索</span>
-                    <input type="text" ng-keyup="onKeyUpSearch(keyword, filterRole, $event)" ng-model="keyword" placeholder="输入人员姓名、电话号码、邮箱进行搜索"/>
+                    <input type="text" ng-keyup="onKeyUpSearch(keyword, filterRole, $event)" ng-model="keyword" placeholder="输入人员姓名/手机/邮箱进行搜索"/>
                     <div>
                         <select ng-model="filterRole" ng-change="onSearch(keyword,filterRole)">
                             <option value="all" selected="selected">全部角色</option>
@@ -961,7 +961,7 @@
                         <!--<th width="143">UU账号</th>-->
                         <th width="101">姓名</th>
                         <th width="67">性别</th>
-                        <th width="133">手机</th>
+                        <th width="133">手机</th>
                         <th width="207">邮箱</th>
                         <th width="376">角色</th>
                         <th width="107">操作</th>
@@ -1065,7 +1065,7 @@
                 <tr>
                     <th>用户名</th>
                     <!--<th>UU账号</th>-->
-                    <th>手机</th>
+                    <th>手机</th>
                     <th>邮箱</th>
                     <th>操作</th>
                 </tr>

+ 10 - 10
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2047,12 +2047,12 @@
 								<span>全选</span>
 							</label>
 						</th>
-						<th width="120">品牌</th>
-						<th width="130">物料名称</th>
-						<th width="150">型号</th>
-						<th width="100">规格</th>
+						<th width="140">品牌</th>
+						<th width="140">物料名称</th>
+						<th width="160">型号</th>
+						<th width="120">规格</th>
 						<th width="100">规格书</th>
-						<th width="60">单位</th>
+						<!--<th width="60">单位</th> -->
 						<!--<th width="80">封装</th>-->
 						<th width="280">操作</th>
 					</tr>
@@ -2126,7 +2126,7 @@
 							 -
 							</div>
 						</td>
-						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
+						<!--<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>-->
 						<!--<td>-->
 							<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
 						<!--</td>-->
@@ -2207,7 +2207,7 @@
                                                     <div class="content margin10">
                                                         <!--<p class="title">库存</p>-->
                                                         <div class="input-list">
-                                                            <span class="tit" style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
+                                                            <span class="tit" style="width: 84px">库存(PCS):</span><input type="number" class="wid70 form-control" name="reserve" title="库存(PCS)" placeholder="数量"
                                                                                                ng-model="goods.editReserve" maxlength="9" ng-blur="setPriceMaxAmount(goods, false)" ng-class="{'error' : goods.editReserveInvalid}" oninput="if(value.length>9)value=value.slice(0,9)"/>
                                                         </div>
                                                         <div class="input-list">
@@ -2320,7 +2320,7 @@
 														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
 													</div>
 													<div class="content width130">
-														<p class="title"><span style="width:84px">库存:</span><span ng-bind="goods.reserve">9023492</span></p>
+														<p class="title"><span style="width:84px">库存(PCS):</span><span ng-bind="goods.reserve">9023492</span></p>
 														<p class="title"><span style="width:84px">最小起订量:</span><span ng-bind="goods.minBuyQty">90492</span></p>
 														<p class="title"><span style="width:84px">最小包装数:</span><span ng-bind="goods.minPackQty">980</span></p>
 														<!--<p class="title"><span style="width:84px">规格:</span><span ng-bind="goods.spec || '-'" title="{{goods.spec}}">980</span></p>-->
@@ -2411,7 +2411,7 @@
 													<div class="content margin10">
 														<!--<p class="title">库存</p>-->
 														<div class="input-list">
-															<span class="tit"  style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
+															<span class="tit"  style="width: 84px">库存(PCS):</span><input type="number" class="wid70 form-control" name="reserve" title="库存(PCS)" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
 																							   maxlength="9" oninput="if(value.length>9)value=value.slice(0,9)"
 																							   ng-class="{'error' : goods.editReserveInvalid}"/>
 														</div>
@@ -2796,7 +2796,7 @@
 						<div class="clearfix">
 							<div class="detail">
 								<div class="detail-title">包装:<span ng-bind="goods.packaging">盘装</span></div>
-								<div class="detail-title">库存:<span ng-bind="goods.reserve">9023492</span></div>
+								<div class="detail-title">库存(PCS):<span ng-bind="goods.reserve">9023492</span></div>
 								<div class="detail-title">最小起订量:<span ng-bind="goods.minBuyQty">90492</span></div>
 							</div>
 							<div class="detail distance">