change普惠疗休养

src/main/resources/db/tour_setting_create.sql

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS `tour_setting` (
   `sortNo` int DEFAULT NULL COMMENT '排序编号',
   `minGroupPeople` int DEFAULT NULL COMMENT '最少成团人数',
   `maxGroupPeople` int DEFAULT NULL COMMENT '最多成团人数',
+  `inProvinceYears` int DEFAULT 0 COMMENT '省内几年去一次',
   `outProvinceYears` int DEFAULT NULL COMMENT '省外几年去一次',
   `outProvinceRatio` decimal(10,2) DEFAULT NULL COMMENT '省外人数占比',
   `outProvinceRatioType` varchar(50) DEFAULT '当年报名人数' COMMENT '省外人数占比类型',

src/main/resources/views/platform/zhgh/dayofficework/Tour/setting/index.html

@@ -154,6 +154,14 @@ layout("/layouts/platform.html"){
                 <el-col :span="24">
                     <div class="tour-setting-basic-divider"></div>
                 </el-col>
+                <el-col :span="12">
+                    <el-form-item label="省内几年去一次" prop="inProvinceYears">
+                        <el-input-number v-model="formData.inProvinceYears" :controls="false" :min="0" :precision="0" placeholder="请输入省内间隔年限" style="width: 100%"></el-input-number>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                    <div class="tour-setting-basic-divider"></div>
+                </el-col>
                 <el-col :span="12">
                     <el-form-item label="省外几年去一次" prop="outProvinceYears">
                         <el-input-number v-model="formData.outProvinceYears" :controls="false" :min="0" :precision="0" placeholder="请输入省外间隔年限" style="width: 100%"></el-input-number>
@@ -364,6 +372,14 @@ layout("/layouts/platform.html"){
                     callback()
                 }
             }
+            const checkInProvinceYears = (rule, value, callback) => {
+                if (value !== null && value !== undefined && value !== ""
+                    && (!Number.isInteger(Number(value)) || Number(value) < 0)) {
+                    callback(new Error("省内间隔年限必须为非负整数"))
+                } else {
+                    callback()
+                }
+            }
             return {
                 title: "",
                 dialogVisible: false,
@@ -388,6 +404,7 @@ layout("/layouts/platform.html"){
                     travelPeopleQuota: [{required: true, message: "必填", trigger: ["blur", "change"]}],
                     minGroupPeople: [{validator: checkGroupPeople, trigger: ["blur", "change"]}],
                     maxGroupPeople: [{validator: checkGroupPeople, trigger: ["blur", "change"]}],
+                    inProvinceYears: [{validator: checkInProvinceYears, trigger: ["blur", "change"]}],
                     outProvinceRatioType: [{required: true, message: "必填", trigger: ["blur", "change"]}],
                     outProvinceFixedPeople: [{validator: checkOutProvinceFixedPeople, trigger: ["blur", "change"]}],
                     cycleStartYear: [{validator: checkCycleYear, trigger: ["blur", "change"]}],
@@ -539,6 +556,7 @@ layout("/layouts/platform.html"){
                     sortNo: 0,
                     minGroupPeople: 0,
                     maxGroupPeople: 0,
+                    inProvinceYears: 0,
                     outProvinceYears: 0,
                     outProvinceRatio: 0,
                     outProvinceRatioType: "当年报名人数",
@@ -632,6 +650,7 @@ layout("/layouts/platform.html"){
                         this.formData = Object.assign({
                             travelPeopleQuota: 0,
                             activityGroupId: "",
+                            inProvinceYears: 0,
                             outProvinceRatioType: "当年报名人数",
                             outProvinceFixedPeople: 0,
                             cycleStartYear: "",