Merge remote-tracking branch 'origin/devops' into devops

project/biaopin/AppIntegratingTask/components/Add.vue

@@ -10,6 +10,10 @@
               <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="64"></el-input>
             </el-form-item>
 
+            <el-form-item label="名额" prop="quota" style="width: 100%">
+              <el-input-number v-model="form.quota" :min="1" :max="1000" label="请输入"></el-input-number>
+            </el-form-item>
+
             <el-form-item label="活动说明" style="width: 100%">
               <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
             </el-form-item>
@@ -124,6 +128,7 @@ export default {
     return {
       form: {
         title: '',
+        quota: 1,
         detail: '',
         lng: '',
         lat: '',
@@ -144,6 +149,7 @@ export default {
       },
       formRules: {
         title: [{required: true, message: "请输入活动名称", trigger: "blur"}],
+        quota: [{required: true, message: "请输入名额", trigger: "blur"}],
         location: [{required: true, validator: validLocation, trigger: "blur"}],
         clockRange: [{required: true, message: "请输入打卡范围", trigger: "blur"}],
         intoTime: [{required: true, message: "请选择进场打卡时间", trigger: "blur"}],
@@ -185,17 +191,17 @@ export default {
   watch: {
     'form.intoTime': {
       handler(val) {
-        if(val) {
+        if (Array.isArray(val) && val.length >= 2) {
-          this.form.intoBegintime = val[0]
+          this.form.intoBegintime = val[0];
-          this.form.intoEndtime = val[1]
+          this.form.intoEndtime = val[1];
         }
       }
     },
     'form.exitTime': {
       handler(val) {
-        if(val) {
+        if (Array.isArray(val) && val.length >= 2) {
-          this.form.exitBegintime = val[0]
+          this.form.exitBegintime = val[0];
-          this.form.exitEndtime = val[1]
+          this.form.exitEndtime = val[1];
         }
       }
     }

project/biaopin/AppIntegratingTask/components/Detail.vue

@@ -8,6 +8,7 @@
         <template #content>
           <ai-wrapper>
             <ai-info-item label="活动名称" :value="info.title"></ai-info-item>
+            <ai-info-item label="名额" :value="info.quota"></ai-info-item>
             <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
             <ai-info-item label="活动说明" isLine :value="info.detail"></ai-info-item>
             <ai-info-item label="活动图片" isLine>