1
0
Переглянути джерело

[lsp]1.新增活动形式等

lsp 4 роки тому
батько
коміт
7a60cb4401

+ 33 - 5
kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivitiesController.java

@@ -3,11 +3,10 @@ package com.kmall.admin.controller.mk;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.mk.MkActivitiesEntity;
 import com.kmall.admin.service.mk.MkActivitiesService;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
+import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -63,9 +62,23 @@ public class MkActivitiesController {
 //    @RequiresPermissions("mkactivities:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesEntity mkActivities) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(mkActivities);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("mkaTopic", "活动主题");
+        builder.put("merchSn", "商户编号");
+        builder.put("thirdMerchSn", "第三方商户编号");
+        builder.put("mkaStoreId", "活动门店id");
+        builder.put("mkaStartTime", "开始时间");
+        builder.put("mkdEndTime", "结束时间");
+        if("1".equals(mkActivities.getMkaEndEarly())){
+            builder.put("mkdEndEarlyTime", "结束时间");
+        }
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
 
         mkActivitiesService.save(mkActivities);
-
         return R.ok();
     }
 
@@ -76,8 +89,23 @@ public class MkActivitiesController {
 //    @RequiresPermissions("mkactivities:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesEntity mkActivities) {
-        mkActivitiesService.update(mkActivities);
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(mkActivities);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("mkaTopic", "活动主题");
+        builder.put("merchSn", "商户编号");
+        builder.put("thirdMerchSn", "第三方商户编号");
+        builder.put("mkaStoreId", "活动门店id");
+        builder.put("mkaStartTime", "开始时间");
+        builder.put("mkdEndTime", "结束时间");
+        if("1".equals(mkActivities.getMkaEndEarly())){
+            builder.put("mkdEndEarlyTime", "结束时间");
+        }
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
 
+        mkActivitiesService.update(mkActivities);
         return R.ok();
     }
 

+ 63 - 1
kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesEntity.java

@@ -63,6 +63,10 @@ public class MkActivitiesEntity implements Serializable {
      */
     private String createrSn;
     /**
+     * 创建人
+     */
+    private String createrName;
+    /**
      * 修改时间
      */
     private Date updateTime;
@@ -70,12 +74,30 @@ public class MkActivitiesEntity implements Serializable {
      * 修改人编号
      */
     private String moderSn;
-
+    /**
+     * 修改人
+     */
+    private String moderName;
     /**
      * 活动形式代码
      */
     private String mkCode;
 
+    /**
+     * 商户名称
+     */
+    private String merchName;
+
+    /**
+     * 第三方商户名称
+     */
+    private String thirdMerchName;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
 
     /**
      * 设置:编号
@@ -267,4 +289,44 @@ public class MkActivitiesEntity implements Serializable {
     public void setMkCode(String mkCode) {
         this.mkCode = mkCode;
     }
+
+    public String getMerchName() {
+        return merchName;
+    }
+
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
+    public String getThirdMerchName() {
+        return thirdMerchName;
+    }
+
+    public void setThirdMerchName(String thirdMerchName) {
+        this.thirdMerchName = thirdMerchName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getCreaterName() {
+        return createrName;
+    }
+
+    public void setCreaterName(String createrName) {
+        this.createrName = createrName;
+    }
+
+    public String getModerName() {
+        return moderName;
+    }
+
+    public void setModerName(String moderName) {
+        this.moderName = moderName;
+    }
 }

+ 17 - 2
kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesServiceImpl.java

@@ -64,8 +64,19 @@ public class MkActivitiesServiceImpl implements MkActivitiesService {
     }
 
     @Override
+    @Transactional
     public int update(MkActivitiesEntity mkActivities) {
-        return mkActivitiesDao.update(mkActivities);
+        SysUserEntity user = ShiroUtils.getUserEntity();
+
+        mkActivities.setModerSn(user.getUserId().toString());
+        mkActivities.setUpdateTime(new Date());
+        mkActivitiesDao.update(mkActivities);
+
+        MkActivitiesAssociationEntity mkActivitiesAssociation = new MkActivitiesAssociationEntity();
+        BeanUtils.copyProperties(mkActivities, mkActivitiesAssociation);
+        mkActivitiesAssociationDao.update(mkActivitiesAssociation);
+
+        return 1;
     }
 
     @Override
@@ -74,7 +85,11 @@ public class MkActivitiesServiceImpl implements MkActivitiesService {
     }
 
     @Override
+    @Transactional
     public int deleteBatch(Long[]mkaIds) {
-        return mkActivitiesDao.deleteBatch(mkaIds);
+        mkActivitiesDao.deleteBatch(mkaIds);
+
+        mkActivitiesAssociationDao.deleteBatch(mkaIds);
+        return 1;
     }
 }

+ 7 - 5
kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesAssociationDao.xml

@@ -93,12 +93,14 @@
 			#{mkaEndEarly},
 			#{mkdEndEarlyTime})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.kmall.admin.entity.mk.MkActivitiesAssociationEntity">
-		update mk_activities_association 
+		update mk_activities_association
 		<set>
 			<if test="mkCode != null">`mk_code` = #{mkCode}, </if>
 			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
+			<if test="thirdMerchSn != null">`third_merch_sn` = #{thirdMerchSn}, </if>
 			<if test="mkaStoreId != null">`mka_store_id` = #{mkaStoreId}, </if>
 			<if test="mkaStatus != null">`mka_status` = #{mkaStatus}, </if>
 			<if test="mkaStartTime != null">`mka_start_time` = #{mkaStartTime}, </if>
@@ -114,9 +116,9 @@
 	</delete>
 	
 	<delete id="deleteBatch">
-		delete from mk_activities_association where mkaa_id in 
-		<foreach item="mkaaId" collection="array" open="(" separator="," close=")">
-			#{mkaaId}
+		delete from mk_activities_association where mka_id in
+		<foreach item="mkaId" collection="array" open="(" separator="," close=")">
+			#{mkaId}
 		</foreach>
 	</delete>
 

+ 5 - 1
kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesDao.xml

@@ -24,6 +24,8 @@
 		select
 			`mka_id`,
 			`mka_topic`,
+			`merch_sn`,
+			`third_merch_sn`,
 			`mka_store_id`,
 			`mka_status`,
 			`mka_start_time`,
@@ -110,9 +112,11 @@
 	</insert>
 	 
 	<update id="update" parameterType="com.kmall.admin.entity.mk.MkActivitiesEntity">
-		update mk_activities 
+		update mk_activities
 		<set>
 			<if test="mkaTopic != null">`mka_topic` = #{mkaTopic}, </if>
+			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
+			<if test="thirdMerchSn != null">`third_merch_sn` = #{thirdMerchSn}, </if>
 			<if test="mkaStoreId != null">`mka_store_id` = #{mkaStoreId}, </if>
 			<if test="mkaStatus != null">`mka_status` = #{mkaStatus}, </if>
 			<if test="mkaStartTime != null">`mka_start_time` = #{mkaStartTime}, </if>

+ 15 - 4
kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -9,6 +9,7 @@
         <result property="mkCode" column="mk_code"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
+
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.mk.MkActivityFormEntity">
@@ -52,9 +53,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mk_activity_form
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="name != null and name.trim() != ''">
+			AND mk_name LIKE concat('%',#{name},'%')
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.MkActivityFormEntity" useGeneratedKeys="true" keyProperty="mmId">
@@ -114,10 +115,20 @@
 		a.mkd_end_early_time,
 		a.create_time,
 		a.creater_sn,
+		u.username createrName,
 		a.update_time,
-		a.moder_sn
+		a.moder_sn,
+		u1.username moderName,
+		m.merch_name merchName,
+		mb.third_party_merch_name thirdMerchName,
+		s.store_name storeName
 		from mk_activities_association a2
 		left join mk_activities a on a.mka_id = a2.mka_id
+		left join sys_user u on u.user_id = a.creater_sn
+		left join sys_user u1 on u1.user_id = a.moder_sn
+		left JOIN mall_merch m on m.merch_sn = a2.merch_sn
+		left JOIN third_merchant_biz mb on a2.third_merch_sn = mb.third_party_merch_code and a2.merch_sn = mb.merch_sn
+		left join mall_store s on s.merch_sn = a2.merch_sn and s.third_party_merch_code = a2.third_merch_sn and s.id = a2.mka_store_id
 		WHERE 1=1
 		<if test="mkCode != null and mkCode.trim() != ''">
 			AND a2.mk_code LIKE concat('%',#{mkCode},'%')

+ 11 - 34
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivityform.html

@@ -6,31 +6,6 @@
 </head>
 <body>
 <div id="rrapp" v-cloak>
-	<!--<div v-show="showList">
-        <Row :gutter="16">
-            <div class="search-group">
-                <i-col span="4">
-                    <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">
-                #if($shiro.hasPermission("mkactivityform:save"))
-                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivityform:update"))
-                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivityform:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
-            </div>
-        </Row>
-	    <table id="jqGrid"></table>
-	    <div id="jqGridPager"></div>
-    </div>-->
-
     <Card v-show="showViewList">
         <p slot="title">活动形式管理</p>
         <Row :gutter="16">
@@ -82,19 +57,21 @@
                     <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
-                <!--<i-button @click="reloadSearch">重置</i-button>-->
+                <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                <!--#if($shiro.hasPermission("mkactivities:save"))-->
+                <!--#if($shiro.hasPermission("mkactivities:save"))
                 <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                <!--#end-->
-                <!--#if($shiro.hasPermission("mkactivities:update"))-->
+                #end
+                #if($shiro.hasPermission("mkactivities:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                <!--#end-->
-                <!--#if($shiro.hasPermission("mkactivities:delete"))-->
+                #end
+                #if($shiro.hasPermission("mkactivities:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                <!--#end-->
+                #end-->
                 <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                <i-button type="warning" @click="updateMkactivities"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                <i-button type="error" @click="delMkactivities"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 <i-button type="warning" @click="reload">返回活动形式页</i-button>
             </div>
         </Row>
@@ -120,7 +97,7 @@
                 </i-select>
             </Form-item>
             <Form-item label="活动门店" prop="mkaStoreId">
-                <i-select v-model="mkActivities.mkaStoreId" placeholder="活动门店" label-in-value>
+                <i-select v-model="mkActivities.mkaStoreId" filterable placeholder="活动门店" label-in-value>
                     <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}</i-option>
                 </i-select>
             </Form-item>
@@ -155,7 +132,7 @@
             </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleMkactivitiesSubmit('formMkactivitiesValidate')">提交</i-button>
-                <i-button type="warning" @click="updateMkactivities" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="warning" @click="reloadMkactivities" style="margin-left: 8px"/>返回</i-button>
                 <i-button type="ghost" @click="handleReset('formMkactivitiesValidate')" style="margin-left: 8px">重置</i-button>
             </Form-item>
         </i-form>

+ 140 - 63
kmall-admin/src/main/webapp/js/mk/mkactivityform.js

@@ -3,24 +3,24 @@ $(function () {
         url: '../mkactivityform/list',
         datatype: "json",
         colModel: [
-			{label: 'mmId', name: 'mmId', index: 'mm_id', key: true, hidden: true},
-			{label: '活动形式名称', name: 'mkName', index: 'mk_name', width: 80, align: 'center'},
-			{label: '活动形式代码', name: 'mkCode', index: 'mk_code', width: 80, align: 'center'},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',
+            {label: 'mmId', name: 'mmId', index: 'mm_id', key: true, hidden: true},
+            {label: '活动形式名称', name: 'mkName', index: 'mk_name', width: 80, align: 'center'},
+            {label: '活动形式代码', name: 'mkCode', index: 'mk_code', width: 80, align: 'center'},
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
-			},
-			{label: '创建人', name: 'createrName', width: 80, align: 'center'},
+            },
+            {label: '创建人', name: 'createrName', width: 80, align: 'center'},
             {label: '操作', width: 80, align: 'center',
                 formatter: function (value, col, row) {
                     htmlStr = "<button class='btn btn-outline btn-primary' " +
-                        "onclick='vm.updateMkactivities(\""+row.mkCode+"\")'>管理营销方式</button>";
-            		return htmlStr;
-				}
-			}
-		],
-		viewrecords: true,
+                        "onclick='vm.showMkactivities(\""+row.mkCode+"\")'>管理营销方式</button>";
+                    return htmlStr;
+                }
+            }
+        ],
+        viewrecords: true,
         height: 550,
         rowNum: 10,
         rowList: [10, 30, 50],
@@ -51,9 +51,9 @@ $(function () {
         colModel: [
             {label: 'mkaId', name: 'mkaId', index: 'mka_id', key: true, hidden: true},
             {label: '活动主题', name: 'mkaTopic', index: 'mka_topic', width: 80, align: 'center'},
-            {label: '商户名称', name: 'mkaStoreId', index: 'mka_store_id', width: 80, align: 'center'},
-            {label: '第三方商户', name: 'mkaStoreId', index: 'mka_store_id', width: 80, align: 'center'},
-            {label: '活动门店', name: 'mkaStoreId', index: 'mka_store_id', width: 80, align: 'center'},
+            {label: '商户名称', name: 'merchName', width: 80, align: 'center'},
+            {label: '第三方商户', name: 'thirdMerchName', width: 80, align: 'center'},
+            {label: '活动门店', name: 'storeName', width: 80, align: 'center'},
             {label: '是否启用', name: 'mkaStatus', index: 'mka_status', width: 60, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
@@ -82,15 +82,16 @@ $(function () {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
-            {label: '创建人', name: 'createrSn', index: 'creater_sn', width: 80, align: 'center'},
+            {label: '创建人', name: 'createrName', width: 80, align: 'center'},
             {label: '修改时间', name: 'updateTime', index: 'update_time', width: 80, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
             },
-            {label: '修改人', name: 'moderSn', index: 'moder_sn', width: 80, align: 'center'}],
+            {label: '修改人', name: 'moderName', width: 80, align: 'center'}],
         viewrecords: true,
         height: 550,
+        width:1680,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
@@ -110,7 +111,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGridOrder").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
 });
@@ -121,19 +122,18 @@ let vm = new Vue({
         showViewList: true,
         showList: true,
         title: null,
-		mkActivityForm: {},
-		ruleValidate: {
+        mkActivityForm: {},
+        ruleValidate: {
             mkCode: [
-				{required: true, message: '活动形式代码不能为空', trigger: 'blur'}
-			],
+                {required: true, message: '活动形式代码不能为空', trigger: 'blur'}
+            ],
             mkName: [
                 {required: true, message: '活动形式名称不能为空', trigger: 'blur'}
             ]
-		},
-		q: {
-		    name: '',
-            mkCode: ''
-		},
+        },
+        q: {
+            name: ''
+        },
 
         showMkactivitiesViewList: true,//管理营销方式
         showMkactivitiesList: true,
@@ -152,10 +152,10 @@ let vm = new Vue({
 			vm.reload();
 		},
 		add: function () {
-		    vm.showViewList = false;
-		    vm.showMkactivitiesViewList = true;
-			vm.showList = false;
-			vm.title = "新增";
+            vm.showViewList = false;
+            vm.showMkactivitiesViewList = true;
+            vm.showList = false;
+            vm.title = "新增";
 			vm.mkActivityForm = {};
 		},
 		update: function (event) {
@@ -165,7 +165,7 @@ let vm = new Vue({
 			}
             vm.showViewList = false;
             vm.showMkactivitiesViewList = true;
-			vm.showList = false;
+            vm.showList = false;
             vm.title = "修改";
 
             vm.getInfo(mmId)
@@ -224,9 +224,9 @@ let vm = new Vue({
             vm.reload();
 		},
 		reload: function (event) {
-		    vm.showViewList = true;
-			vm.showList = true;
-			vm.showMkactivitiesViewList = true;
+            vm.showList = true;
+            vm.showViewList = true;
+            vm.showMkactivitiesViewList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
                 postData: {'name': vm.q.name},
@@ -243,18 +243,16 @@ let vm = new Vue({
             handleResetForm(this, name);
         },
 
-        //===营销方式管理方法===
-        updateMkactivities: function (mkCode){
+
+		/*===营销方式===*/
+        showMkactivities: function (mkCode) {
             if(null == mkCode){
                 return;
             }
 
             vm.mkCode = mkCode;
-            vm.title = '管理营销方式';
             vm.showList = true;
             vm.showViewList = false;
-            vm.showMkactivitiesViewList = false;
-            vm.showMkactivitiesList = true;
 
             vm.reloadMkactivitiesSearch();
         },
@@ -262,30 +260,29 @@ let vm = new Vue({
             vm.reloadMkactivities();
         },
         reloadMkactivities: function () {
+            vm.title = '管理营销方式';
+            vm.showMkactivitiesViewList = false;
+            vm.showMkactivitiesList = true;
+
             let page = $("#jqGridOrder").jqGrid('getGridParam', 'page');
             $("#jqGridOrder").jqGrid('setGridParam', {
                 postData: {'mkCode': vm.mkCode},
                 page: page
             }).trigger("reloadGrid");
+            vm.handleReset('formMkactivitiesValidate');
         },
         addMkactivities: function () {
-		    vm.showMkactivitiesViewList = true;
-		    vm.showMkactivitiesList = false;
+            vm.showMkactivitiesViewList = true;
+            vm.showMkactivitiesList = false;
             vm.title = "新增";
-            vm.mkActivities = {};
+            vm.mkActivities = {
+                mkaStatus: 0,
+                mkaEndEarly: 0
+            };
+            vm.isMkdEndEarlyTimeShow = false;
 
             vm.getMerchList();
         },
-        //返回重新加载营销方式
-        reloadMkactivities: function (event) {
-            vm.title = '管理营销方式';
-            vm.showList = true;
-            vm.showViewList = false;
-            vm.showMkactivitiesViewList = false;
-            vm.showMkactivitiesList = true;
-
-            vm.reloadMkactivitiesSearch();
-        },
         getMerchList: function() {
             $.get("../merch/queryAll", function (r) {
                 vm.merchList = r.list;
@@ -306,14 +303,57 @@ let vm = new Vue({
                 vm.storeList = r.list;
             });
         },
-        changeMkaEndEarly: function (opt) {
-            var value = opt;
-            if(value == 0){
-                vm.isMkdEndEarlyTimeShow = false;
+        updateMkactivities: function(event){
+            let mkaId = vm.getMkactivitiesRow();
+            if (mkaId == null) {
+                return;
             }
-            if(value == 1){
-                vm.isMkdEndEarlyTimeShow = true;
+
+            vm.showMkactivitiesViewList = true;
+            vm.showMkactivitiesList = false;
+            vm.title = "修改";
+
+            vm.getMerchList();
+            vm.getMkactivitiesInfo(mkaId);
+        },
+        getMkactivitiesInfo: function(mkaId){
+            $.get("../mkactivities/info/"+mkaId, function (r) {
+                vm.mkActivities = r.mkActivities;
+
+                //转换为int型,对应活动门店value值
+                vm.mkActivities.mkaStoreId = parseInt(vm.mkActivities.mkaStoreId);
+                if(vm.mkActivities.mkaEndEarly == '0'){
+                    vm.isMkdEndEarlyTimeShow = false;
+                }
+
+                vm.mkaStartTime = vm.mkActivities.mkaStartTime;
+                vm.mkdEndTime = vm.mkActivities.mkdEndTime;
+                vm.mkdEndEarlyTime = vm.mkActivities.mkdEndEarlyTime;
+            });
+        },
+        delMkactivities: function(event){
+            let mkaId = vm.getSelectedRows();
+            if (mkaId == null) {
+                return;
             }
+
+            confirm('确定要删除选中的记录?', function () {
+                $.ajax({
+                    type: "POST",
+                    url: "../mkactivities/delete",
+                    contentType: "application/json",
+                    data: JSON.stringify(mkaId),
+                    success: function (r) {
+                        if (r.code == 0) {
+                            alert('操作成功', function (index) {
+                                $("#jqGridOrder").trigger("reloadGrid");
+                            });
+                        } else {
+                            alert(r.msg);
+                        }
+                    }
+                });
+            });
         },
         handleMkactivitiesSubmit: function (name) {
             handleSubmitValidate(this, name, function () {
@@ -322,10 +362,13 @@ let vm = new Vue({
         },
         mkactivitiesSaveOrUpdate: function (event) {
             let url = vm.mkActivities.mkaId == null ? "../mkactivities/save" : "../mkactivities/update";
-            vm.mkActivities.mkCode = vm.mkCode;
+            debugger;
+
             vm.mkActivities.mkaStartTime = vm.mkaStartTime;
             vm.mkActivities.mkdEndTime = vm.mkdEndTime;
             vm.mkActivities.mkdEndEarlyTime = vm.mkdEndEarlyTime;
+            vm.mkActivities.mkCode = vm.mkCode;
+
             $.ajax({
                 type: "POST",
                 url: url,
@@ -342,14 +385,48 @@ let vm = new Vue({
                 }
             });
         },
+        changeMkaEndEarly: function (opt) {
+            var value = opt;
+            if(value == 0){
+                vm.isMkdEndEarlyTimeShow = false;
+            }
+            if(value == 1){
+                vm.isMkdEndEarlyTimeShow = true;
+            }
+        },
         getMkaStartTime: function(e){
-		    vm.mkaStartTime = e;
+            vm.mkaStartTime = e;
         },
         getMkdEndTime: function (e) {
-		    vm.mkdEndTime = e;
+            vm.mkdEndTime = e;
         },
         getMkdEndEarlyTime: function (e) {
-		    vm.mkdEndEarlyTime = e;
+            vm.mkdEndEarlyTime = e;
+        },
+        getMkactivitiesRow: function(){
+            var grid = $("#jqGridOrder");
+            var rowKey = grid.getGridParam("selrow");
+            if (!rowKey) {
+                iview.Message.error("请选择一条记录");
+                return;
+            }
+
+            var selectedIDs = grid.getGridParam("selarrrow");
+            if (selectedIDs.length > 1) {
+                iview.Message.error("只能选择一条记录");
+                return;
+            }
+
+            return selectedIDs[0];
+        },
+        getSelectedRows: function(){
+            var grid = $("#jqGridOrder");
+            var rowKey = grid.getGridParam("selrow");
+            if (!rowKey) {
+                iview.Message.error("请选择一条记录");
+                return;
+            }
+            return grid.getGridParam("selarrrow");
         }
 	}
 });