purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
季圣华
2022-11-16 22:45:50 +08:00
parent 60b332ca94
commit 1764ee66f3
8 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View File

@@ -40,9 +40,11 @@
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button type="primary" icon="search" @click="loadMaterialData(1)" title="查询"></a-button> <a-button type="primary" @click="loadMaterialData(1)">查询</a-button>
<a-button style="margin-left: 8px" icon="reload" @click="searchReset(1)" title="重置"></a-button> <a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
<a-button style="margin-left: 8px" icon="plus" @click="addMaterial" title="添加"></a-button> <a-tooltip title="没查询到，决定新增商品！">
<a-button style="margin-left: 8px" @click="addMaterial">新增</a-button>
</a-tooltip>
<a @click="handleToggleSearch" style="margin-left: 8px"> <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }} {{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>

8
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View File

@@ -259,9 +259,13 @@
this.loadDetailData(1) this.loadDetailData(1)
} }
} else { } else {
this.getSelectBillDetailRows(); if(this.selectedDetailRowKeys.length) {
this.getSelectBillDetailRows()
this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark) this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark)
this.close(); this.close()
} else {
this.$message.warning('抱歉，请选择单据明细！')
}
} }
}, },
//查询明细列表 //查询明细列表

3
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -393,7 +393,7 @@
} }
this.materialTable.dataSource = listEx this.materialTable.dataSource = listEx
///给优惠后金额重新赋值 ///给优惠后金额重新赋值
if(allTaxLastMoney) { allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
this.$nextTick(() => { this.$nextTick(() => {
@@ -408,7 +408,6 @@
}) })
}) })
} }
}
}, },
} }
} }

3
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -450,7 +450,7 @@
} }
this.materialTable.dataSource = listEx this.materialTable.dataSource = listEx
///给优惠后金额重新赋值 ///给优惠后金额重新赋值
if(allTaxLastMoney) { allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
let changeAmount = discountLastMoney let changeAmount = discountLastMoney
@@ -471,7 +471,6 @@
}) })
}) })
} }
}
}, },
} }
} }

5
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -398,14 +398,13 @@
}) })
}) })
//给优惠后金额重新赋值 //给优惠后金额重新赋值
if(discountLastMoney) { discountLastMoney = discountLastMoney?discountLastMoney:0
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
'discountLastMoney': discountLastMoney.toFixed(2), 'discountLastMoney': discountLastMoney.toFixed(2),
'changeAmount': discountLastMoney 'changeAmount': discountLastMoney
}) })
}); })
}
this.materialTable.dataSource = selectBillDetailRows this.materialTable.dataSource = selectBillDetailRows
} }
}, },

3
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -394,7 +394,7 @@
} }
this.materialTable.dataSource = listEx this.materialTable.dataSource = listEx
///给优惠后金额重新赋值 ///给优惠后金额重新赋值
if(allTaxLastMoney) { allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
let discountLastMoney = (allTaxLastMoney).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney).toFixed(2)-0
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({
@@ -407,7 +407,6 @@
}) })
}) })
} }
}
}, },
} }
} }

3
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -404,7 +404,7 @@
} }
this.materialTable.dataSource = listEx this.materialTable.dataSource = listEx
///给优惠后金额重新赋值 ///给优惠后金额重新赋值
if(allTaxLastMoney) { allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
this.$nextTick(() => { this.$nextTick(() => {
@@ -419,7 +419,6 @@
}) })
}) })
} }
}
}, },
} }
} }

3
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -468,7 +468,7 @@
} }
this.materialTable.dataSource = listEx this.materialTable.dataSource = listEx
///给优惠后金额重新赋值 ///给优惠后金额重新赋值
if(allTaxLastMoney) { allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0
let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
let changeAmount = discountLastMoney let changeAmount = discountLastMoney
@@ -489,7 +489,6 @@
}) })
}) })
} }
}
}, },
} }
} }