From f52038d08cf67fa1fb56b7e50bc27f222155fce7 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 17 Jun 2024 23:52:44 +0800
Subject: [PATCH] pack

---
 src/views/common-settings/medicalPackage.vue | 47 +++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/views/common-settings/medicalPackage.vue b/src/views/common-settings/medicalPackage.vue
index 8eee364..0d342ce 100644
--- a/src/views/common-settings/medicalPackage.vue
+++ b/src/views/common-settings/medicalPackage.vue
@@ -35,7 +35,6 @@
                 {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
               </template>
             </el-table-column>
-
             <el-table-column prop="maritalStatusId" label="适用婚姻状况" min-width="80" align="center">
               <template slot-scope="scope">
                 {{
@@ -48,6 +47,11 @@
                 }}
               </template>
             </el-table-column>
+            <el-table-column label="年龄范围" min-width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.ageLowerLimit + ' ~ ' + scope.row.ageUpperLimit }}
+              </template>
+            </el-table-column>
             <el-table-column prop="isWebAppoint" label="网上预约" min-width="60" align="center">
               <template slot-scope="scope">
                 <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isWebAppoint == "Y" ? "√" : "" }}</div>
@@ -152,7 +156,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="婚姻状况">
               <el-select v-model="form.maritalStatusId" placeholder="请选择" style="width: 100%" size="small">
                 <el-option v-for="item in dict.forMaritalStatus" :key="item.id" :label="item.displayName"
@@ -161,17 +165,29 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
+            <el-form-item prop="ageLowerLimit" label="年龄下限">
+              <el-input v-model="form.ageLowerLimit" type="number" size="small" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="ageUpperLimit" label="年龄上限">
+              <el-input v-model="form.ageUpperLimit" type="number" size="small" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="网上预约" prop="isWebAppoint">
               <el-checkbox v-model="form.isWebAppoint" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="推荐套餐" prop="isBasicRecommend">
               <el-checkbox v-model="form.isBasicRecommend" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="启用" prop="isActive">
               <el-checkbox v-model="form.isActive" true-label="Y" false-label="N" />
             </el-form-item>
@@ -226,7 +242,9 @@ export default {
         isActive: "Y",
         remark: "",
         isWebAppoint: "Y",
-        isBasicRecommend: 'N'
+        isBasicRecommend: 'N',
+        ageLowerLimit:null,
+        ageUpperLimit:null
       },
       formOri: {},
       formInit: {},
@@ -234,8 +252,13 @@ export default {
         displayName: [
           { required: true, message: "请填写套餐名称", trigger: "blur" },
         ],
+        ageLowerLimit: [
+          { required: true, message: "请填写年龄下限", trigger: "blur" },
+        ],
+        ageUpperLimit: [
+          { required: true, message: "请填写年龄上限", trigger: "blur" },
+        ],
       },
-
       dialogVisible: false,
       department: "",
       quckDepartment: [],
@@ -512,6 +535,16 @@ export default {
         }
 
         let body = deepCopy(this.form);
+        // if(!body.ageLowerLimit){
+        //   body.ageLowerLimit = null
+        // }else{
+        //   body.ageLowerLimit = Number(body.ageLowerLimit)
+        // }
+        // if(!body.ageUpperLimit){
+        //   body.ageUpperLimit = null
+        // }else{
+        //   body.ageUpperLimit = Number(body.ageUpperLimit)
+        // }
         delete body.id;
 
         if (this.form.id) {