no message

src/views/activity/component/holiday-category-dialog.vue

@@ -10,7 +10,7 @@
           <li class="list-group-item" v-for="(item, idx) in list" :key="idx">
             <el-form-item :prop="idx + '.categoryName'" :rules="rules.categoryName">
               <!-- <p class="show-name" v-show="!item.isEdit">{{list[idx].categoryName}}</p> -->
-              <el-input v-model="list[idx].categoryName" style="width: 466px"> </el-input>
+              <el-input v-model="list[idx].categoryName" style="width: 466px" maxlength="8"> </el-input>
             </el-form-item>
             <div class="btn-wrap" v-if="list.length > 1">
               <span class="icon-span" @click="onDeleteItem(idx)"><i class="iconfont-components3 icon-cp-DeleteOutlined" /></span>

src/views/activity/component/holiday-dialog.vue

@@ -36,26 +36,26 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="选择日期" v-if="submitData.customFlag == 1">
+      <el-form-item label="选择日期" v-if="submitData.customFlag == 1" prop="holidaysDate">
         <el-row type="flex" align="middle">
-          <el-form-item prop="month" style="margin-right: 10px">
-            <el-select v-model="submitData.month" placeholder="请选择月份" class="selector-item">
-              <el-option v-for="item in months" :key="item.key" :label="item.value" :value="item.key"> </el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item prop="month" style="margin: 0 10px 0 0">
+              <el-select v-model="submitData.month" placeholder="请选择月份" class="selector-item">
+                <el-option v-for="item in months" :key="item.key" :label="item.value" :value="item.key"> </el-option>
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="week" style="margin-right: 10px">
-            <el-select v-model="submitData.week" placeholder="请选择周" class="selector-item">
-              <el-option v-for="item in weeks" :key="item.key" :label="item.value" :value="item.key"> </el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item prop="week" style="margin: 0 10px 0 0">
+              <el-select v-model="submitData.week" placeholder="请选择周" class="selector-item">
+                <el-option v-for="item in weeks" :key="item.key" :label="item.value" :value="item.key"> </el-option>
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="weekDay">
-            <el-select v-model="submitData.weekDay" placeholder="请选择星期" class="selector-item">
-              <el-option v-for="item in weekDays" :key="item.key" :label="item.value" :value="item.key"> </el-option>
-            </el-select>
-          </el-form-item>
-        </el-row>
+            <el-form-item prop="weekDay" style="margin: 0 10px 0 0">
+              <el-select v-model="submitData.weekDay" placeholder="请选择星期" class="selector-item">
+                <el-option v-for="item in weekDays" :key="item.key" :label="item.value" :value="item.key"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
       </el-form-item>
 
       <el-form-item label="排序号" prop="sort">
@@ -215,6 +215,16 @@ export default {
           required: true,
           message: '请选择日期'
         },
+        holidaysDate: {
+          required: true,
+          validator: (rule, value, callback) => {
+            callback();
+          }
+        },
+        customFlag: {
+          required: true,
+          message: '请选择日期类型'
+        },
         month: {
           required: true,
           message: '请选择月份'
@@ -332,4 +342,8 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.date-selector-box .damolish .el-form-item {
+  margin-bottom: 0;
+}
+</style>

src/views/activity/holiday-manage.vue

@@ -112,7 +112,7 @@ export default {
       })
         .then(() => {
           return delHoliday({
-            enterpriseId: item.enterpriseId
+            holidaysId: item.holidaysId
           });
         })
         .then(() => {