diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 72279181..41a6b2ca 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -254,9 +254,8 @@ export const JeecgListMixin = { this.loadData(); }, handleDetail:function(record){ - this.$refs.modalForm.edit(record); - this.$refs.modalForm.title="详情"; - this.$refs.modalForm.disableSubmit = true; + this.$refs.modalDetail.show(record); + this.$refs.modalDetail.title="详情"; }, /* 导出 */ handleExportXls2(){ diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index e7ef2d44..8abfa225 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -62,6 +62,8 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> + 查看 + 编辑 @@ -73,10 +75,12 @@ + + + \ No newline at end of file diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index b1d974e2..b0b9b97e 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -24,7 +24,6 @@ export const BillListMixin = { this.handleEdit(record); }, myHandleDetail(record) { - this.$refs.modalForm.action = "detail"; this.handleDetail(record); }, handleApprove(record) { diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue new file mode 100644 index 00000000..222d8b97 --- /dev/null +++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file