lilei 3 vuotta sitten
vanhempi
commit
46ae8300ca

+ 5 - 3
src/views/Home.vue

@@ -124,7 +124,7 @@
                     class="page-nav-badge"
                     v-for="(unitItem, unitInd) in subItem"
                     :key="unitInd"
-                    @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem) : null"
+                    @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem,subInd) : null"
                     :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
                     <div :class="['page-nav-item', unitItem.styleC]">
                       <div class="page-nav-n">
@@ -681,7 +681,7 @@ export default {
       })
     },
     // 导航跳转
-    goPage (data) {
+    goPage (data, subInd) {
       if (data) {
         // 有待办数据,则跳转带有条件的;若无待办数据,则跳转全部数据
         if (data.orderNum && this.countData[data.orderNum]) {
@@ -700,7 +700,9 @@ export default {
             this.$router.push({ path: data.url, query: { pageParams: null } })
           }
         }
-        this.$store.state.app.isHomeNav = true
+        if (subInd == '1') {
+          this.$store.state.app.isHomeNav = true
+        }
       }
     },
     // 数据看板信息

+ 6 - 3
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -88,7 +88,7 @@
                       @change="amountSettledTotalChange"
                       :precision="2"
                       placeholder=""
-                      :max="Math.abs(currentTotalBalance)"
+                      :max="maxAmountSettled"
                       style="width: 100%;" />
                   </a-form-model-item>
                 </a-col>
@@ -211,7 +211,8 @@ export default {
       },
       openModal: false, //  弹框
       isPositive: true, // 是否是正值
-      isChangeAs: false
+      isChangeAs: false,
+      maxAmountSettled: 0
     }
   },
   computed: {
@@ -271,12 +272,13 @@ export default {
         val = val / 1000
         this.isPositive = val > 0
         this.form.amountSettled = Math.abs(val)
+        this.maxAmountSettled = Math.abs(val)
       }
     },
     // 修改本次结算金额,自动分配
     amountSettledTotalChange (v) {
       console.log(this.isChangeAs, v, this.totalBalance, this.isPositive)
-      if (v < Math.abs(this.totalBalance)) {
+      if (v <= Math.abs(this.totalBalance)) {
         this.isChangeAs = true
         const sa = v
         const list = this.chooseLoadData
@@ -284,6 +286,7 @@ export default {
         list.map((item, index) => {
           item.settleAmount = item.unsettleAmount
         })
+        this.maxAmountSettled = Math.abs(this.totalBalance)
         // 开始计算
         let temp = 0
         let ti = 0