diff --git a/jshERP-web/public/static/screenshot/1.jpg b/jshERP-web/public/static/screenshot/1.jpg index d9c205f9..d2463558 100644 Binary files a/jshERP-web/public/static/screenshot/1.jpg and b/jshERP-web/public/static/screenshot/1.jpg differ diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue index c9f9f733..14fd9c5f 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue @@ -131,9 +131,13 @@ loadData(arg) { if(this.rows) { if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){ - let depotItemId = JSON.parse(this.rows).id - if(depotItemId.length<=19) { - this.queryParam.depotItemId = depotItemId-0 + let isEdit = JSON.parse(this.rows).isEdit + if(isEdit) { + //只有在保存之后的编辑页面下才获取明细id + let depotItemId = JSON.parse(this.rows).id + if (depotItemId.length <= 19) { + this.queryParam.depotItemId = depotItemId-0 + } } this.queryParam.depotId = JSON.parse(this.rows).depotId-0 this.queryParam.barCode = JSON.parse(this.rows).barCode @@ -176,9 +180,13 @@ if(this.rows) { this.queryParam.name='' if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){ - let depotItemId = JSON.parse(this.rows).id - if(depotItemId.length<=19) { - this.queryParam.depotItemId = depotItemId-0 + let isEdit = JSON.parse(this.rows).isEdit + if(isEdit) { + //只有在保存之后的编辑页面下才获取明细id + let depotItemId = JSON.parse(this.rows).id + if(depotItemId.length<=19) { + this.queryParam.depotItemId = depotItemId-0 + } } this.queryParam.depotId = JSON.parse(this.rows).depotId-0 this.queryParam.barCode = JSON.parse(this.rows).barCode diff --git a/jshERP-web/src/components/layouts/UserLayout.vue b/jshERP-web/src/components/layouts/UserLayout.vue index fcdc4e11..b25ae903 100644 --- a/jshERP-web/src/components/layouts/UserLayout.vue +++ b/jshERP-web/src/components/layouts/UserLayout.vue @@ -12,7 +12,7 @@ {{systemTitle}} - V3.3 + V3.5 diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index d1e0ea6b..0cc16e63 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -143,6 +143,7 @@ export const BillModalMixin = { tab.dataSource = res.data.rows for(let i=0; i { if (res && res.code === 200) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 49032435..2d6b68d1 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -266,6 +266,7 @@ { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '6%', type: FormTypes.input }, { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden }, + { title: '是否再次编辑', key: 'isEdit', width: '5%', type: FormTypes.hidden }, ] }, confirmLoading: false, diff --git a/jshERP-web/src/views/dashboard/IndexChart.vue b/jshERP-web/src/views/dashboard/IndexChart.vue index a47bfa7f..f48817fa 100644 --- a/jshERP-web/src/views/dashboard/IndexChart.vue +++ b/jshERP-web/src/views/dashboard/IndexChart.vue @@ -133,7 +133,7 @@ 管伊佳ERP微信小程序 - © 2015-2030 {{systemTitle}} V3.3 + © 2015-2030 {{systemTitle}} V3.5 试用到期:{{tenant.expireTime}} 试用用户:{{tenant.userCurrentNum}}/{{tenant.userNumLimit}}