活动形式页面调整

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesCombinationPriceDao.xml

@@ -52,7 +52,7 @@
 		from mk_activities_combination_price
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -80,7 +80,7 @@
 		select count(*) from mk_activities_combination_price
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesCouponDao.xml

@@ -53,7 +53,7 @@
 		from mk_activities_coupon
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -78,7 +78,7 @@
 		select count(*) from mk_activities_coupon
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesDiscountDao.xml

@@ -59,7 +59,7 @@
 		from mk_activities_discount
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -84,7 +84,7 @@
 		select count(*) from mk_activities_discount
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesFullGiftDao.xml

@@ -65,7 +65,7 @@
 		from mk_activities_full_gift
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -90,7 +90,7 @@
 		select count(*) from mk_activities_full_gift
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesFullReductionDao.xml

@@ -62,7 +62,7 @@
 		from mk_activities_full_reduction
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -87,7 +87,7 @@
 		select count(*) from mk_activities_full_reduction
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesGetOneFreeGoodsDao.xml

@@ -65,7 +65,7 @@
 		from mk_activities_get_one_free_goods
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -90,7 +90,7 @@
 		select count(*) from mk_activities_get_one_free_goods
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesPromotionDao.xml

@@ -59,7 +59,7 @@
 		from mk_activities_promotion
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -84,7 +84,7 @@
 		select count(*) from mk_activities_promotion
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/MkDailyActivitiesDao.xml

@@ -62,7 +62,7 @@
 		from mk_daily_activities
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND goods_sn LIKE concat('%',#{name},'%')
 		</if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
@@ -87,7 +87,7 @@
 		select count(*) from mk_daily_activities
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND goods_sn LIKE concat('%',#{name},'%')
         </if>
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html

@@ -6,12 +6,12 @@
 </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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescoupon.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>
@@ -62,10 +59,7 @@
                 <i-input v-model="mkActivitiesDiscount.productSeries" placeholder="商品系列"/>
             </Form-item>
             <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="营销活动编号"/>
+                <i-input v-model="mkActivitiesDiscount.discount" placeholder="折扣价"/>
             </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html

@@ -12,7 +12,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdailyactivities.html

@@ -11,7 +11,7 @@
         <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>
@@ -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>

kmall-admin/src/main/webapp/js/mk/mkactivitiescombinationprice.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiescoupon.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiesdiscount.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiesfullgift.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiesfullreduction.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiesgetonefreegoods.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivitiespromotion.js

@@ -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",

kmall-admin/src/main/webapp/js/mk/mkactivityform.js

@@ -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;

kmall-admin/src/main/webapp/js/mk/mkdailyactivities.js

@@ -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",