Merge branch 'development' into development_cxs

src/views/operationManagement/newActivity.vue

@@ -31,7 +31,7 @@
 
             <!-- 用户可参与次数 -->
             <el-form-item label="用户可参与次数" prop="participationLimit">
-              <el-input v-model="activityModel.participationLimit" placeholder="请输入" />
+              <el-input v-model="activityModel.participationLimit" placeholder="请输入" maxlength="4" />
             </el-form-item>
 
             <!-- 活动规则 -->
@@ -56,7 +56,7 @@
 
             <!-- 优惠券发放数量 -->
             <el-form-item label="优惠券发放数量" prop="couponQuantity">
-              <el-input v-model="activityModel.couponQuantity" placeholder="请输入" />
+              <el-input v-model="activityModel.couponQuantity" placeholder="请输入" maxlength="5" />
             </el-form-item>
 
             <!-- 活动标题图 -->
@@ -254,8 +254,8 @@ const rules = reactive({
           callback(new Error("用户可参与次数必须为正整数"));
           return;
         }
-        if (numValue >= 10000) {
-          callback(new Error("用户可参与次数必须小于10000"));
+        if (numValue > 9999) {
+          callback(new Error("用户可参与次数必须小于9999"));
           return;
         }
         callback();
@@ -286,8 +286,8 @@ const rules = reactive({
           callback(new Error("优惠券发放数量必须为正整数"));
           return;
         }
-        if (numValue >= 10000) {
-          callback(new Error("优惠券发放数量必须小于10000"));
+        if (numValue > 99999) {
+          callback(new Error("优惠券发放数量必须小于99999"));
           return;
         }
         callback();

src/views/ticketManagement/newCoupon.vue

@@ -39,11 +39,11 @@
           </el-form-item>
           <!-- 有效期 -->
           <el-form-item label="有效期(天)" prop="specifiedDay">
-            <el-input v-model="couponModel.specifiedDay" maxlength="15" placeholder="请输入" clearable />
+            <el-input v-model="couponModel.specifiedDay" maxlength="5" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 库存 -->
           <el-form-item label="库存(张)" prop="singleQty">
-            <el-input v-model="couponModel.singleQty" maxlength="15" placeholder="请输入" clearable />
+            <el-input v-model="couponModel.singleQty" maxlength="5" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 用户领取规则 -->
           <el-form-item label="用户领取规则" prop="claimRule">