Página inicial Explorar Ajuda
Entrar
zhh
/
kmall-haikong
fork de project/kmall-haikong
1
0
Fork 0
Arquivos
Ver código fonte

Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

 Conflicts:
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesCombinationPriceDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesCouponDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesDiscountDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesFullGiftDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesFullReductionDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesGetOneFreeGoodsDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesPromotionDao.xml
	kmall-admin/src/main/resources/mybatis/mapper/MkDailyActivitiesDao.xml
zcb 4 anos atrás
pai
08dc5f063b 9fad083c90
commit
db67e5b9d0
24 arquivos alterados com 143 adições e 181 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 4 4
      kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java
  2. 5 5
      kmall-admin/src/main/resources/XmlTemplate/StoreGoodsDtoList.xml
  3. 9 12
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html
  4. 3 9
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescoupon.html
  5. 2 8
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html
  6. 3 9
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html
  7. 3 9
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html
  8. 2 8
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html
  9. 3 9
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html
  10. 2 8
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdailyactivities.html
  11. 4 4
      kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html
  12. 0 8
      kmall-admin/src/main/webapp/js/mk/mk2memberbirthday.js
  13. 10 9
      kmall-admin/src/main/webapp/js/mk/mkactivitiescombinationprice.js
  14. 11 8
      kmall-admin/src/main/webapp/js/mk/mkactivitiescoupon.js
  15. 13 11
      kmall-admin/src/main/webapp/js/mk/mkactivitiesdiscount.js
  16. 14 12
      kmall-admin/src/main/webapp/js/mk/mkactivitiesfullgift.js
  17. 14 11
      kmall-admin/src/main/webapp/js/mk/mkactivitiesfullreduction.js
  18. 11 11
      kmall-admin/src/main/webapp/js/mk/mkactivitiesgetonefreegoods.js
  19. 13 11
      kmall-admin/src/main/webapp/js/mk/mkactivitiespromotion.js
  20. 1 2
      kmall-admin/src/main/webapp/js/mk/mkactivityform.js
  21. 13 10
      kmall-admin/src/main/webapp/js/mk/mkdailyactivities.js
  22. 3 3
      kmall-admin/src/main/webapp/js/shop/supplier.js
  23. BIN
      kmall-admin/src/main/webapp/statics/file/activities_get_one_free_goods_yyyy_mm_dd_v1.0.0.xlsx
  24. BIN
      kmall-admin/src/main/webapp/statics/file/store_goods_export_yyyy_mm_dd_v1.0.0.xls

+ 4 - 4
kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java
Ver arquivo 

@@ -117,7 +117,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 
         builder.put("attributeCategory", "一级分类");
 
         builder.put("categoryId", "二级分类");
 
         builder.put("brandId", "品牌");
 
-        builder.put("freightId", "运费模版");
 
+//        builder.put("freightId", "运费模版");
 
 
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
 
         if (Integer.valueOf(r.get("code").toString()) != 0) {
 
@@ -281,7 +281,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 
         builder.put("attributeCategory", "一级分类");
 
         builder.put("categoryId", "二级分类");
 
         builder.put("brandId", "品牌");
 
-        builder.put("freightId", "运费模版");
 
+//        builder.put("freightId", "运费模版");
 
 
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
 
         if (Integer.valueOf(r.get("code").toString()) != 0) {
 
@@ -868,12 +868,12 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 
                 }else{
 
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的品牌输入有误");
 
                 }
 
-                FreightEntity freightEntity = freightDao.queryFreightByFreightNameAndStoreId(storeGoodsDto.getFreightName(), store.getId());
 
+                /*FreightEntity freightEntity = freightDao.queryFreightByFreightNameAndStoreId(storeGoodsDto.getFreightName(), store.getId());
 
                 if (freightEntity != null) {
 
                     storeRelaEntity.setFreightId(freightEntity.getId());
 
                 }else{
 
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的运费模板输入有误");
 
-                }
 
+                }*/
 
                 // 如果底线价大于零售价
 
                 if (new BigDecimal(storeGoodsDto.getBottomLinePrice()).compareTo(new BigDecimal(storeGoodsDto.getRetailPrice())) == 1) {
 
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的底线价不可以大于零售价");

+ 5 - 5
kmall-admin/src/main/resources/XmlTemplate/StoreGoodsDtoList.xml
Ver arquivo 

@@ -11,11 +11,11 @@
 
                 <mapping row="1" col="3">StoreGoodsDto.categoryName</mapping>
 
                 <mapping row="1" col="4">StoreGoodsDto.attributeCategory</mapping>
 
                 <mapping row="1" col="5">StoreGoodsDto.brandName</mapping>
 
-                <mapping row="1" col="6">StoreGoodsDto.freightName</mapping>
 
-                <mapping row="1" col="7">StoreGoodsDto.retailPrice</mapping>
 
-                <mapping row="1" col="8">StoreGoodsDto.marketPrice</mapping>
 
-                <mapping row="1" col="9">StoreGoodsDto.bottomLinePrice</mapping>
 
-                <mapping row="1" col="10">StoreGoodsDto.batchSn</mapping>
 
+<!--                <mapping row="1" col="6">StoreGoodsDto.freightName</mapping>-->
 
+                <mapping row="1" col="6">StoreGoodsDto.retailPrice</mapping>
 
+                <mapping row="1" col="7">StoreGoodsDto.marketPrice</mapping>
 
+                <mapping row="1" col="8">StoreGoodsDto.bottomLinePrice</mapping>
 
+                <mapping row="1" col="9">StoreGoodsDto.batchSn</mapping>
 
             </section>
 
             <loopbreakcondition>
 
                 <rowcheck offset="0">

+ 9 - 12
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html
Ver arquivo 

@@ -6,17 +6,17 @@
 
 </head>
 
 <body>
 
 <div id="rrapp" v-cloak>
 
-	<Card v-show="showList">
 
+    <Card v-show="showList">
 
         <p slot="title">组合价</p>
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -33,13 +33,13 @@
 
                 <i-button type="warning" @click="reloadMkactivities" v-show="!isMkactivitiesShow">返回营销方式页</i-button>
 
             </div>
 
         </Row>
 
-	    <table id="jqGrid"></table>
 
-	    <div id="jqGridPager"></div>
 
+        <table id="jqGrid"></table>
 
+        <div id="jqGridPager"></div>
 
     </Card>
 
 
     <Card v-show="!showList">
 
         <p slot="title">{{title}}</p>
 
-		<i-form ref="formValidate" :model="mkActivitiesCombinationPrice" :rules="ruleValidate" :label-width="80">
 
+        <i-form ref="formValidate" :model="mkActivitiesCombinationPrice" :rules="ruleValidate" :label-width="80">
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesCombinationPrice.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -52,11 +52,8 @@
 
             <Form-item label="组合价" prop="combinedPrice">
 
                 <i-input v-model="mkActivitiesCombinationPrice.combinedPrice" placeholder="组合价"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesCombinationPrice.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item label="截止日期" prop="deadline">
 
-                <i-input v-model="mkActivitiesCombinationPrice.deadline" placeholder="截止日期"/>
 
+                <i-input v-model="mkActivitiesCombinationPrice.deadline" placeholder="截止日期 yyyy-mm-dd"/>
 
             </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
 
@@ -64,9 +61,9 @@
 
                 <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
 
             </Form-item>
 
         </i-form>
 
-	</Card>
 
+    </Card>
 
 </div>
 
 
 <script src="${rc.contextPath}/js/mk/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
 
 </body>
 
-</html>
 
+</html>

+ 3 - 9
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescoupon.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -46,20 +46,14 @@
 
             <Form-item label="适用商品条码" prop="barcode">
 
                 <i-input v-model="mkActivitiesCoupon.barcode" placeholder="适用商品条码"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesCoupon.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="优惠券码" prop="couponSn">
 
                 <i-input v-model="mkActivitiesCoupon.couponSn" placeholder="优惠券码"/>
 
             </Form-item>
 
             <Form-item label="优惠金额" prop="couponPrice">
 
                 <i-input v-model="mkActivitiesCoupon.couponPrice" placeholder="优惠金额"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesCoupon.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item label="截止日期" prop="deadline">
 
-                <i-input v-model="mkActivitiesCoupon.deadline" placeholder="截止日期"/>
 
+                <i-input v-model="mkActivitiesCoupon.deadline" placeholder="截止日期 yyyy-mm-dd"/>
 
             </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

+ 2 - 8
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -46,9 +46,6 @@
 
             <Form-item label="活动价格" prop="activityPrice">
 
                 <i-input v-model="mkActivitiesDiscount.activityPrice" placeholder="活动价格"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesDiscount.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesDiscount.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -64,9 +61,6 @@
 
             <Form-item label="折扣" prop="discount">
 
                 <i-input v-model="mkActivitiesDiscount.discount" placeholder="折扣"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesDiscount.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
 
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

+ 3 - 9
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -43,9 +43,6 @@
 
             <Form-item label="产品中文名" prop="productName">
 
                 <i-input v-model="mkActivitiesFullGift.productName" placeholder="产品中文名"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesFullGift.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesFullGift.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -64,11 +61,8 @@
 
             <Form-item label="赠品条码" prop="giftBarcode">
 
                 <i-input v-model="mkActivitiesFullGift.giftBarcode" placeholder="赠品条码"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesFullGift.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item label="截止日期" prop="deadline">
 
-                <i-input v-model="mkActivitiesFullGift.deadline" placeholder="截止日期"/>
 
+                <i-input v-model="mkActivitiesFullGift.deadline" placeholder="截止日期 yyyy-mm-dd"/>
 
             </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

+ 3 - 9
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -43,9 +43,6 @@
 
             <Form-item label="产品中文名" prop="productName">
 
                 <i-input v-model="mkActivitiesFullReduction.productName" placeholder="产品中文名"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesFullReduction.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesFullReduction.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -64,11 +61,8 @@
 
             <Form-item label="减扣金额" prop="deductionAmount">
 
                 <i-input v-model="mkActivitiesFullReduction.deductionAmount" placeholder="减扣金额"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesFullReduction.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item label="截止日期" prop="deadline">
 
-                <i-input v-model="mkActivitiesFullReduction.deadline" placeholder="截止日期"/>
 
+                <i-input v-model="mkActivitiesFullReduction.deadline" placeholder="截止日期 yyyy-mm-dd"/>
 
             </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

+ 2 - 8
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html
Ver arquivo 

@@ -12,12 +12,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -44,9 +44,6 @@
 
             <Form-item label="产品中文名" prop="productName">
 
                 <i-input v-model="mkActivitiesGetOneFreeGoods.productName" placeholder="产品中文名"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesGetOneFreeGoods.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesGetOneFreeGoods.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -59,9 +56,6 @@
 
             <Form-item label="赠品条码" prop="giftBarcode">
 
                 <i-input v-model="mkActivitiesGetOneFreeGoods.giftBarcode" placeholder="赠品条码"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesGetOneFreeGoods.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
 
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

+ 3 - 9
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -46,9 +46,6 @@
 
             <Form-item label="活动价格" prop="activityPrice">
 
                 <i-input v-model="mkActivitiesPromotion.activityPrice" placeholder="活动价格"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkActivitiesPromotion.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkActivitiesPromotion.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -61,11 +58,8 @@
 
             <Form-item label="商品系列" prop="productSeries">
 
                 <i-input v-model="mkActivitiesPromotion.productSeries" placeholder="商品系列"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkActivitiesPromotion.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item label="截止日期" prop="deadline">
 
-                <i-input v-model="mkActivitiesPromotion.deadline" placeholder="截止日期"/>
 
+                <i-input v-model="mkActivitiesPromotion.deadline" placeholder="截止日期 yyy-mm-dd"/>
 
             </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

+ 2 - 8
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdailyactivities.html
Ver arquivo 

@@ -11,12 +11,12 @@
 
         <Row :gutter="16">
 
             <div class="search-group">
 
                 <i-col span="4">
 
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
 
+                    <i-input v-model="q.name" @on-enter="query" placeholder="商品编码"/>
 
                 </i-col>
 
                 <i-button @click="query">查询</i-button>
 
                 <i-button @click="reloadSearch">重置</i-button>
 
             </div>
 
-            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
 
+            <div class="buttons-group" style="width: 100%;margin-top: 8px;">
 
                 <i-col style="display: inline-grid;">
 
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
 
                             :format="['xls','xlsx']"
 
@@ -49,9 +49,6 @@
 
             <Form-item label="活动价格" prop="activityPrice">
 
                 <i-input v-model="mkDailyActivities.activityPrice" placeholder="活动价格"/>
 
             </Form-item>
 
-            <Form-item label="门店编号" prop="shopSn">
 
-                <i-input v-model="mkDailyActivities.shopSn" placeholder="门店编号"/>
 
-            </Form-item>
 
             <Form-item label="商品编码" prop="goodsSn">
 
                 <i-input v-model="mkDailyActivities.goodsSn" placeholder="商品编码"/>
 
             </Form-item>
 
@@ -64,9 +61,6 @@
 
             <Form-item label="商品系列" prop="productSeries">
 
                 <i-input v-model="mkDailyActivities.productSeries" placeholder="商品系列"/>
 
             </Form-item>
 
-            <Form-item label="营销活动编号" prop="mkaId">
 
-                <i-input v-model="mkDailyActivities.mkaId" placeholder="营销活动编号"/>
 
-            </Form-item>
 
             <Form-item>
 
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
 
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

+ 4 - 4
kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html
Ver arquivo 

@@ -202,13 +202,13 @@
 
                     </i-option>
 
                 </i-select>
 
             </Form-item>
 
-            <Form-item v-if="showInput" label="运费模版" prop="freightId">
 
+            <!--<Form-item v-if="showInput" label="运费模版" prop="freightId">
 
                 <i-select v-model="productStoreRela.freightId" placeholder="运费模版"
 
                           label-in-value style="width: 268px;">
 
                     <i-option v-for="freight in freights" :value="freight.id" :key="freight.id">{{freight.name}}
 
                     </i-option>
 
                 </i-select>
 
-            </Form-item>
 
+            </Form-item>-->
 
             <Form-item v-if="showInput" label="批次编号" prop="batchSn">
 
                 <!--<i-input v-model="productStoreRela.batchSn" placeholder="批次编号" style="width: 268px;"/>-->
 
                 <i-select v-model="productStoreRela.batchSn" placeholder="批次编号" @on-change="changeBatch"
 
@@ -337,13 +337,13 @@
 
                     </i-option>
 
                 </i-select>
 
             </Form-item>
 
-            <Form-item v-if="showInput" label="运费模版" prop="freightId">
 
+            <!--<Form-item v-if="showInput" label="运费模版" prop="freightId">
 
                 <i-select v-model="productStoreRela.freightId" placeholder="运费模版"
 
                           label-in-value style="width: 268px;">
 
                     <i-option v-for="freight in freights" :value="freight.id" :key="freight.id">{{freight.name}}
 
                     </i-option>
 
                 </i-select>
 
-            </Form-item>
 
+            </Form-item>-->
 
             <Form-item v-if="showInputSpecification" label="规格" prop="specification">
 
                 <i-input v-model="productStoreRela.specification" placeholder="规格" style="width: 268px;" v-show="isSupplierOperatorShow" disabled></i-input>
 
                 <i-input v-model="productStoreRela.specification" placeholder="规格" style="width: 268px;" v-show="!isSupplierOperatorShow"></i-input>

+ 0 - 8
kmall-admin/src/main/webapp/js/mk/mk2memberbirthday.js
Ver arquivo 

@@ -22,14 +22,6 @@ $(function () {
 
                         return '<span class="label label-success">是</span>';
 
                     }
 
                     return '<span class="label label-danger">否</span>';
 
-                }},
 
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 180},
 
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 180,align: 'center',formatter: function (value) {
 
-                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
 
-                }},
 
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 180},
 
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 180,align: 'center',formatter: function (value) {
 
-                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
 
                 }}],
 
 		viewrecords: true,
 
         height: 550,

+ 10 - 9
kmall-admin/src/main/webapp/js/mk/mkactivitiescombinationprice.js
Ver arquivo 

@@ -9,7 +9,6 @@ $(function () {
 
 	if(mkCode){
 
 		vm.mkCode = mkCode;
 
 	}
 
-	console.log(vm.mkCode);
 
 	let storeId = getQueryString("storeId");
 
 	if(storeId){
 
 		vm.storeId = storeId;
 
@@ -18,7 +17,6 @@ $(function () {
 
 	if(mkaId){
 
 		vm.mkaId = mkaId;
 
 	}
 
-	console.log(mkaId);
 
 
 
     $("#jqGrid").jqGrid({
 
@@ -26,12 +24,11 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'macpId', name: 'macpId', index: 'macp_id', key: true, hidden: true},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '组合的产品数量', name: 'combinationNum', index: 'combination_num', width: 80},
 
-			{label: '组合价', name: 'combinedPrice', index: 'combined_price', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
 
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '组合的产品数量', name: 'combinationNum', index: 'combination_num', width: 80, align: 'center'},
 
+			{label: '组合价', name: 'combinedPrice', index: 'combined_price', width: 80, align: 'center'},
 
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
         height: 550,
 
 		postData: {'mkaId': vm.mkaId},
 
@@ -102,7 +99,11 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesCombinationPrice.macpId == null ? "../mkactivitiescombinationprice/save" : "../mkactivitiescombinationprice/update";
 
-			$.ajax({
 
+
 
+			//添加上层的营销方式编号
 
+			vm.mkActivitiesCombinationPrice.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 11 - 8
kmall-admin/src/main/webapp/js/mk/mkactivitiescoupon.js
Ver arquivo 

@@ -24,13 +24,11 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'macId', name: 'macId', index: 'mac_id', key: true, hidden: true},
 
-			{label: '适用商品编号', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '适用商品条码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '优惠券码', name: 'couponSn', index: 'coupon_sn', width: 80},
 
-			{label: '优惠金额', name: 'couponPrice', index: 'coupon_price', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
 
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 
+			{label: '适用商品编号', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '适用商品条码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '优惠券码', name: 'couponSn', index: 'coupon_sn', width: 80, align: 'center'},
 
+			{label: '优惠金额', name: 'couponPrice', index: 'coupon_price', width: 80, align: 'center'},
 
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -101,7 +99,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesCoupon.macId == null ? "../mkactivitiescoupon/save" : "../mkactivitiescoupon/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkActivitiesCoupon.shopSn = vm.storeId;
 
+			vm.mkActivitiesCoupon.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 13 - 11
kmall-admin/src/main/webapp/js/mk/mkactivitiesdiscount.js
Ver arquivo 

@@ -10,7 +10,6 @@ $(function () {
 
 	}
 
 
 	let storeId = getQueryString("storeId");
 
-	console.log(storeId);
 
 	if(storeId){
 
 		vm.storeId = storeId;
 
 	}
 
@@ -24,15 +23,13 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'madId', name: 'madId', index: 'mad_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 
-			{label: '折扣', name: 'discount', index: 'discount', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 
+			{label: '折扣', name: 'discount', index: 'discount', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -103,7 +100,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesDiscount.madId == null ? "../mkactivitiesdiscount/save" : "../mkactivitiesdiscount/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkActivitiesDiscount.shopSn = vm.storeId;
 
+			vm.mkActivitiesDiscount.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 14 - 12
kmall-admin/src/main/webapp/js/mk/mkactivitiesfullgift.js
Ver arquivo 

@@ -10,7 +10,6 @@ $(function () {
 
 	}
 
 
 	let storeId = getQueryString("storeId");
 
-	console.log(storeId);
 
 	if(storeId){
 
 		vm.storeId = storeId;
 
 	}
 
@@ -24,16 +23,14 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 
-			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
 
-			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
 
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 
+			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80, align: 'center'},
 
+			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80, align: 'center'},
 
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -102,7 +99,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesFullGift.mafrId == null ? "../mkactivitiesfullgift/save" : "../mkactivitiesfullgift/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkActivitiesFullGift.shopSn = vm.storeId;
 
+			vm.mkActivitiesFullGift.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 14 - 11
kmall-admin/src/main/webapp/js/mk/mkactivitiesfullreduction.js
Ver arquivo 

@@ -25,16 +25,14 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 
-			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
 
-			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
 
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 
+			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80, align: 'center'},
 
+			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', width: 80, align: 'center'},
 
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -105,7 +103,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesFullReduction.mafrId == null ? "../mkactivitiesfullreduction/save" : "../mkactivitiesfullreduction/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkActivitiesFullReduction.shopSn = vm.storeId;
 
+			vm.mkActivitiesFullReduction.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 11 - 11
kmall-admin/src/main/webapp/js/mk/mkactivitiesgetonefreegoods.js
Ver arquivo 

@@ -10,7 +10,6 @@ $(function () {
 
 	}
 
 
 	let storeId = getQueryString("storeId");
 
-	console.log(storeId);
 
 	if(storeId){
 
 		vm.storeId = storeId;
 
 	}
 
@@ -24,13 +23,11 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'mkaFreeId', name: 'mkaFreeId', index: 'mka_free_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -56,8 +53,6 @@ $(function () {
 
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
 
         }
 
     });
 
-
 
-
 
 });
 
 
 let vm = new Vue({
 
@@ -101,7 +96,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesGetOneFreeGoods.mkaFreeId == null ? "../mkactivitiesgetonefreegoods/save" : "../mkactivitiesgetonefreegoods/update";
 
-			$.ajax({
 
+
 
+            //添加上层的活动门店ID与营销方式编号
 
+			vm.mkActivitiesGetOneFreeGoods.shopSn = vm.storeId;
 
+			vm.mkActivitiesGetOneFreeGoods.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 13 - 11
kmall-admin/src/main/webapp/js/mk/mkactivitiespromotion.js
Ver arquivo 

@@ -19,21 +19,18 @@ $(function () {
 
 	}
 
 
 
-
 
     $("#jqGrid").jqGrid({
 
         url: '../mkactivitiespromotion/list',
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'mapId', name: 'mapId', index: 'map_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
 
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
 
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData:{storeId:storeId},
 
         height: 550,
 
@@ -104,7 +101,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkActivitiesPromotion.mapId == null ? "../mkactivitiespromotion/save" : "../mkactivitiespromotion/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkActivitiesPromotion.shopSn = vm.storeId;
 
+			vm.mkActivitiesPromotion.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 1 - 2
kmall-admin/src/main/webapp/js/mk/mkactivityform.js
Ver arquivo 

@@ -322,7 +322,7 @@ let vm = new Vue({
 
             vm.title = '管理营销方式';
 
             vm.showMkactivitiesViewList = false;
 
             vm.showMkactivitiesList = true;
 
-            console.log(vm.mkCode);
 
+
 
             let page = $("#jqGridOrder").jqGrid('getGridParam', 'page');
 
             $("#jqGridOrder").jqGrid('setGridParam', {
 
                 postData: {'mkCode': vm.mkCode, 'topic': vm.q.topic},
 
@@ -423,7 +423,6 @@ let vm = new Vue({
 
         },
 
         mkactivitiesSaveOrUpdate: function (event) {
 
             let url = vm.mkActivities.mkaId == null ? "../mkactivities/save" : "../mkactivities/update";
 
-            debugger;
 
 
             vm.mkActivities.mkaStartTime = vm.mkaStartTime;
 
             vm.mkActivities.mkdEndTime = vm.mkdEndTime;

+ 13 - 10
kmall-admin/src/main/webapp/js/mk/mkdailyactivities.js
Ver arquivo 

@@ -22,15 +22,13 @@ $(function () {
 
         datatype: "json",
 
         colModel: [
 
 			{label: 'mdaId', name: 'mdaId', index: 'mda_id', key: true, hidden: true},
 
-			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 
-			{label: '日常价', name: 'dailyPrice', index: 'daily_price', width: 80},
 
-			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
 
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 
-			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 
-			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 
-			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 
-			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80, align: 'center'},
 
+			{label: '日常价', name: 'dailyPrice', index: 'daily_price', width: 80, align: 'center'},
 
+			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80, align: 'center'},
 
+			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80, align: 'center'},
 
+			{label: '条形码', name: 'barcode', index: 'barcode', width: 80, align: 'center'},
 
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80, align: 'center'},
 
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'}],
 
 		viewrecords: true,
 
 		postData: {'mkaId': vm.mkaId},
 
         height: 550,
 
@@ -102,7 +100,12 @@ let vm = new Vue({
 
 		},
 
 		saveOrUpdate: function (event) {
 
             let url = vm.mkDailyActivities.mdaId == null ? "../mkdailyactivities/save" : "../mkdailyactivities/update";
 
-			$.ajax({
 
+
 
+			//添加上层的门店编号与营销方式编号
 
+			vm.mkDailyActivities.shopSn = vm.storeId;
 
+			vm.mkDailyActivities.mkaId = vm.mkaId;
 
+
 
+            $.ajax({
 
 				type: "POST",
 
 			    url: url,
 
 			    contentType: "application/json",

+ 3 - 3
kmall-admin/src/main/webapp/js/shop/supplier.js
Ver arquivo 

@@ -6,9 +6,9 @@ $(function () {
 
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 
 			{label: '一级商户编号', name: 'levelMerchSn', index: 'level_merch_sn', width: 200, align: 'center'},
 
 			{label: '一级商户标识', name: 'levelMerchFlag', index: 'level_merch_flag', width: 120, align: 'center'},
 
-            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 120},
 
-			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 220 },
 
-			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 120 },
 
+            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 120, align: 'center'},
 
+			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 220, align: 'center'},
 
+			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 120, align: 'center'},
 
 			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 100, align: 'center'},
 
 			{label: '是否禁用', name: 'isShow', index: 'is_show', width: 100, align: 'center', formatter: function (value) {
 
                 return value == 0 ?

BIN
kmall-admin/src/main/webapp/statics/file/activities_get_one_free_goods_yyyy_mm_dd_v1.0.0.xlsx
Ver arquivo


BIN
kmall-admin/src/main/webapp/statics/file/store_goods_export_yyyy_mm_dd_v1.0.0.xls
Ver arquivo