Commit 93e6068e authored by 陈明豪's avatar 陈明豪

Merge remote-tracking branch 'origin/master'

parents 233c7098 8793bdbe
...@@ -606,7 +606,7 @@ color: #333333;" ...@@ -606,7 +606,7 @@ color: #333333;"
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type="success" type="success"
@click="handleDetail(scope.row, 'stockDispenseOutboundList')" @click="handleDetail(scope.row, 'stockDispenseOutbounds')"
>查看 >查看
</el-button> </el-button>
<el-button <el-button
...@@ -1728,7 +1728,7 @@ export default { ...@@ -1728,7 +1728,7 @@ export default {
} else if (type === 'treatManageBo') { } else if (type === 'treatManageBo') {
const local = process.env.VUE_APP_WEB const local = process.env.VUE_APP_WEB
window.location.href = `${local}/pet-finance-web/inventory-management/drug-delivery-detail/${row.id}` window.location.href = `${local}/pet-finance-web/inventory-management/drug-delivery-detail/${row.id}`
} else if (type === 'stockDispenseOutboundList') { } else if (type === 'stockDispenseOutbounds') {
/* 跳转到配药出库详情*/ /* 跳转到配药出库详情*/
this.$router.push({ this.$router.push({
name: 'EquipmentAdd', name: 'EquipmentAdd',
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
:data="treatmentList" :data="treatmentList"
:row-key="getRowKeys" :row-key="getRowKeys"
:header-cell-class-name="cellClass" :header-cell-class-name="cellClass"
:header-cell-style="{ background:'#E8E9E8' }" :header-cell-style="{ background:'#F4F4F4' }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" /> <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment