From bbf8abe0e665a76e04dfb31182aae32dad59c017 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Tue, 11 Oct 2022 11:14:01 +0800
Subject: [PATCH] 2022.10.11

---
 src/components/XyDialog/index.vue                 |  7 +++++++
 src/views/customer/component/addCustomer.vue      | 11 +++++++----
 src/views/customer/component/addOrder.vue         |  4 ++--
 src/views/order/component/addOrder.vue            | 11 +++++++----
 src/views/product/productComponent/addProduct.vue | 13 +++++++++++++
 src/views/product/productManage.vue               |  5 +++++
 src/views/product/sku.vue                         |  5 +++++
 src/views/schedule/component/timeSelect.vue       | 13 ++++++++++++-
 8 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index b8ce259..a20a582 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -85,6 +85,13 @@ export default {
       }
       this.$refs['elForm'].resetFields()
     },
+    clearValidate(){
+      this.$emit('clearValidate')
+      if(this.type === 'normal'){
+        return
+      }
+      this.$refs['elForm'].clearValidate()
+    },
     submit(){
       if(this.type === 'normal'){
         return
diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index 06f8461..e7ad2ac 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -247,7 +247,7 @@
               type="daterange"
               :picker-options="pickerOptions"
               value-format="yyyy-MM-dd"
-              @change="productPick"></el-date-picker>
+              @change="computedDate"></el-date-picker>
           </div>
         </div>
       </template>
@@ -749,8 +749,11 @@ export default {
       this.pickedProduct = e
       this.form1.product_id = e.id
       this.form1.product_type_id = e.product_type_id
-      console.log(e)
-      if(this.form1.product_id && this.form1.date.length>0){
+
+      this.computedDate()
+    },
+    computedDate(){
+      if(this.form1.product_id && this.form1.date){
         let times;
         let t1= moment(this.form1.date[0])
         let t2 = moment(this.form1.date[1])
@@ -848,7 +851,7 @@ export default {
         address: val[2],
         lng: val[0],
         lat: val[1],
-        default: 0,
+        default: this.form.customer_address_list.length === 0 ? 1 : 0,
         comment: ''
       })
     }
diff --git a/src/views/customer/component/addOrder.vue b/src/views/customer/component/addOrder.vue
index e217f9c..0e50e3a 100644
--- a/src/views/customer/component/addOrder.vue
+++ b/src/views/customer/component/addOrder.vue
@@ -300,7 +300,7 @@ export default {
       this.form.product_id = e.id
       this.form.product_type_id = e.product_type_id
       console.log(e)
-      if(this.form.product_id && this.form.date.length>0){
+      if(this.form.product_id && this.form.date){
         let times;
         let t1= moment(this.form.date[0])
         let t2 = moment(this.form.date[1])
@@ -328,7 +328,7 @@ export default {
       }
     },
     datePick(){
-      if(this.form.product_id && this.form.date.length>0){
+      if(this.form.product_id && this.form.date){
         let t1= moment(this.form.date[0])
         let t2 = moment(this.form.date[1])
         let times = t2.diff(t1,'month') //几个周期
diff --git a/src/views/order/component/addOrder.vue b/src/views/order/component/addOrder.vue
index bb18e88..e7cc519 100644
--- a/src/views/order/component/addOrder.vue
+++ b/src/views/order/component/addOrder.vue
@@ -80,7 +80,7 @@
               range-separator="~"
               :picker-options="pickerOptions"
               value-format="yyyy-MM-dd"
-              @change="productPick"></el-date-picker>
+              @change="computedData"></el-date-picker>
           </div>
         </div>
       </template>
@@ -305,11 +305,14 @@ export default {
       this.pickedProduct = e
       this.form.product_id = e.id
       this.form.product_type_id = e.product_type_id
-      console.log(e)
-      if(this.form.service_times || this.form.form.total_money || this.form.unit_price || this.form.total_time){
+
+      this.computedData()
+    },
+    computedData(){
+      if(this.form.service_times || this.form.total_money || this.form.unit_price || this.form.total_time){
         return
       }
-      if(this.form.product_id && this.form.date.length>0){
+      if(this.form.product_id && this.form.date){
         let times;
         let t1= moment(this.form.date[0])
         let t2 = moment(this.form.date[1])
diff --git a/src/views/product/productComponent/addProduct.vue b/src/views/product/productComponent/addProduct.vue
index 015c3c3..7c0c027 100644
--- a/src/views/product/productComponent/addProduct.vue
+++ b/src/views/product/productComponent/addProduct.vue
@@ -112,6 +112,18 @@
         </div>
       </template>
 
+      <template v-slot:process_total>
+        <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">
+            <el-input-number v-model="form.process_total" :controls="false" :precision="0" clearable placeholder="请输入护工单价"
+                             style="width: 300px;"/>
+          </div>
+        </div>
+      </template>
+
       <template v-slot:type>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -154,6 +166,7 @@ export default {
         nurse_price: '',
         service_rule:false,
         time_lenth: '',
+        process_total:'',
         total:'',
       },
       rules: {
diff --git a/src/views/product/productManage.vue b/src/views/product/productManage.vue
index 3987264..0f36d69 100644
--- a/src/views/product/productManage.vue
+++ b/src/views/product/productManage.vue
@@ -125,6 +125,11 @@ export default {
             }
           }
         },
+        {
+          prop:'process_total',
+          label:'需打卡次数',
+          width:140
+        }
       ]
     }
   },
diff --git a/src/views/product/sku.vue b/src/views/product/sku.vue
index b15cb36..e960cae 100644
--- a/src/views/product/sku.vue
+++ b/src/views/product/sku.vue
@@ -62,6 +62,11 @@ export default {
           minWidth:200,
           align:'left'
         },
+        {
+          label:'服务时长(分钟)',
+          prop:'time_lenth',
+          width: 160
+        },
         {
           prop:'sortnumber',
           label:'排序',
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index 23462d0..0666586 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -226,6 +226,11 @@ export default {
         }
       })
     },
+    toggleAll(){
+      this.skus.forEach(item => {
+        this.$refs['table'].toggleRowSelection(item)
+      })
+    },
 
     submit() {
       this.form.customer_id = this.customerId
@@ -263,7 +268,13 @@ export default {
           return item.default === 1
         })[0]?.id || ''
 
-        this.toggleRow(this.form.schedule_list_skus)
+        //默认选择
+        if(this.form.schedule_list_skus.length > 0){
+          this.toggleRow(this.form.schedule_list_skus)
+        }else{
+          this.toggleAll()
+        }
+
       } else {
         this.$emit('update:date','')
         this.$refs['elForm'].resetFields()