diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index 37a03b0..992dbc5 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -325,7 +325,7 @@ import {getparameter} from '@/api/system/dictionary'
 import {save, getInfo} from '@/api/customer'
 import {save as orderSave} from '@/api/order'
 import {getList as productList} from "@/api/product";
-import {getBirth,getSex} from '@/utils'
+import {getBirth,getSex,getAgeByIdcard} from '@/utils'
 import moment from "moment";
 
 export default {
@@ -560,6 +560,7 @@ export default {
           }
         }]
       },
+      customerIdcard:'',
       form1: {
         product_id: '',
         product_type_id:'',
@@ -722,6 +723,7 @@ export default {
           this.$successMessage(this.type, '客户')
           this.flag = 2
           this.form1.customer_id = res.id
+          this.customerIdcard = res.idcard
         })
       })
     },
@@ -729,6 +731,15 @@ export default {
     //订单
     productPick(e){
       this.pickedProduct = e
+      //判断年龄
+      let age = getAgeByIdcard(this.customerIdcard)
+      if(age > 50 || age < 18){
+        this.$message({
+          type:'warning',
+          message:'该客户不在产品服务年龄范围内',
+          duration:2000
+        })
+      }
       this.form1.product_id = e.id
       this.form1.product_type_id = e.product_type_id
 
diff --git a/src/views/customer/component/addOrder.vue b/src/views/customer/component/addOrder.vue
index a8243e9..8bdcbda 100644
--- a/src/views/customer/component/addOrder.vue
+++ b/src/views/customer/component/addOrder.vue
@@ -155,6 +155,7 @@
 <script>
 import {getList as productList} from '@/api/product'
 import {save} from '@/api/order'
+import {getAgeByIdcard} from '@/utils'
 import moment from "moment";
 export default {
   props:{
@@ -208,6 +209,7 @@ export default {
         }]
       },
 
+      customerIdcard:null,
       products: [],
       productSelect: {
         page: 1,
@@ -298,6 +300,17 @@ export default {
 
     productPick(e){
       this.pickedProduct = e
+
+      //判断年龄
+      let age = getAgeByIdcard(this.customerIdcard)
+      if(age > 50 || age < 18){
+        this.$message({
+          type:'warning',
+          message:'该客户不在产品服务年龄范围内',
+          duration:2000
+        })
+      }
+
       this.form.product_id = e.id
       this.form.product_type_id = e.product_type_id
       if(this.form.product_id && this.form.date){
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 3a197e8..9018b25 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -39,7 +39,7 @@
               <Button size="small" type="error" ghost style="margin-right: 6px">删除</Button>
             </Poptip>
             <Button size="small" ghost type="primary" @click="editor(scope.row)" style="margin-right: 6px">编辑</Button>
-            <Button size="small" type="primary" @click="$refs['addOrder'].isShow = true,$refs['addOrder'].form.customer_id = scope.row.id">录入</Button>
+            <Button size="small" type="primary" @click="$refs['addOrder'].customerIdcard = scope.row.idcard,$refs['addOrder'].isShow = true,$refs['addOrder'].form.customer_id = scope.row.id">录入</Button>
           </template>
         </el-table-column>
       </template>
diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue
index 636f05f..ddab388 100644
--- a/src/views/finance/serveDetail.vue
+++ b/src/views/finance/serveDetail.vue
@@ -124,7 +124,8 @@ export default {
         {
           prop:'remark',
           label:'备注',
-          minWidth: 200
+          minWidth: 200,
+          align:'left'
         }
       ],
     }
diff --git a/src/views/product/skuType.vue b/src/views/product/skuType.vue
index 4a50aef..9007922 100644
--- a/src/views/product/skuType.vue
+++ b/src/views/product/skuType.vue
@@ -21,13 +21,14 @@
       @editor="editor"
       @delete="destroy"></xy-table>
 
-    <add-sku-type ref="addSkuType" @refresh="getSkuType"></add-sku-type>
+    <add-sku-type ref="addSkuType" :skus="skus" @refresh="getSkuType"></add-sku-type>
   </div>
 </template>
 
 <script>
 import {getList,destroy} from '@/api/skuCategory'
 import {parseTime} from "@/utils";
+import {getList as getSkus} from '@/api/sku'
 
 import addSkuType from "@/views/product/skuTypeComponent/addSkuType";
 export default {
@@ -36,6 +37,8 @@ export default {
   },
   data() {
     return {
+      skus:[],
+
       list:[],
       table:[
         {
@@ -65,6 +68,11 @@ export default {
     }
   },
   methods: {
+    async getSkus(){
+      const res = await getSkus({page_size:9999,page:1})
+      this.skus = res.data
+    },
+
     async getSkuType(){
       const res = await getList()
       this.list = res.data
@@ -84,6 +92,7 @@ export default {
   },
   mounted() {
     this.getSkuType()
+    this.getSkus()
   }
 }
 </script>
diff --git a/src/views/product/skuTypeComponent/addSkuType.vue b/src/views/product/skuTypeComponent/addSkuType.vue
index df73233..e4e37e0 100644
--- a/src/views/product/skuTypeComponent/addSkuType.vue
+++ b/src/views/product/skuTypeComponent/addSkuType.vue
@@ -28,6 +28,26 @@
           </div>
         </div>
       </template>
+
+      <template v-slot:product_sku_list>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>关联服务：
+          </div>
+          <div class="xy-table-item-content">
+            <xy-table
+              ref="table"
+              :is-page="false"
+              :height="260"
+              :list="skus"
+              :table-item="skuTable"
+              @select="rowSelect"
+              @select-all="rowSelect">
+              <template v-slot:btns></template>
+            </xy-table>
+          </div>
+        </div>
+      </template>
     </xy-dialog>
   </div>
 </template>
@@ -35,6 +55,12 @@
 <script>
 import {save,getForm} from '@/api/skuCategory'
 export default {
+  props:{
+    skus:{
+      type:Array,
+      default:()=>[]
+    }
+  },
   data() {
     return {
       isShow:false,
@@ -44,12 +70,35 @@ export default {
       form:{
         name:'',
         sortnumber:0,
+        product_sku_list:[]
       },
       rules:{
         name:[
           {required:true,message:'请填写名称'}
         ]
-      }
+      },
+      skuTable:[
+        {
+          type:'selection',
+          width:44
+        },
+        {
+          prop:'name',
+          label:'服务名称',
+          width: 140
+        },
+        {
+          prop:'time_lenth',
+          label:'服务时长',
+          width: 120
+        },
+        {
+          prop:'service',
+          label:'服务内容',
+          minWidth: 160,
+          align:'left'
+        }
+      ]
     }
   },
   methods: {
@@ -58,6 +107,15 @@ export default {
       this.$integrateData(this.form,res)
     },
 
+    rowSelect(selection){
+      console.log(selection)
+      this.form.product_sku_list = selection.map(item => {
+        return {
+          sku_id:item.id
+        }
+      })
+    },
+
     submit(){
       if(this.type === 'editor'){
         Object.defineProperty(this.form,'id',{
diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue
index b7ace65..688468a 100644
--- a/src/views/schedule/component/addSchedule.vue
+++ b/src/views/schedule/component/addSchedule.vue
@@ -102,6 +102,7 @@
       ref="timeSelect"
       @refresh="getCustomer"
       :is-show.sync="isShowTime"
+      :nurse-rule="nurseRule"
       :skus="detail.product_type.product_skus"
       :addresses="addresses"
       :date="date"
@@ -137,6 +138,7 @@ export default {
   },
   data() {
     return {
+      nurseId:'',
       productId: '',
       isShow: false,
       isShowTime:false,
@@ -146,6 +148,10 @@ export default {
       detail: '',
       addresses:[],
       pickType:1,
+      nurseRule:{
+        isReadOnly: false,
+        id:''
+      },
 
       table:[
         {
@@ -171,6 +177,7 @@ export default {
 
     datePick(date,data,type,schedule){
       this.date = data.day
+      this.$refs['timeSelect'].form.nurse_id = this.nurseId
       if(data.type === 'current-month'){
         if(type === 1){
           this.$refs['timeSelect'].form.id = ''
@@ -193,6 +200,11 @@ export default {
       })
       console.log(res)
       this.detail = res.detail
+
+      if(this.detail.product?.service_rule === 2 && this.detail.schedule && this.detail.schedule.length > 0){
+        this.nurseRule = true
+        this.nurseId = this.detail.schedule[0]?.nurse_id
+      }
     },
 
   },
@@ -232,6 +244,7 @@ export default {
       if (val) {
         this.getCustomer()
       } else {
+        this.nurseId = ''
         this.orderId = ''
         this.productId = ''
         this.date = ''
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index e35e233..ee63aa8 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -28,6 +28,7 @@
           </el-form-item>
           <el-form-item label="护工选择" prop="nurse_id">
             <el-select v-model="form.nurse_id"
+                       :disabled="nurseRule"
                        placeholder="请选择护工"
                        style="width: 300px;"
                        filterable remote
@@ -90,6 +91,11 @@ export default {
     customerId: [Number, String],
     orderId: [Number, String],
     productId: [Number, String],
+    nurseRule:{
+      //当产品为总计时,并有护工时，自动赋值且不能更改
+      type:Boolean,
+      default:false
+    },
     date: {
       type: String,
       default: ''