变价管理中变价记录和变价计划分开

@@ -365,8 +365,8 @@
             </tr>
             </thead>
             <tbody>
-            [[if list.length > 0]]
-            [[each list as item index]]
+            [[if logList.length > 0]]
+            [[each logList as item index]]
             <tr>
                 <td>[[item.retailPrice]]</td>
                 <td>[[item.salesPrice]]</td>
@@ -396,6 +396,54 @@
             </tbody>
         </table>
     </div>
+
+<h2 style="color: #999; font-family: 'Microsoft YaHei'; font-size: 14px;">—— 变价计划表 ——</h2>
+    <div class="historyList">
+        <table class="table table-striped table-bordered">
+            <thead>
+            <tr>
+                <th>吊牌价</th>
+                <th>销售价</th>
+                <th>价格生效-<font color="green">开始时间</font></th>
+                <th>价格生效-<font color="red">结束时间</font></th>
+                <th>状态</th>
+                <th>变价申请时间</th>
+                <th>变价人</th>
+                <th>操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            [[if planList.length > 0]]
+            [[each planList as item index]]
+            <tr>
+                <td>[[item.retailPrice]]</td>
+                <td>[[item.salesPrice]]</td>
+                <td>[[item.effectiveTime]]</td>
+                <td>[[item.changePriceEndTime]]</td>
+                <td>
+                    [[if item.checkState == '101' ]] 待一审 [[/if]]
+                    [[if item.checkState == '102' ]] 待二审 [[/if]]
+                    [[if item.checkState == '103' ]] 待三审 [[/if]]
+                    [[if item.checkState == '200' ]] 待生效 [[/if]]
+                    [[if item.checkState == '201' ]] 生效 [[/if]]
+                    [[if item.checkState == '202' ]] 已失效 [[/if]]
+                    [[if item.checkState == '300' ]] 驳回 [[/if]]
+                </td>
+                <td>[[item.createTime]]</td>
+                <td>[[item.founderName]]</td>
+                <td>
+                    [[if item.flag && item.flag == 1]]
+                    <a data-planid="[[item.planId]]" data-skn="[[productSkn]]" href="javascript:;" class="btn btn-danger btn-xs deleteHistory">删除</a>
+                    [[/if]]
+                </td>
+            </tr>
+            [[/each]]
+            [[else]]
+            <tr><td colspan="9">没有变价计划！</td></tr>
+            [[/if]]
+            </tbody>
+        </table>
+    </div>
 </script>
 
 <script type="text/template" id="template3">

@@ -477,7 +477,7 @@ var g = new common.grid({
                 else html += '</p>';
             return html;
         }},
-        {display: '当前售价', render: function(item) {
+        {display: '正常售价', render: function(item) {
             var html = '<p>吊牌价:'+item.retail_price +'</p>';
                 html += '<p>销售价:'+item.sales_price +'</p>';
                 if (item.student_price) {html += '<p>学生价:'+item.student_price +'</p>';}