From 875e3e136e744edbd3c1538ecf4755b3b744e786 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Wed, 28 Sep 2022 15:56:32 +0800
Subject: [PATCH] 2022.9.28

---
 src/views/business/component/addBusiness.vue  | 11 ++++++++
 src/views/finance/collectMoney.vue            |  4 +--
 .../finance/component/addcollectMoney.vue     | 28 +++++++++++++++++--
 src/views/finance/component/scheduleList.vue  | 20 +++++++++++++
 src/views/schedule/component/timeSelect.vue   |  9 ++++++
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 src/views/finance/component/scheduleList.vue

diff --git a/src/views/business/component/addBusiness.vue b/src/views/business/component/addBusiness.vue
index 5ff9b7b..cc38b1e 100644
--- a/src/views/business/component/addBusiness.vue
+++ b/src/views/business/component/addBusiness.vue
@@ -84,13 +84,19 @@
         </div>
       </template>
     </xy-dialog>
+
+    <scheduleList ref="scheduleList"></scheduleList>
   </div>
 </template>
 
 <script>
 import {getForm, save} from '@/api/productType'
 
+import scheduleList from "@/views/finance/component/scheduleList";
 export default {
+  components:{
+    scheduleList
+  },
   props:{
     skus:{
       type:Array,
@@ -129,6 +135,11 @@ export default {
       const res = await getForm(this.id)
 
       this.$integrateData(this.form, res)
+      this.form.product_sku_list = res.product_skus.map(item => {
+        return {
+          sku_id:item.sku_id
+        }
+      })
       console.log(res)
     },
 
diff --git a/src/views/finance/collectMoney.vue b/src/views/finance/collectMoney.vue
index 1503fe6..28927ae 100644
--- a/src/views/finance/collectMoney.vue
+++ b/src/views/finance/collectMoney.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import {getList,destroy,scheduleList} from '@/api/collectMoney'
+import {getList,destroy} from '@/api/collectMoney'
 import {parseTime} from "@/utils"
 
 import add from "./component/addcollectMoney"
@@ -51,7 +51,7 @@ export default {
   methods: {
 
     async getList(){
-      const res = await scheduleList(this.select)
+      const res = await getList(this.select)
       this.total = res.total
       this.list = res.data
       console.log(this.list)
diff --git a/src/views/finance/component/addcollectMoney.vue b/src/views/finance/component/addcollectMoney.vue
index 587b9a8..b00fbec 100644
--- a/src/views/finance/component/addcollectMoney.vue
+++ b/src/views/finance/component/addcollectMoney.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <xy-dialog
+      :width="74"
       ref="dialog"
       :is-show.sync="isShow"
       type="form"
@@ -77,9 +78,14 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>排班信息：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.schedule_links " style="width: 300px" placeholder="请选择排班信息">
+            <div class="xy-table-item-content-schedule">
+              <template v-if="form.schedule_links.length > 0">
 
-            </el-select>
+              </template>
+              <template v-else>
+                请选择排班
+              </template>
+            </div>
           </div>
         </div>
       </template>
@@ -102,7 +108,7 @@ export default {
         invoice_type:'',
         date:'',
         status:'',
-        schedule_links:'',
+        schedule_links:[],
       },
       rules:{
         pay_name:[
@@ -112,6 +118,7 @@ export default {
     }
   },
   methods: {
+
     async getDetail(){
       const res = await getForm(this.id)
       this.$integrateData(this.form,res)
@@ -154,4 +161,19 @@ export default {
 ::v-deep .el-input__inner{
   text-align: left;
 }
+.xy-table-item-content-schedule{
+  color: #C0C4CC;;
+  width: 300px;
+  height: 40px;
+  line-height: 40px;
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  border: 1px solid #DCDFE6;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  padding: 0 15px;
+  &:hover{
+    border: 1px solid #C0C4CC;
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  }
+}
 </style>
diff --git a/src/views/finance/component/scheduleList.vue b/src/views/finance/component/scheduleList.vue
new file mode 100644
index 0000000..3130a64
--- /dev/null
+++ b/src/views/finance/component/scheduleList.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow"></xy-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isShow:false
+    }
+  },
+  methods: {},
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index d055ab6..b00735e 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -35,6 +35,7 @@
               <template v-for="(item) in skus">
                 <el-checkbox :label="item.sku.id">{{ item.sku.name }}</el-checkbox>
               </template>
+              <el-checkbox :indeterminate="indeterminate" @change="handleCheckAllChange">全选</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
         </el-form>
@@ -83,6 +84,8 @@ export default {
   },
   data() {
     return {
+      checkAll:false,
+      indeterminate:false,
       form: {
         id:'',
         customer_id: '',
@@ -111,6 +114,12 @@ export default {
     }
   },
   methods: {
+    handleCheckAllChange(val){
+      this.form.schedule_list_skus = val ? this.skus.map(item => {
+        return item.sku.id
+      }) : []
+      this.indeterminate =! this.indeterminate
+    },
     submit() {
       this.form.customer_id = this.customerId
       this.form.product_id = this.productId