2022.11.8

src/views/customer/component/addOrder.vue

@@ -15,6 +15,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-select
+              clearable
               :value="pickedProduct.name"
               v-load-more="productLoad"
               placeholder="请选择产品"
@@ -299,7 +300,6 @@ 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.product_id && this.form.date){
         let times;
         let t1= moment(this.form.date[0])
@@ -317,13 +317,18 @@ export default {
             break;
         }
         this.pickedProduct.cycle === 4 ? times = 1 : times = t2.diff(t1,unit) //几个周期
-        this.form.service_times = this.pickedProduct.frequency * times
-        this.form.total_money = Number(this.pickedProduct.purchase_price) * this.form.service_times
-        this.form.unit_price = Number(this.pickedProduct.purchase_price)
-        if(this.pickedProduct.type === 1){
+        if(this.pickedProduct.service_rule === 1){
+          //单次计时
+          this.form.service_times = this.pickedProduct.frequency * times
+          this.form.total_money = Number(this.pickedProduct.purchase_price) * this.form.service_times
+          this.form.unit_price = Number(this.pickedProduct.purchase_price)
           this.form.total_time = Number(this.pickedProduct.time_lenth) * this.form.service_times
         }else{
-          this.form.total_time = this.pickedProduct.total
+          //总计时
+          this.form.service_times = this.pickedProduct.frequency * times
+          this.form.total_money = times * Number(this.pickedProduct.total) * Number(this.pickedProduct.purchase_price)
+          this.form.unit_price = Number(this.pickedProduct.purchase_price)
+          this.form.total_time = times * Number(this.pickedProduct.total)
         }
       }
       console.log(this.form)
@@ -344,17 +349,22 @@ export default {
             unit = 'week'
             break;
         }
-        let times = t2.diff(t1,unit) //几个周期
-        this.form.service_times = this.pickedProduct.frequency * times
-        this.form.total_money = Number(this.pickedProduct.purchase_price) * this.form.service_times
-        this.form.unit_price = Number(this.pickedProduct.purchase_price)
-        if(this.pickedProduct.type === 1){
-          this.form.total_time = Number(this.pickedProduct.time_lenth) * this.form.service_times * times
+        let times ; //几个周期
+        this.pickedProduct.cycle === 4 ? times = 1 : times = t2.diff(t1,unit) //几个周期
+        if(this.pickedProduct.service_rule === 1){
+          //单次计时
+          this.form.service_times = this.pickedProduct.frequency * times
+          this.form.total_money = Number(this.pickedProduct.purchase_price) * this.form.service_times
+          this.form.unit_price = Number(this.pickedProduct.purchase_price)
+          this.form.total_time = Number(this.pickedProduct.time_lenth) * this.form.service_times
         }else{
-          this.form.total_time = this.pickedProduct.total * times
+          //总计时
+          this.form.service_times = this.pickedProduct.frequency * times
+          this.form.total_money = times * Number(this.pickedProduct.total) * Number(this.pickedProduct.purchase_price)
+          this.form.unit_price = Number(this.pickedProduct.purchase_price)
+          this.form.total_time = times * Number(this.pickedProduct.total)
         }
       }
-
       console.log(this.form)
     },
 

src/views/finance/component/scheduleList.vue

@@ -26,7 +26,7 @@
         <Button
           :ghost="select.page_size !== 9999"
           type="primary"
-          @click="select.page_size === 9999 ? select.page_size = 10 : select.page_size = 9999"
+          @click="select.page_size === 9999 ? select.page_size = 10 : select.page_size = 9999,getList()"
           style="margin-left: 6px;">取消分页</Button>
         <Button
           type="primary"

src/views/order/component/addOrder.vue

@@ -327,6 +327,8 @@ export default {
           case 3:
             unit = 'week'
             break;
+          default:
+            return;
         }
         this.pickedProduct.cycle === 4 ? times = 1 : times = t2.diff(t1,unit) //几个周期
         this.form.service_times = this.pickedProduct.frequency * times

src/views/product/productComponent/addProduct.vue

@@ -34,7 +34,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="form.cycle" style="width: 300px;" placeholder="请选择周期">
-              <el-option v-for="(item,index) in [{label:'年',value:1,disable:true},{label:'月',value:2},{label:'周',value:3,disable:true},{label:'次',value:4,disable:true}]" :disabled="item.disable" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              <el-option v-for="(item,index) in [{label:'年',value:1},{label:'月',value:2},{label:'周',value:3},{label:'次',value:4}]" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </div>
         </div>
@@ -115,7 +115,7 @@
       <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>打卡次数：
+            <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="请输入护工单价"

src/views/product/productManage.vue

@@ -87,6 +87,19 @@ export default {
             }
           }
         },
+        {
+          prop:'service_rule',
+          label:'服务时长规则',
+          width: 120,
+          formatter:(cell,data,value) => {
+            return value === 1 ? '单次限时' : '总时长'
+          }
+        },
+        {
+          prop:'frequency',
+          label:'周期内服务次数',
+          width: 130
+        },
         {
           prop:'purchase_price',
           label:'采购单价',
@@ -114,15 +127,16 @@ export default {
           }
         },
         {
-          prop:'time_lenth',
-          label:'单次时长',
+          label:'单次时长/总计时长',
           width: 160,
-          formatter:(cell,data,value)=>{
-            if(value){
-              return value
-            }else{
-              return '可变'
-            }
+          align:'right',
+          customFn:(row) => {
+            return (
+              <div>
+                <span>{ row.service_rule === 1 ? row.time_lenth : row.total }</span>
+                <span>{ row.service_rule === 1 ? ' (单次)' : ' (总计)' }</span>
+              </div>
+            )
           }
         },
         {