去除截止时间、是否提前结束

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

@@ -61,9 +61,9 @@
             <Form-item label="商品系列" prop="productSeries">
                 <i-input v-model="mkActivitiesPromotion.productSeries" placeholder="商品系列"/>
             </Form-item>
-            <Form-item label="截止日期" prop="deadline">
+            <!--<Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesPromotion.deadline" placeholder="截止日期 yyy-mm-dd"/>
-            </Form-item>
+            </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/mkactivityform.html

@@ -115,7 +115,7 @@
             <Form-item label="结束时间" prop="mkdEndTime">
                 <Date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" v-model="mkActivities.mkdEndTime" @on-change="getMkdEndTime" placeholder="结束时间" style="width: 240px"></Date-picker>
             </Form-item>
-            <Form-item label="是否提前结束" prop="mkaEndEarly">
+            <!--<Form-item label="是否提前结束" prop="mkaEndEarly">
                 <Radio-group v-model="mkActivities.mkaEndEarly" @on-change="changeMkaEndEarly">
                     <Radio label="1">
                         <span>是</span>
@@ -124,10 +124,10 @@
                         <span>否</span>
                     </Radio>
                 </Radio-group>
-            </Form-item>
-            <Form-item label="提前结束时间" prop="mkdEndEarlyTime" v-show="isMkdEndEarlyTimeShow">
+            </Form-item>-->
+            <!--<Form-item label="提前结束时间" prop="mkdEndEarlyTime" v-show="isMkdEndEarlyTimeShow">
                 <Date-picker type="datetime" format="yyyy-MM-dd HH:mm:ss" v-model="mkActivities.mkdEndEarlyTime" @on-change="getMkdEndEarlyTime" placeholder="提前结束时间" style="width: 240px"></Date-picker>
-            </Form-item>
+            </Form-item>-->
             <Form-item>
                 <i-button type="primary" @click="handleMkactivitiesSubmit('formMkactivitiesValidate')">提交</i-button>
                 <i-button type="warning" @click="reloadMkactivities" style="margin-left: 8px"/>返回</i-button>

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

@@ -39,7 +39,7 @@ $(function () {
 				}
 			},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80, align: 'center'},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}],
+			/*{label: '截止日期', name: 'deadline', index: 'deadline', width: 80, align: 'center'}*/],
 		viewrecords: true,
 		postData: {'mkaId': vm.mkaId},
         height: 550,

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

@@ -112,7 +112,7 @@ $(function () {
             {label: '活动优先级', name: 'priority', index: 'priority', width: 100, align: 'center'},
             {label: '开始时间', name: 'mkaStartTime', index: 'mka_start_time', width: 200, align: 'center'},
             {label: '结束时间', name: 'mkdEndTime', index: 'mkd_end_time', width: 200, align: 'center'},
-            {label: '是否提前结束', name: 'mkaEndEarly', index: 'mka_end_early', width: 200, align: 'center',
+            /*{label: '是否提前结束', name: 'mkaEndEarly', index: 'mka_end_early', width: 200, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -121,7 +121,7 @@ $(function () {
                     }
                     return '';
                 }
-            },
+            },*/
             {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 200, align: 'center'}
             ],
         viewrecords: true,