批量维护工作日历增加一个勾选 是否包含 2023年3月7日 sxm

src/views/modules/base/calendar.vue

@@ -13,7 +13,10 @@
           <el-option :label="labels.useing" value="使用中"></el-option>
           <el-option :label="labels.stopUse" value="停用"></el-option>
         </el-select>
-        <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.search }}</el-button>
+        <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{
+            buttons.search
+          }}
+        </el-button>
         <el-button @click="newCalendarModel()" :disabled="authAdd" type="primary" style="margin-top: 0px">
           {{ buttons.newCalendarModel }}
         </el-button>
@@ -159,12 +162,8 @@
     <el-dialog :title="labels.calendars" :close-on-click-modal="false" v-drag :visible.sync="maintainCalendarFlag"
                width="1200px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
-        <el-form-item :label="labels.calendarId4">
-          <el-input v-model="maintainCalendarSearchData.calendarId" style="width: 130px"></el-input>
-        </el-form-item>
-        <el-form-item :label="labels.calendarDesc4">
-          <el-input v-model="maintainCalendarSearchData.calendarDesc" style="width: 130px"></el-input>
-        </el-form-item>
+        <el-row>
+          <el-col :span="24">
             <el-form-item :label="labels.startDate|| '日期'">
               <el-date-picker
                 style="width: 130px"
@@ -180,14 +179,6 @@
                 :placeholder="labels.chooseDate">
               </el-date-picker>
             </el-form-item>
-        <!--        <el-form-item :label="'至：'">-->
-        <!--          <el-date-picker-->
-        <!--            style="width: 130px"-->
-        <!--            v-model="maintainCalendarSearchData.endDate"-->
-        <!--            value-format="yyyy-MM-dd"-->
-        <!--            placeholder="选择日期">-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
             <el-form-item :label="labels.datetype">
               <el-select v-model="maintainCalendarSearchData.datetype" style="width: 130px"
                          :placeholder="labels.choose">
@@ -198,10 +189,31 @@
                   :value="item.value">
                 </el-option>
               </el-select>
+            </el-form-item>
+            <el-form-item label=" ">
               <el-button @click="refreshModel()" type="primary" style="margin-top: 0px">{{ buttons.search }}</el-button>
-          <el-button @click="saveList()" type="primary" style="margin-top: 0px">{{buttons.saveCalendar}}</el-button>
+              <el-button @click="saveList()" type="primary" style="margin-top: 0px">{{ buttons.saveCalendar }}
+              </el-button>
             </el-form-item>
 
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="labels.calendarId4">
+              <el-input v-model="maintainCalendarSearchData.calendarId" style="width: 130px"></el-input>
+            </el-form-item>
+            <el-form-item :label="labels.calendarDesc4">
+              <el-input v-model="maintainCalendarSearchData.calendarDesc" style="width: 130px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'是否包含(日历编号/日历描述)'">
+              <el-radio-group v-model="maintainCalendarSearchData.isIncluding">
+                <el-radio :label="true" >包含</el-radio>
+                <el-radio :label="false" >不包含</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="calendar">
         <el-table
@@ -243,7 +255,8 @@
             :label="item.columnLabel"
             :formatter="getSelections">
             <template slot-scope="scope">
-              <el-select v-model="scope.row[item.columnProp]" :placeholder="labels.choose" style="height: 12px;padding: 0px "
+              <el-select v-model="scope.row[item.columnProp]" :placeholder="labels.choose"
+                         style="height: 12px;padding: 0px "
                          filterable
                          allow-create>
                 <el-option v-for="(item,index) in selectList " :key="index" :label="item.label" :value="item.value">
@@ -459,6 +472,7 @@ import {
   searchFunctionButtonList,
 
 } from "@/api/sysLanguage.js"
+
 var functionId = '103002';
 export default {
   name: "calendar",
@@ -1103,6 +1117,7 @@ export default {
         startDate: '',
         endDate: '',
         datetype: '',
+        isIncluding: true,
       },
       dataList: [],
       dataList2: [],
@@ -1241,6 +1256,7 @@ export default {
         site: this.$store.state.user.site.toString(),
         calendarId: this.maintainCalendarSearchData.calendarId,
         calendarDesc: this.maintainCalendarSearchData.calendarDesc,
+        isIncluding: this.maintainCalendarSearchData.isIncluding?' Like ':' Not Like ',
       }
       await getCalendarData(mainData).then(({data}) => {
         let list = data.rows;