Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
chendaze 2024-03-25 16:29:29 +08:00
commit 902769298c

View File

@ -123,7 +123,7 @@
</div> </div>
<s-table <s-table
size='default' size='default'
ref='table' ref='itemTable'
rowKey='id' rowKey='id'
:rowSelection='{ selectedRowKeys: selectedItemRowKeys, onChange: onItemSelectChange }' :rowSelection='{ selectedRowKeys: selectedItemRowKeys, onChange: onItemSelectChange }'
:columns='itemColumns' :columns='itemColumns'
@ -166,7 +166,7 @@
</div> </div>
<s-table <s-table
size='default' size='default'
ref='table' ref='serveTable'
rowKey='id' rowKey='id'
:rowSelection='{ selectedRowKeys: selectedServeRowKeys, onChange: onServeSelectChange }' :rowSelection='{ selectedRowKeys: selectedServeRowKeys, onChange: onServeSelectChange }'
:columns='serveColumns' :columns='serveColumns'
@ -357,7 +357,7 @@ export default {
this.visible = false this.visible = false
this.selectedItemRowKeys = [] this.selectedItemRowKeys = []
this.selectedItemRows = [] this.selectedItemRows = []
window.location.reload() this.handleOk()
} }
}) })
}, },
@ -371,11 +371,10 @@ export default {
addRoomServe(params).then((res) => { addRoomServe(params).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success('关联成功') this.$message.success('关联成功')
this.handleOk()
this.visible1 = false this.visible1 = false
this.selectedServeRowKeys = [] this.selectedServeRowKeys = []
this.selectedServeRows = [] this.selectedServeRows = []
window.location.reload() this.handleOk()
} }
}) })