From 8dcbe3d898f6c60ef3226095d994ca8953bf5f6d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 18:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 admin/src/views/contract/components/terminateLease.vue |   80 ++++++++++++++++++++++++++++------------
 1 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 31fda94..6bb8929 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -24,7 +24,6 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="閫�绉熸棩鏈�" prop="btDate" style="width: 33%;">
-<!--                            @change="changeBtDate"-->
                             <el-date-picker
                                 v-model="form.btDate"
                                 type="date"
@@ -197,12 +196,16 @@
   import AddPaymentBill from './addPaymentBill'
   import { getUserList } from '@/api/system/user'
   import { backRent, getCanBackBill } from '@/api/contract'
+  import { mapState } from 'vuex'
   export default {
     name: "terminateLease",
     components: {
       GlobalWindow,
       AddCollectionBill,
       AddPaymentBill
+    },
+    computed: {
+      ...mapState(['userInfo'])
     },
     extends: BaseOpera,
     data() {
@@ -245,30 +248,33 @@
       }
     },
     watch: {
-      info: {
-        deep: true,
-        immediate: true,
-        handler(news, olds) {
-          const arr = [...this.info.terminateList, ...this.info.depositList]
-          let total1 = 0
-          let total2 = 0
-          arr.forEach(item => {
-            if (item.billType === 0) {
-              total1 += Number(item.price)
-            } else if (item.billType === 1) {
-              total2 += Number(item.price)
-            }
-          })
-          this.receivable = total1
-          this.meet = total2
-        }
-      }
+      // info: {
+      //   deep: true,
+      //   immediate: true,
+      //   handler(news, olds) {
+      //     const arr = [...this.info.terminateList, ...this.info.depositList]
+      //     let total1 = 0
+      //     let total2 = 0
+      //     arr.forEach(item => {
+      //       if (item.billType === 0) {
+      //         total1 += Number(item.price)
+      //       } else if (item.billType === 1) {
+      //         total2 += Number(item.price)
+      //       }
+      //     })
+      //     this.receivable = total1
+      //     this.meet = total2
+      //   }
+      // }
     },
     methods: {
       open (title, info) {
         this.title = title
         this.info = info
         this.form.id = info.id
+        this.form.btSignDate = this.getDay()
+        console.log(this.userInfo)
+        this.form.btUserId = this.userInfo.id
         this.$nextTick(() => {
           this.$refs.form.resetFields()
         })
@@ -294,8 +300,30 @@
             return item
           }
         })
+        this.countData()
         this.getUser()
         this.visible = true
+      },
+      countData () {
+        const arr = [...this.info.terminateList, ...this.info.depositList]
+        let total1 = 0
+        let total2 = 0
+        arr.forEach(item => {
+          if (item.billType === 0) {
+            total1 += Number(item.price)
+          } else if (item.billType === 1) {
+            total2 += Number(item.price)
+          }
+        })
+        this.receivable = total1
+        this.meet = total2
+      },
+      getDay () {
+        const today = new Date();
+        const year = today.getFullYear();
+        const month = today.getMonth() + 1; // 鏈堜唤鏄粠 0 寮�濮嬬殑锛屽洜姝ら渶瑕佸姞 1
+        const day = today.getDate();
+        return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
       },
       addZD () {
         if (!this.form.btDate) return this.$message.warning('璇烽�夋嫨閫�绉熸棩鏈�')
@@ -317,6 +345,7 @@
           renterName: this.info.renterName,
           renterId: this.info.renterId,
           billType: 1,
+          feeType: 0,
           billTypeCopy: 1
         }, { startDate: this.info.startDate, endDate: this.form.btDate })
       },
@@ -337,16 +366,18 @@
               return item
             }
           })
+          this.countData()
         }).finally(() => {
           this.loading = false
         })
       },
       getObjS (obj) {
         this.info.terminateList.push(obj)
-        this.info.terminateList.forEach(item => {
-          item.receivableFee = Number(item.receivableFee) + 1
-          item.receivableFee = Number(item.receivableFee) - 1
-        })
+        // this.info.terminateList.forEach(item => {
+        //   item.receivableFee = Number(item.receivableFee) + 1
+        //   item.receivableFee = Number(item.receivableFee) - 1
+        // })
+        this.countData()
       },
       confirm () {
         this.$refs.form.validate((valid) => {
@@ -388,6 +419,7 @@
         if (Number(num) > row.receivableFeeCopy) {
           row.receivableFee = ''
           row.price = 0
+          this.countData()
           this.$message.warning('涓嶈兘澶т簬鍘熷搴旀敹浠橀噾棰�')
         } else {
           if (num) {
@@ -413,9 +445,9 @@
           } else {
             row.price = 0
             row.billType = row.billTypeCopy
-            console.log('billTypeCopy', row.billTypeCopy)
           }
           row.price = Math.abs(row.price);
+          this.countData()
         }
       }
     }

--
Gitblit v1.9.3