From d41de4e95298c3fc5822f5ea059c90594fcdb9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 15 Dec 2023 16:45:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF+j?= =?UTF-8?q?ob+store+inventory=E3=80=91=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/commonTabel-drawer/index.vue | 4 ++-- PC/InterFace.Dash/src/mixins/TableMixins.js | 8 +++++++- .../src/components/commonTabel-drawer/index.vue | 4 ++-- PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js | 8 +++++++- .../src/components/commonTabel-drawer/index.vue | 4 ++-- PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js | 8 +++++++- PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js | 3 +-- .../src/components/commonTabel-drawer/index.vue | 4 ++-- PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js | 8 +++++++- 9 files changed, 37 insertions(+), 14 deletions(-) diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue index 1f9adc4..0686632 100644 --- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue +++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue @@ -335,7 +335,7 @@ export default { label: "详情", name: 'xq' }] - if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ + if(this.propsData.masterInfo){ this.initDropdownTabsData.push({ label: "主表信息", name: 'masterInfo' @@ -401,7 +401,7 @@ export default { MaxResultCount: 20, }, totalCountForDetail:0, - //明细-查看主表的连接id + //当前路由的配置 URLOption:allUrlOption[this.$route.name], //明细-查看主表的连接id URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js index 1628aef..09f1cd8 100644 --- a/PC/InterFace.Dash/src/mixins/TableMixins.js +++ b/PC/InterFace.Dash/src/mixins/TableMixins.js @@ -252,7 +252,13 @@ export const tableMixins = { _allRes.masterInfo = res[1] this.initInlineHttpBack(_allRes) }).catch(()=>{ - this.Loading.DrawerLoading = false + getDetailed(val.id, _url) + .then(info=>{ + this.initInlineHttpBack(info) + this.Loading.DrawerLoading = false + }).catch((data)=>{ + this.Loading.DrawerLoading = false + }) }) } // 没有主表信息 diff --git a/PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue index 1f9adc4..0686632 100644 --- a/PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue +++ b/PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue @@ -335,7 +335,7 @@ export default { label: "详情", name: 'xq' }] - if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ + if(this.propsData.masterInfo){ this.initDropdownTabsData.push({ label: "主表信息", name: 'masterInfo' @@ -401,7 +401,7 @@ export default { MaxResultCount: 20, }, totalCountForDetail:0, - //明细-查看主表的连接id + //当前路由的配置 URLOption:allUrlOption[this.$route.name], //明细-查看主表的连接id URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', diff --git a/PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js b/PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js index 1628aef..09f1cd8 100644 --- a/PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js +++ b/PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js @@ -252,7 +252,13 @@ export const tableMixins = { _allRes.masterInfo = res[1] this.initInlineHttpBack(_allRes) }).catch(()=>{ - this.Loading.DrawerLoading = false + getDetailed(val.id, _url) + .then(info=>{ + this.initInlineHttpBack(info) + this.Loading.DrawerLoading = false + }).catch((data)=>{ + this.Loading.DrawerLoading = false + }) }) } // 没有主表信息 diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue index 1f9adc4..0686632 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue +++ b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue @@ -335,7 +335,7 @@ export default { label: "详情", name: 'xq' }] - if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ + if(this.propsData.masterInfo){ this.initDropdownTabsData.push({ label: "主表信息", name: 'masterInfo' @@ -401,7 +401,7 @@ export default { MaxResultCount: 20, }, totalCountForDetail:0, - //明细-查看主表的连接id + //当前路由的配置 URLOption:allUrlOption[this.$route.name], //明细-查看主表的连接id URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', diff --git a/PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js b/PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js index 1628aef..09f1cd8 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js +++ b/PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js @@ -252,7 +252,13 @@ export const tableMixins = { _allRes.masterInfo = res[1] this.initInlineHttpBack(_allRes) }).catch(()=>{ - this.Loading.DrawerLoading = false + getDetailed(val.id, _url) + .then(info=>{ + this.initInlineHttpBack(info) + this.Loading.DrawerLoading = false + }).catch((data)=>{ + this.Loading.DrawerLoading = false + }) }) } // 没有主表信息 diff --git a/PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js b/PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js index c7e5476..83e4b4f 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js +++ b/PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js @@ -86,8 +86,7 @@ export const InspectJobDetail = { export const InspectJobSummaryDetail = { baseURL:'InspectJobSummaryDetail/base',//主表-列表 detailURL:'app/inspect-job-summary-detail',//主表-明细 + 明细-查看主表 - hasDetail:true, - isMaster:false + hasDetail:false } export const IssueJob = { diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue index 1f9adc4..0686632 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue +++ b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue @@ -335,7 +335,7 @@ export default { label: "详情", name: 'xq' }] - if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ + if(this.propsData.masterInfo){ this.initDropdownTabsData.push({ label: "主表信息", name: 'masterInfo' @@ -401,7 +401,7 @@ export default { MaxResultCount: 20, }, totalCountForDetail:0, - //明细-查看主表的连接id + //当前路由的配置 URLOption:allUrlOption[this.$route.name], //明细-查看主表的连接id URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', diff --git a/PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js b/PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js index 1628aef..09f1cd8 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js +++ b/PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js @@ -252,7 +252,13 @@ export const tableMixins = { _allRes.masterInfo = res[1] this.initInlineHttpBack(_allRes) }).catch(()=>{ - this.Loading.DrawerLoading = false + getDetailed(val.id, _url) + .then(info=>{ + this.initInlineHttpBack(info) + this.Loading.DrawerLoading = false + }).catch((data)=>{ + this.Loading.DrawerLoading = false + }) }) } // 没有主表信息