注释权限

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

@@ -227,10 +227,10 @@ define(['app/app'], function (app) {
          */
         $scope.checkWeixin = function () {
             var enWeixin = angular.element('.enWeixin').val();
-            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
-                toaster.pop('error', '请输入正确的微信号');
-                return false;
-            }
+            // if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+            //     toaster.pop('error', '请输入正确的微信号');
+            //     return false;
+            // }
 
         }
 
@@ -284,10 +284,10 @@ define(['app/app'], function (app) {
                 return false;
             }
 
-            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
-                toaster.pop('error', '请输入正确的微信号');
-                return false;
-            }
+            // if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+            //     toaster.pop('error', '请输入正确的微信号');
+            //     return false;
+            // }
             if (!/^[1-9][0-9]{4,10}$/.test(enQQ) && enQQ) {
                 toaster.pop('error', '请输入正确的QQ号');
                 return false;

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -654,7 +654,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="型号/品牌/类目" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -691,7 +691,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="型号/品牌/类目" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1100,7 +1100,7 @@
 	.edit-contents td .bg{
 		background: #fff;
 		width: 100%;
-		height: 100px;
+		height: 132px;
 	}
 	.edit-contents .content{
 		text-align: left;
@@ -1122,7 +1122,7 @@
 	}
 	.edit-contents .content .title span:first-child {
 		float: left;
-		width: 70px;
+		width: 78px;
 		text-align: right;
 	}
 	.edit-contents .content .title span:last-child {
@@ -1999,7 +1999,7 @@
 							</label>
 						</th>
 						<th width="50">序号</th>
-						<th width="140">产品名称(类目)</th>
+						<th width="140">类目(产品名称)</th>
 						<th width="170">产品型号</th>
 						<th width="120">品牌</th>
 						<th width="100">单位</th>
@@ -2135,12 +2135,15 @@
                                                                                                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">
-                                                            <span class="tit">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
+                                                            <span class="tit">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍"  placeholder="数量"
                                                                                                 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
                                                         </div>
                                                         <div class="input-list">
-										                    <span class="tit">包装数量：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="包装数量" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+										                    <span class="tit">最小包装数：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
                                                         </div>
+																											<div class="input-list">
+																												<span class="tit">规格：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+																											</div>
                                                     </div>
                                                     <div class="content">
                                                         <p class="title height24">梯度/pcs</p>
@@ -2238,8 +2241,9 @@
 													</div>
 													<div class="content width130">
 														<p class="title"><span>库存：</span><span ng-bind="goods.reserve">9023492</span></p>
-														<p class="title"><span>起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
-														<p class="title"><span>包装数量：</span><span ng-bind="goods.minPackQty">980</span></p>
+														<p class="title"><span>最小起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
+														<p class="title"><span>最小包装数：</span><span ng-bind="goods.minPackQty">980</span></p>
+														<p class="title"><span>规格：</span><span ng-bind="goods.minPackQty">980</span></p>
 													</div>
 													<div class="content width150">
 														<div class="title-price">
@@ -2332,14 +2336,14 @@
 																							   ng-class="{'error' : goods.editReserveInvalid}"/>
 														</div>
 														<div class="input-list">
-															<span class="tit">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty"
+															<span class="tit">最小起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty"
 																								maxlength="6"
 																								oninput="if(value.length>6)value=value.slice(0,6)"
 																								title="起订"  placeholder="数量" ng-model="goods.editMinBuyQty" ng-change="updateStartNumber(goods)"
 																								ng-blur="setPriceMinAmount(goods, true)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
 														</div>
 														<div class="input-list">
-															<span class="tit">包装数量：</span><input type="number" class="width70 form-control" name="minPackQty" title="包装数量"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
+															<span class="tit">最小包装数：</span><input type="number" class="width70 form-control" name="minPackQty" title="最小包装数"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
 																								 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"
 																								 ng-class="{'error' : goods.editMinPackQtyInValid}"
 																								 style="width: 70px;"/>
@@ -2531,7 +2535,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">产品名称(类目)</th>
+							<th width="120">类目(产品名称)</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<!--<th width="100">封装</th>-->
@@ -2703,14 +2707,14 @@
 							<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">起订量：<span ng-bind="goods.minBuyQty">90492</span></div>
+								<div class="detail-title">最小起订量：<span ng-bind="goods.minBuyQty">90492</span></div>
 							</div>
 							<div class="detail distance">
 								<div class="detail-title">交期(天)：
 									<span ng-if="goods.maxDelivery == goods.minDelivery">{{goods.minDelivery}}</span>
 									<span ng-if="goods.maxDelivery != goods.minDelivery">{{goods.minDelivery}}-{{goods.maxDelivery}}</span>
 								</div>
-								<div class="detail-title">包装数量：<span ng-bind="goods.minPackQty">980</span></div>
+								<div class="detail-title">最小包装数：<span ng-bind="goods.minPackQty">980</span></div>
 								<div class="detail-title">生产日期：<span ng-bind="goods.produceDate">20160123</span></div>
 							</div>
 							<div class="detail">

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1858,8 +1858,8 @@
 					<thead>
 					<tr>
 						<th width="80">序号</th>
-						<th width="180">产品名称(类目)</th>
-						<th width="200">产品型号</th>
+						<th width="180">类目(产品名称)</th>
+						<th width="200">型号</th>
 						<th width="150">品牌</th>
 						<!--<th width="100">单位</th>-->
 						<th width="80">规格</th>
@@ -2381,7 +2381,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">产品名称(类目)</th>
+							<th width="120">类目(产品名称)</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<th width="100">封装</th>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -665,7 +665,7 @@
     }
     .wanted_list01 .tab table tr.edit-forms td .bg-show{
         width: 100%;
-        height: 96px;
+        height: 124px;
         background: #fff;
         overflow: hidden;
     }
@@ -698,7 +698,7 @@
         margin-top: 10px;
     }
     .wanted_list01 .tab table tr.edit-forms td .bg-show .width120{
-        width: 120px;
+        width: 110px;
     }
     .wanted_list01 .tab table tr.edit-forms td .bg-show .width130{
         width: 145px;
@@ -707,7 +707,7 @@
         width: 110px;
     }
     .wanted_list01 .tab table tr.edit-forms td .bg-show .width130 div span:first-child{
-        width: 57px;
+        width: 73px;
         text-align: right;
     }
     .wanted_list01 .tab table tr.edit-forms td .bg-show .width100{
@@ -739,7 +739,7 @@
         width: 92px;
     }
     .edit-form td div span.marginL10{
-        margin-left: 30px;
+        margin-left: 18px;
     }
     .edit-form td div span.marginL5{
         margin-left: 5px;
@@ -1030,7 +1030,7 @@
                             </label>
                         </th>
                         <th width="220">产品信息</th>
-                        <th width="115">包装/生产日期</th>
+                        <th width="105">包装/生产日期</th>
                         <th width="140">库存</th>
                         <th width="105">梯度/pcs</th>
                         <th ng-if="onsale.currency == 'USD'" width="116">单价<b style="font-size: 12px;font-weight: 600">($)</b></th>
@@ -1045,7 +1045,7 @@
                                 <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" title="寄售">寄售</a>
                             </div>
                         </th>
-                        <th width="60" class="padding0">操作</th>
+                        <th width="70" class="padding0">操作</th>
                     </tr>
                     </thead>
                     <tbody class="bottom-no">
@@ -1085,8 +1085,8 @@
                                 </div>
                             </div>
                             <div class="fr wid135">
-                                <p ng-if="!commodity.uuid">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="!commodity.uuid">类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
                                 <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
                                 <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
                                 <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
@@ -1109,11 +1109,15 @@
                                 <span ng-bind="commodity.reserve" title="{{commodity.reserve}}"></span>
                             </div>
                             <div class="margin0">
-                                <span class="marginL10">起订量: </span>
+                                <span class="marginL10">最小起订量: </span>
                                 <span ng-bind="commodity.minBuyQty" title="{{commodity.minBuyQty}}"></span>
                             </div>
                             <div class="margin0">
-                                <span class="marginL10">包装数量: </span>
+                                <span class="marginL10">最小包装数: </span>
+                                <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45"></span>
+                            </div>
+                            <div class="margin0">
+                                <span class="marginL10">规格: </span>
                                 <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45"></span>
                             </div>
                         </td>
@@ -1184,7 +1188,7 @@
                                         </div>
                                     </div>
                                     <div class="fr wid135">
-                                        <p>类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
+                                        <p>类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
                                         <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>
                                         <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
                                     </div>
@@ -1212,14 +1216,19 @@
                                                      placeholder="数量" maxlength="9" ng-model="commodity.editReserve" class="wid48 form-control"/></span>
                                     </div>
                                     <div>
-                                        <span>起订量: </span>
+                                        <span>最小起订量: </span>
                                         <span><input type="text" ng-change="updateStartNumber(commodity)" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>
                                     </div>
                                     <div>
-                                        <span>包装数量: </span>
+                                        <span>最小包装数: </span>
                                         <span><input type="text" ng-blur="changeMinPackQty(commodity)"
                                                      ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
                                     </div>
+                                    <div>
+                                        <span style="width: 32px;">规格: </span>
+                                        <span><input style="width:90px" type="text" ng-blur="changeMinPackQty(commodity)"
+                                                     ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="20" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
+                                    </div>
                                 </div>
                                 <div class="content-show width135">
                                     <div ng-repeat="price in commodity.editPrices">

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -750,7 +750,7 @@
 					<span>微&nbsp;&nbsp;&nbsp;&nbsp;信</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-pattern="/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>
+					<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -625,8 +625,9 @@
                                     </td>
                                     <td style="padding-left: 10px;">
                                         <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
-                                        <div class="text-more">类目：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
+                                        <div class="text-more">类目(产品名称)：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
                                         <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
+                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
                                     </td>
                                     <td>
                                         <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->