Przeglądaj źródła

活动人数&&会场面积

xiaodai2017 1 rok temu
rodzic
commit
eef3cc6ba8

+ 21 - 9
src/views/serviceParam/actNum/addEdit.vue

@@ -34,17 +34,20 @@
                     placeholder="数据类型"
                     @change="typeChange"
                   >
-                    <el-option label="面积1~面积2 ㎡" value="1" />
-                    <el-option label="面积+ ㎡" value="2" />
+                    <el-option label="人数1~人数2 人" value="1" />
+                    <el-option label="人数+ 人" value="2" />
                   </el-select> </el-form-item
               ></el-col>
               <el-col :span="ruleForm.type === '1' ? 13 : 24">
-                <el-form-item label="会议面积" prop="min">
+                <el-form-item label="会议人数" prop="min">
                   <el-input
                     v-model="ruleForm['min']"
                     :disabled="id == '007'"
-                    placeholder="面积1"
-                    maxlength="20"
+                    placeholder="人数1"
+                    max="999999"
+                    min="0"
+                    step="1"
+                    type="number"
                   >
                     <template slot="append" v-if="ruleForm.type !== '1'">+</template>
                   </el-input>
@@ -58,8 +61,11 @@
                   <el-input
                     v-model="ruleForm['max']"
                     :disabled="id == '007'"
-                    placeholder="面积2"
-                    maxlength="20"
+                    placeholder="人数2"
+                    max="999999"
+                    min="0"
+                    step="1"
+                    type="number"
                   />
                 </el-form-item>
               </el-col>
@@ -107,8 +113,8 @@ export default {
       rulesThis: this.rules,
       rules: {
         type: [{ required: true, message: "请选择数据类型", trigger: "change" }],
-        min: [{ required: true, message: "最小面积不能为空", trigger: "blur" }],
-        max: [{ required: true, message: "最大面积不能为空", trigger: "blur" }],
+        min: [{ required: true, message: "最小人数不能为空", trigger: "blur" }],
+        max: [{ required: true, message: "最大人数不能为空", trigger: "blur" }],
       },
     };
   },
@@ -163,6 +169,12 @@ export default {
             let model = JSON.parse(JSON.stringify(this.ruleForm));
             if (model.type === "2") {
               model.max = "";
+            } else {
+              if (Number(min) <= Number(max)) {
+                this.$message.warning("最大人数需大于最小人数!");
+                this.loading = false;
+                return;
+              }
             }
             let res = {};
             if (this.id === "002") {

+ 2 - 2
src/views/serviceParam/actNum/index.vue

@@ -96,8 +96,8 @@
       >
 
       <template #name="{ scope }">
-        <span v-if="String(scope.row.max) === '0'">{{ scope.row.min }}+ </span>
-        <span v-else>{{ scope.row.min }}~{{ scope.row.max }} </span>
+        <span v-if="String(scope.row.max) === '0'">{{ scope.row.min }}+ </span>
+        <span v-else>{{ scope.row.min }}~{{ scope.row.max }} </span>
       </template>
       <template #status="{ scope }">
         <el-tag

+ 15 - 2
src/views/serviceParam/area/addEdit.vue

@@ -44,7 +44,10 @@
                     v-model="ruleForm['min']"
                     :disabled="id == '007'"
                     placeholder="面积1"
-                    maxlength="20"
+                    max="999999"
+                    min="0"
+                    step="1"
+                    type="number"
                   >
                     <template slot="append" v-if="ruleForm.type !== '1'">+</template>
                   </el-input>
@@ -59,7 +62,10 @@
                     v-model="ruleForm['max']"
                     :disabled="id == '007'"
                     placeholder="面积2"
-                    maxlength="20"
+                    max="999999"
+                    min="0"
+                    step="1"
+                    type="number"
                   />
                 </el-form-item>
               </el-col>
@@ -160,9 +166,16 @@ export default {
         if (valid) {
           if (!this.loading) {
             this.loading = true;
+            const { min, max } = this.ruleForm;
             let model = JSON.parse(JSON.stringify(this.ruleForm));
             if (model.type === "2") {
               model.max = "";
+            } else {
+              if (Number(min) <= Number(max)) {
+                this.$message.warning("最大面积需大于最小面积!");
+                this.loading = false;
+                return;
+              }
             }
             let res = {};
             if (this.id === "002") {