信息验证 3

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/add.html

@@ -453,7 +453,7 @@
                             </div>
                         </div>
                     </div>
-                    <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top:-15px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
+                    <div><a href="#" class="pull-right btn btn-xs btn-white" style="margin-top: 5px;background: none;border: none;"><i class="fa fa-navicon"></i></a></div>
                     <div style="position: relative;"><i class="fa fa-remove" onclick="removeListItem(${dynamicDomLength})" style="margin-top: 8px; position: absolute; left: 10px;"></i></div>
                 </li>`
 
@@ -609,11 +609,8 @@
                 type: Number($("#listActiveType" + (i+1)).find("option:selected").val()),
                 indexs: i + 1
             })
-
         }
 
-        console.log('listData', listData)
-
         // recommendId: _recommendId, 更新接口需要
 
         let _params = {
@@ -626,11 +623,34 @@
             status: Number($("#status").find("option:selected").val())
         }
 
-        console.log('save_params', _params)
+        console.log('_params', _params)
+
+        if (!_params.activeName) {
+            layer.msg('请填写活动名称')
+            return
+        }
+        if (!_params.activeType) {
+            layer.msg('请填写活动类型')
+            return
+        }
+        if (!_params.activeBindId) {
+            layer.msg('请填写关联活动名称')
+            return
+        }
+        if (!_params.startTime) {
+            layer.msg('请填写开始时间')
+            return
+        }
+        if (!_params.endTime) {
+            layer.msg('请填写结束时间')
+            return
+        }
 
-        let isRequired = _params.startTime && _params.endTime && _params.activeType
+        let idList = listData.filter(item => item.recommendBindId == undefined)
 
-        if (isRequired) {
+        if (idList.length >= 1) {
+            layer.msg('推荐活动需填写完整')
+        } else {
             // 增加接口
             promiseMethods('/kylin-recommend-active/addKylinRecommendActive','post', JSON.stringify(_params), 'application/json').then(res => {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/edit.html

@@ -283,6 +283,7 @@
     let listData = []
     let isOneDom = $('#addClassify2').find($('.addAvatarItem')).length + 1 // 判断是否默认一组表单
     let _recommendId = ''
+    let _recommendActiveId = ''
     let varObj = {}
 
     $(document).ready(function () {
@@ -386,6 +387,8 @@
 
                     $('#endTime').attr('value', $.common.dateFormat(new Date(res.endTime), 'yyyy-MM-dd HH:mm:ss'))
 
+                    _recommendActiveId = list[0].recommendActiveId
+
                     assembleDom(list)
 
                     // 创建监听
@@ -529,7 +532,7 @@
 
             listData.push({
                 mid: $('#listRemoteSearch' + (i+1)).find('input').attr('data-mid'),
-                recommendActiveId: $('#listRemoteSearch' + (i+1)).find('input').attr('data-recommendActiveId'),
+                recommendActiveId: _recommendActiveId,
                 recommendRelationId: $('#listRemoteSearch' + (i+1)).find('input').attr('data-recommendRelationId'),
                 recommendBindId: $('#listRemoteSearch' + (i+1)).find('input').attr('data-id'),
                 type: Number($("#listActiveType" + (i+1)).find("option:selected").val()),
@@ -538,14 +541,12 @@
 
         }
 
-       for (let j = 0; j < evryGroup.length; i++) {
-           if (listData[j].recommendBindId) {
-               layer.msg('需填写完整')
-               break
-           }
-       }
+        let idList = listData.filter(item => item.recommendBindId == undefined)
 
-        // 修改推荐活动
+        if (idList.length >= 1) {
+            layer.msg('推荐活动需填写完整')
+        } else {
+            // 增加接口
             promiseMethods('/kylin-recommend-active/addOrUpdateListKylinRecommendActiveRelation','post', JSON.stringify(listData), 'application/json').then(res => {
 
                 if (res.code == 0) {
@@ -557,6 +558,7 @@
                 }
 
             })
+        }
 
     }
 
@@ -629,21 +631,6 @@
 
     // 保存/更新
     function save () {
-        // istData = []
-        //
-        // let evryGroup = $('#addClassify2').find($('.addAvatarItem'))
-        //
-        // // 遍历所有的dom组，取值组装
-        // for (let i = 0; i < evryGroup.length; i++) {
-        //     listData.push({
-        //         recommendBindId: $('#listRemoteSearch' + (i+1)).find('input').attr('data-id'),
-        //         type: Number($("#listActiveType" + (i+1)).find("option:selected").val()),
-        //         indexs: i + 1
-        //     })
-        //
-        // }
-        //
-        // console.log('listData', listData)
 
         // bindId - 关联 id
         let _params = {
@@ -658,6 +645,28 @@
             status: Number($("#status").find("option:selected").val())
         }
 
+
+        if (!_params.activeName) {
+            layer.msg('请填写活动名称')
+            return
+        }
+        if (!_params.activeType) {
+            layer.msg('请填写活动类型')
+            return
+        }
+        if (!_params.activeBindId) {
+            layer.msg('请填写关联活动名称')
+            return
+        }
+        if (!_params.startTime) {
+            layer.msg('请填写开始时间')
+            return
+        }
+        if (!_params.endTime) {
+            layer.msg('请填写结束时间')
+            return
+        }
+
         // 修改活动
         promiseMethods('/kylin-recommend-active/updateKylinRecommendActive','post', JSON.stringify(_params), 'application/json').then(res => {
 
@@ -670,6 +679,8 @@
             }
 
         })
+
+
     }
 
     // 请求方法封装