商品导出

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -202,14 +202,14 @@
                     <i-button type="warning" @click="changeItemStatus(2)"><i class="fa fa-arrow-down"></i>&nbsp;下架
                     </i-button>
                     #end
-                    <!-- #if($shiro.hasPermission("tbcfstationitem:import"))
-                     <i-button type="primary" @click="import"><i class="fa fa-chevron-up"></i>&nbsp;导入
-                     </i-button>
-                     #end
-                     #if($shiro.hasPermission("tbcfstationitem:export"))
-                     <i-button type="info" @click="export"><i class="fa fa-chevron-down"></i>&nbsp;导出
-                     </i-button>
-                     #end-->
+                    #if($shiro.hasPermission("tbcfstationitem:import"))
+                    <i-button type="primary" @click="importExcel()"><i class="fa fa-chevron-up"></i>导入
+                    </i-button>
+                    #end
+                    #if($shiro.hasPermission("tbcfstationitem:export"))
+                    <i-button type="info" @click="exportExcel"><i class="fa fa-chevron-down"></i>&nbsp;导出
+                    </i-button>
+                    #end
                     #if($shiro.hasPermission("tbcfstationitem:delete"))
                     <i-button type="error" @click="changeItemStatus(0)"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                     #end

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -3,19 +3,19 @@ $(function () {
         url: '../tbcfstationitem/list',
         colModel: [
             {label: 'itemId', name: 'itemId', index: 'item_id', key: true, hidden: true},
-            {label: '商品图片', name: 'itemImg', index: 'item_img', width: 35, formatter: imageFormat},
+            {label: '商品图片', name: 'itemImg', index: 'item_img', width: 40, formatter: imageFormat},
             {label: '商品编号', name: 'itemCode', index: 'item_code', width: 60},
             {label: '商品名称', name: 'itemName', index: 'item_name', width: 160},
             /* {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},*/
             /*{label: '商品链接', name: 'itemUrl', index: 'item_url', width: 80,formatter:linkFormat},*/
             {label: '商品价格', name: 'itemPrice', index: 'item_price', width: 45},
-            {label: '商品折扣价格', name: 'discountPrice', index: 'discount_price', width: 45},
+            {label: '折扣价格', name: 'discountPrice', index: 'discount_price', width: 45},
             {label: '库存', name: 'itemCount', index: 'item_count', width: 45},
             {label: '点击量', name: 'itemNum', index: 'item_num', width: 45},
             /*{label: '所属平台', name: 'platformCode', index: 'platform_code', width: 80},
             {label: '平台名', name: 'platformName', index: 'platform_name', width: 80},*/
-            {label: '商品一级分类', name: 'goodtype', index: 'goodtype', width: 80},
-            {label: '商品二级分类', name: 'title', index: 'title', width: 80},
+            {label: '一级分类', name: 'goodtype', index: 'goodtype', width: 80},
+            {label: '二级分类', name: 'title', index: 'title', width: 80},
             {label: '商品品名', name: 'dname', index: 'itemDescritionId', width: 80},
             {label: '状态', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: itemStatusFormat},
             {label: '创建日期', name: 'createTime', index: 'create_time', width: 80}
@@ -48,8 +48,8 @@ let vm = new Vue({
 
         alertShow: false,//警告弹窗
         attrItem: [{
-            categoryName: '尺寸',
-            option: ['颜色', '尺寸', '长度'],
+            categoryName: 'Size',
+            option: ['Color', 'Size', 'Length'],
             categoryDesc: ''
         }],//属性设置
         prevItem: [],//组合数组
@@ -235,14 +235,14 @@ let vm = new Vue({
             });
 
         },
-        import: function () {
+        importExcel: function () {
             let itemIds = getSelectedRows("#jqGrid");
             if (itemIds == null) {
                 return;
             }
 
         },
-        export: function () {
+        exportExcel: function () {
             Ajax.request({
                 url: "../tbcfstationitem/exportExcel/",
                 async: false,
@@ -388,7 +388,7 @@ let vm = new Vue({
                 this.$Message.info('最多添加三种属性');
             } else {
                 this.attrItem.push({
-                    categoryName: '颜色',
+                    categoryName: 'Color',
                     option: JSON.parse(localStorage.getItem('option')),
                     categoryDesc: ''
                 })