代销变价新增学生价

dongjunjie
Commit 6ffbde4cc7cd5d4ef26816d03a59cf12af4251fa 1 parent fe1464d8
Showing 3 changed files with 55 additions and 29 deletions
code/apps/goods/interfaces/price.js
code/apps/goods/views/price/PriceChange.html
code/static/js.jquery/module/goods/price/PriceChange.js
--- a/code/apps/goods/interfaces/price.js
View file @6ffbde4
+++ b/code/apps/goods/interfaces/price.js
View file @6ffbde4
@@ -27,9 +27,9 @@ module.exports={
 				{name: 'param', type: 'Number'}
 			]
 		},
-    	updatePrice:{
+		updateProductPrice:{
 			title:'单个变价接口',
-    		url: '/product/getProductPrice',
+			url: '/product/updateProductPrice',
 			params: [
 				{name: 'product_skn', type: 'number'},
 				{name: 'sales_price', type: 'number'},
@@ -38,7 +38,10 @@ module.exports={
 				{name: 'vip_price', type: 'number'},
 				{name: 'vip1_price', type: 'number'},
 				{name: 'vip2_price', type: 'number'},
-	            {name: 'vip3_price', type: 'number'}
+				{name: 'vip3_price', type: 'number'},
+				{name: 'student_price', type: 'number'},
+				{name: 'cgpriceStartTime', type: 'String'},
+				{name: 'cgpriceEndTime', type: 'String'}
 			]
 		},
 		queryProductPriceListBySkn:{
@@ -64,22 +67,6 @@ module.exports={
 				{name: 'cgpriceEndTime', type: 'String'}
 			]
 		},
-		updateProductPrice:{
-    		title:'单个变价接口',
-			url: '/product/updateProductPrice',
-	        params: [
-				{name: 'product_skn', type: 'number'},
-				{name: 'sales_price', type: 'number'},
-				{name: 'vip_discount_type', type: 'number'},
-				{name: 'return_coin', type: 'number'},
-				{name: 'vip_price', type: 'number'},
-				{name: 'vip1_price', type: 'number'},
-				{name: 'vip2_price', type: 'number'},
-				{name: 'vip3_price', type: 'number'},
-				{name: 'cgpriceStartTime', type: 'String'},
-				{name: 'cgpriceEndTime', type: 'String'}
-	        ]
-    	},
 		queryBrandCooperationList:{
 			title:'品牌合作模式设置列表数据',
 			url: '/brandCooperation/queryBrandCooperationList',
--- a/code/apps/goods/views/price/PriceChange.html
View file @6ffbde4
+++ b/code/apps/goods/views/price/PriceChange.html
View file @6ffbde4
@@ -95,7 +95,7 @@
                     <td width="120px"><b>说明：</b></td>
                     <td>
                         1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
-                        2、Excel表头为：<span style="color: #67D267;">SKN、吊牌价、销售价、VIP折扣类型、VIP价、白金价、金卡价、银卡价</span><br>
+                        2、Excel表头为：<span style="color: #67D267;">SKN、吊牌价、销售价、学生价、VIP折扣类型、VIP价、白金价、金卡价、银卡价</span><br>
                         3、第一行为表头内容，第二行开始为正式内容<br>
                         4、每个文件控制在2500行以内<br>
                         5、<a href="/ajax/link/batchUpdatePrice" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
@@ -145,10 +145,8 @@
             <tr>
                 <th style="border-top: 0; border-left: 0">销售价</th>
                 <th style="border-top: 0">VIP折扣类型</th>
-                <th style="border-top: 0">VIP价</th>
-                <th style="border-top: 0">白金价</th>
-                <th style="border-top: 0">金卡价</th>
-                <th style="border-top: 0">银卡价</th>
+                <th style="border-top: 0">会员价</th>
+                <th style="border-top: 0">学生价</th>
                 <th style="border-top: 0">价格生效时间</th>
                 <th style="border-top: 0">进货价</th>
                 <th style="border-top: 0">进货折扣</th>
@@ -169,16 +167,33 @@
                     </select>
                 </td>
                 <td style="border-bottom: 0">
+                    <div class="form-inline" style="margin-bottom: 5px">
+                        <div class="form-group">
+                            <label style="width: 60px; text-align: right">VIP价：</label>
                             <input class="vip-price form-control" type="text" value="{vip_price}" onkeyup="this.value=this.value.replace(/\D/gi,'')">
-                </td>
-                <td style="border-bottom: 0">
+                        </div>
+                    </div>
+                    <div class="form-inline" style="margin-bottom: 5px">
+                        <div class="form-group">
+                            <label style="width: 60px; text-align: right">白金价：</label>
                             <input class="vip3-price form-control" type="text" value="{vip3_price}" disabled>
-                </td>
-                <td style="border-bottom: 0">
+                        </div>
+                    </div>
+                    <div class="form-inline" style="margin-bottom: 5px">
+                        <div class="form-group">
+                            <label style="width: 60px; text-align: right">金卡价：</label>
                             <input class="vip2-price form-control" type="text" value="{vip2_price}" disabled>
+                        </div>
+                    </div>
+                    <div class="form-inline">
+                        <div class="form-group">
+                            <label style="width: 60px; text-align: right">银卡价：</label>
+                            <input class="vip1-price form-control" type="text" value="{vip1_price}" disabled>
+                        </div>
+                    </div>
                 </td>
                 <td style="border-bottom: 0">
-                    <input class="vip1-price form-control" type="text" value="{vip1_price}" disabled>
+                    <input class="student_price form-control" type="text" value="{student_price}" onkeyup="this.value=this.value.replace(/\D/gi,'')">
                 </td>
                 <td class="form-inline" style="border-bottom: 0">
                     <input id="start_{product_skn}" jsaction="date:end:end_{product_skn}" class="startDate form-control" type="text" value="{cgpriceStartTime}" placeholder="开始日期" style='background-color:#fff'>
@@ -227,6 +242,7 @@
             <tr>
                 <th>吊牌价</th>
                 <th>销售价</th>
+                <th>学生价</th>
                 <th>价格生效-<font color="green">开始时间</font></th>
                 <th>价格生效-<font color="red">结束时间</font></th>
                 <th>变价时间</th>
@@ -240,6 +256,7 @@
             <tr>
                 <td>[[item.retailPrice]]</td>
                 <td>[[item.salesPrice]]</td>
+                <td>[[item.studentPrice]]</td>
                 <td>[[item.effectiveTime]]</td>
                 <td>[[item.changePriceEndTime]]</td>
                 <td>[[item.createTime]]</td>
--- a/code/static/js.jquery/module/goods/price/PriceChange.js
View file @6ffbde4
+++ b/code/static/js.jquery/module/goods/price/PriceChange.js
View file @6ffbde4
@@ -96,6 +96,7 @@ var g = new common.grid({
         }},
         {display: '吊牌价', name: 'retail_price'},
         {display: '销售价', name: 'sales_price'},
+        {display: '学生价', name: 'student_price'},
         {display: 'VIP折扣类型', render: function(item) {
             return ENUM.vipType[item.vip_discount_type];
         }},
@@ -173,6 +174,7 @@ $(document).on('click', '.modify-btn', function() {
                 $vip3Price = $wrap.find('.vip3-price'),
                 $vip2Price = $wrap.find('.vip2-price'),
                 $vip1Price = $wrap.find('.vip1-price'),
+                $student_price = $wrap.find('.student_price'),
                 $startDate = $wrap.find('.startDate'),
                 $endDate = $wrap.find('.endDate'),
                 $submitBtn = $wrap.find('.sure-modify');
@@ -200,6 +202,7 @@ $(document).on('click', '.modify-btn', function() {
                             vip1_price: $vip1Price.val(),
                             vip2_price: $vip2Price.val(),
                             vip3_price: $vip3Price.val(),
+                            student_price: $student_price.val(),
                             cgpriceStartTime:$startDate.val(),
                             cgpriceEndTime:$endDate.val()
                         }
@@ -319,6 +322,25 @@ var p = new common.grid({
             }
             return newPriceHtml + '<div style="color: #999;">' + item.oldProductPriceBo.sales_price + '</div>';
         }},
+        {display: '学生价', render: function(item) {
+            var newPrice = item.newProductPriceBo,
+                newPriceHtml = '';
+            if (newPrice.student_price) {
+                if (newPrice.student_price < (newPrice.retail_price / 2)) {
+                    newPriceHtml = '<p style="color: red">' + newPrice.student_price + '</p>';
+                }else{
+                    newPriceHtml = '<p>'+newPrice.student_price+'</p>';
+                }
+            } else {
+                newPriceHtml = '<p>-</p>'
+            }
+            if(item.oldProductPriceBo.student_price){
+                newPriceHtml += '<div style="color: #999;">' + item.oldProductPriceBo.student_price + '</div>';
+            }else{
+                newPriceHtml += '<div>-</div>';
+            }
+            return newPriceHtml;
+        }},
         {display: 'VIP折扣类型', render: function(item) {
             return '<p>'+ENUM.vipType[item.newProductPriceBo.vip_discount_type] + '</p>'+
                 '<div style="color: #999;">' + ENUM.vipType[item.oldProductPriceBo.vip_discount_type] + '</div>';