解决单据跳转的时候的无法加载供应商和客户的bug

2022-11-16 22:45:50 +08:00 · 2022-11-16 22:45:50 +08:00 · 1764ee66f3
commit 1764ee66f3
parent 60b332ca94
8 changed files with 94 additions and 94 deletions
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@ -40,9 +40,11 @@
              </a-col>
              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button type="primary" icon="search" @click="loadMaterialData(1)" title="查询"></a-button>
-                  <a-button style="margin-left: 8px" icon="reload" @click="searchReset(1)" title="重置"></a-button>
-                  <a-button style="margin-left: 8px" icon="plus" @click="addMaterial" title="添加"></a-button>
+                  <a-button type="primary" @click="loadMaterialData(1)">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
+                  <a-tooltip title="没查询到，决定新增商品！">
+                    <a-button style="margin-left: 8px" @click="addMaterial">新增</a-button>
+                  </a-tooltip>
                  <a @click="handleToggleSearch" style="margin-left: 8px">
                    {{ toggleSearchStatus ? '收起' : '展开' }}
                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@ -259,9 +259,13 @@
            this.loadDetailData(1)
          }
        } else {
-          this.getSelectBillDetailRows();
-          this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark)
-          this.close();
+          if(this.selectedDetailRowKeys.length) {
+            this.getSelectBillDetailRows()
+            this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark)
+            this.close()
+          } else {
+            this.$message.warning('抱歉，请选择单据明细！')
+          }
        }
      },
      //查询明细列表
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@ -393,21 +393,20 @@
          }
          this.materialTable.dataSource = listEx
          ///给优惠后金额重新赋值
-          if(allTaxLastMoney) {
-            let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
-            let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'organId': organId,
-                'linkNumber': linkNumber,
-                'discount': discount,
-                'discountMoney': discountMoney,
-                'discountLastMoney': discountLastMoney,
-                'changeAmount': discountLastMoney,
-                'remark': remark
-              })
+          allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
+          let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+          let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': organId,
+              'linkNumber': linkNumber,
+              'discount': discount,
+              'discountMoney': discountMoney,
+              'discountLastMoney': discountLastMoney,
+              'changeAmount': discountLastMoney,
+              'remark': remark
            })
-          }
+          })
        }
      },
    }
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@ -450,27 +450,26 @@
          }
          this.materialTable.dataSource = listEx
          ///给优惠后金额重新赋值
-          if(allTaxLastMoney) {
-            let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
-            let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
-            let changeAmount = discountLastMoney
-            if(deposit) {
-              this.depositStatus = true
-              changeAmount = (discountLastMoney - deposit).toFixed(2)-0
-            }
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'organId': organId,
-                'linkNumber': linkNumber,
-                'discount': discount,
-                'discountMoney': discountMoney,
-                'discountLastMoney': discountLastMoney,
-                'deposit': deposit,
-                'changeAmount': changeAmount,
-                'remark': remark
-              })
-            })
+          allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
+          let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+          let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+          let changeAmount = discountLastMoney
+          if(deposit) {
+            this.depositStatus = true
+            changeAmount = (discountLastMoney - deposit).toFixed(2)-0
          }
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': organId,
+              'linkNumber': linkNumber,
+              'discount': discount,
+              'discountMoney': discountMoney,
+              'discountLastMoney': discountLastMoney,
+              'deposit': deposit,
+              'changeAmount': changeAmount,
+              'remark': remark
+            })
+          })
        }
      },
    }
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@ -398,14 +398,13 @@
            })
          })
          //给优惠后金额重新赋值
-          if(discountLastMoney) {
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'discountLastMoney': discountLastMoney.toFixed(2),
-                'changeAmount': discountLastMoney
-              })
-            });
-          }
+          discountLastMoney = discountLastMoney?discountLastMoney:0
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'discountLastMoney': discountLastMoney.toFixed(2),
+              'changeAmount': discountLastMoney
+            })
+          })
          this.materialTable.dataSource = selectBillDetailRows
        }
      },
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@ -394,19 +394,18 @@
          }
          this.materialTable.dataSource = listEx
          ///给优惠后金额重新赋值
-          if(allTaxLastMoney) {
-            let discountLastMoney = (allTaxLastMoney).toFixed(2)-0
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'organId': organId,
-                'linkNumber': linkNumber,
-                'getAmount': discountLastMoney,
-                'changeAmount': discountLastMoney,
-                'backAmount': 0,
-                'remark': remark
-              })
+          allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
+          let discountLastMoney = (allTaxLastMoney).toFixed(2)-0
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': organId,
+              'linkNumber': linkNumber,
+              'getAmount': discountLastMoney,
+              'changeAmount': discountLastMoney,
+              'backAmount': 0,
+              'remark': remark
            })
-          }
+          })
        }
      },
    }
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@ -404,21 +404,20 @@
          }
          this.materialTable.dataSource = listEx
          ///给优惠后金额重新赋值
-          if(allTaxLastMoney) {
-            let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
-            let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'organId': organId,
-                'linkNumber': linkNumber,
-                'discount': discount,
-                'discountMoney': discountMoney,
-                'discountLastMoney': discountLastMoney,
-                'changeAmount': discountLastMoney,
-                'remark': remark
-              })
+          allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
+          let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+          let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': organId,
+              'linkNumber': linkNumber,
+              'discount': discount,
+              'discountMoney': discountMoney,
+              'discountLastMoney': discountLastMoney,
+              'changeAmount': discountLastMoney,
+              'remark': remark
            })
-          }
+          })
        }
      },
    }
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@ -468,27 +468,26 @@
          }
          this.materialTable.dataSource = listEx
          ///给优惠后金额重新赋值
-          if(allTaxLastMoney) {
-            let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
-            let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
-            let changeAmount = discountLastMoney
-            if(deposit) {
-              this.depositStatus = true
-              changeAmount = (discountLastMoney - deposit).toFixed(2)-0
-            }
-            this.$nextTick(() => {
-              this.form.setFieldsValue({
-                'organId': organId,
-                'linkNumber': linkNumber,
-                'discount': discount,
-                'discountMoney': discountMoney,
-                'discountLastMoney': discountLastMoney,
-                'deposit': deposit,
-                'changeAmount': changeAmount,
-                'remark': remark
-              })
-            })
+          allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
+          let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+          let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+          let changeAmount = discountLastMoney
+          if(deposit) {
+            this.depositStatus = true
+            changeAmount = (discountLastMoney - deposit).toFixed(2)-0
          }
+          this.$nextTick(() => {
+            this.form.setFieldsValue({
+              'organId': organId,
+              'linkNumber': linkNumber,
+              'discount': discount,
+              'discountMoney': discountMoney,
+              'discountLastMoney': discountLastMoney,
+              'deposit': deposit,
+              'changeAmount': changeAmount,
+              'remark': remark
+            })
+          })
        }
      },
    }