优化运费模板

platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntity.java

@@ -89,7 +89,7 @@ public class TbCfStationItemEntity implements Serializable {
     /**
      * 国家
      */
-    private String country;
+    private String template;
     /**
      * sku图片集合
      */
@@ -487,11 +487,11 @@ public class TbCfStationItemEntity implements Serializable {
         return creator;
     }
 
-    public String getCountry() {
-        return country;
+    public String getTemplate() {
+        return template;
     }
 
-    public void setCountry(String country) {
-        this.country = country;
+    public void setTemplate(String template) {
+        this.template = template;
     }
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfStationItemServiceImpl.java

@@ -123,7 +123,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
         tbCfStationItem.setItemNum(0L);
         tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
         tbCfStationItem.setSupplier(itemSkus.getSupplier());
-        tbCfStationItem.setCountry(itemSkus.getCountry());
+        tbCfStationItem.setTemplate(itemSkus.getTemplate());
         tbCfStationItem.setItemPrice(itemSkus.getItemPrice());
         tbCfStationItem.setDiscountPrice(itemSkus.getDiscountPrice());
         tbCfStationItem.setCostPrice(itemSkus.getCostPrice());
@@ -265,7 +265,7 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
             tbCfStationItem.setCostPrice(itemSkus.getCostPrice());
             tbCfStationItem.setItemUrl(itemSkus.getItemUrl());
             tbCfStationItem.setSupplier(itemSkus.getSupplier());
-            tbCfStationItem.setCountry(itemSkus.getCountry());
+            tbCfStationItem.setTemplate(itemSkus.getTemplate());
             tbCfStationItem.setItemBrief(itemSkus.getItemBrief());
             tbCfStationItem.setItemName(itemSkus.getItemName());
             tbCfStationItem.setItemCode(itemSkus.getItemCode());

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -22,7 +22,7 @@
         <result property="itemSku" column="item_sku"/>
         <result property="itemTop" column="item_top"/>
         <result property="supplier" column="supplier"/>
-        <result property="country" column="country"/>
+        <result property="template" column="template"/>
         <result property="skuImgs" column="sku_imgs"/>
         <result property="platformCode" column="platform_code"/>
         <result property="platformName" column="platform_name"/>
@@ -52,7 +52,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
-			 country,
+			 template,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -84,7 +84,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
-			 country,
+			 template,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -133,7 +133,7 @@
         i.item_descrition_id,
         i.item_top,
         i.supplier,
-        i.country,
+        i.template,
         i.sku_imgs,
         i.creator,
         d.descripition_name dname,
@@ -250,7 +250,7 @@
 			`item_sku`,
 			`item_top`,
 			`supplier`,
-			country,
+			template,
 			`sku_imgs`,
 			`platform_code`,
 			`platform_name`,
@@ -278,7 +278,7 @@
 			#{itemSku},
 			#{itemTop},
 			#{supplier},
-			#{country},
+			#{template},
 			#{skuImgs},
 			#{platformCode},
 			#{platformName},
@@ -309,7 +309,7 @@
             <if test="itemSku != null">`item_sku` = #{itemSku},</if>
             <if test="itemTop != null">`item_top` = #{itemTop},</if>
             <if test="supplier != null">`supplier` = #{supplier},</if>
-            <if test="country != null">`country` = #{country},</if>
+            <if test="template != null">`template` = #{template},</if>
             <if test="skuImgs != null">`sku_imgs` = #{skuImgs},</if>
             <if test="platformCode != null">`platform_code` = #{platformCode},</if>
             <if test="platformName != null">`platform_name` = #{platformName},</if>

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

@@ -665,10 +665,10 @@
             <Form-item label="供应商" prop="supplier" style="width: 800px">
                 <i-input v-model="tbCfStationItem.supplier" placeholder="供应商"/>
             </Form-item>
-            <Form-item label="国家" prop="country" style="width: 800px">
-                <i-select label="请选择" v-model="tbCfStationItem.country">
-                    <i-option v-for="c in countryList" :key='c.id'
-                              :value="c.id">{{c.countryName}}
+            <Form-item label="运费模板" prop="country" style="width: 800px">
+                <i-select label="请选择" v-model="tbCfStationItem.template">
+                    <i-option v-for="c in templateList" :key='c.templateId'
+                              :value="c.templateId">{{c.templateTitle}}
                     </i-option>
                 </i-select>
             </Form-item>

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

@@ -47,15 +47,15 @@ $(function () {
             {label: '免邮价格', name: 'postageFreePrice', index: 'postage_free_price', width: 80},
             {label: '创建日期', name: 'createTime', index: 'create_time', width: 80},
             // {label: '最后编辑时间', name: 'updateTime', index: 'update_time', width: 80},
-            {
+           /* {
                 label: '操作', index: 'operate', width: 80, formatter: function (value, grid, rows) {
                     if (rows.isDefault === 1) {
-                        return '<span class="label label-danger pointer" ">默认</span>&nbsp;&nbsp;' +
-                            '<span class="label label-primary pointer" onclick="vm.placedTop(\'' + rows.templateId + '\')">取消默认</span>';
+                        return '<span class="label label-danger pointer" ">已选择</span>&nbsp;&nbsp;' +
+                            '<span class="label label-primary pointer" onclick="vm.placedTop(\'' + rows.templateId + '\')">取消选择</span>';
                     }
-                    return '<span class="label label-info pointer" onclick="vm.placedTop(\'' + rows.templateId + '\')">设置默认</span>&nbsp;&nbsp;';
+                    return '<span class="label label-info pointer" onclick="vm.placedTop(\'' + rows.templateId + '\')">选择</span>&nbsp;&nbsp;';
                 }
-            }]
+            }*/]
     });
 });
 
@@ -66,9 +66,6 @@ let vm = new Vue({
         typeList: [{
             value: 0,
             label: '计件'
-        }, {
-            value: 1,
-            label: '计重'
         }],
         countryList: [],
         showList: true,
@@ -194,9 +191,9 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
     },
-    created(){
+    created() {
         $.get('../country/queryAll', res => {
-            console.log('国家',JSON.parse(res))
+            console.log('国家', JSON.parse(res))
             vm.countryList = JSON.parse(res).list;
         })
     }

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

@@ -28,7 +28,7 @@ $(function () {
 let vm = new Vue({
     el: '#rrapp',
     data: {
-        countryList: [],
+        templateList: [],
         modal: false,
         showList: true,
         title: null,
@@ -998,9 +998,9 @@ let vm = new Vue({
         $.get('../tbcfgoodstype/queryAll', res => {
             this.Goodstype = res.list;
         })
-        $.get('../country/queryAll', res => {
+        $.get('../tbcfexpresstemplate/queryAll', res => {
             console.log('国家',JSON.parse(res))
-            vm.countryList = JSON.parse(res).list;
+            vm.templateList = JSON.parse(res).list;
         })
         $.get('../tbcfstationitem/queryCreator', res => {
             let parse = JSON.parse(res);