Browse Source

【接口看板+job+store+inventory】优化更新

master
安虹睿 11 months ago
parent
commit
d41de4e952
  1. 4
      PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
  2. 6
      PC/InterFace.Dash/src/mixins/TableMixins.js
  3. 4
      PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue
  4. 6
      PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js
  5. 4
      PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue
  6. 6
      PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js
  7. 3
      PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js
  8. 4
      PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue
  9. 6
      PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js

4
PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue

@ -335,7 +335,7 @@ export default {
label: "详情", label: "详情",
name: 'xq' name: 'xq'
}] }]
if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ if(this.propsData.masterInfo){
this.initDropdownTabsData.push({ this.initDropdownTabsData.push({
label: "主表信息", label: "主表信息",
name: 'masterInfo' name: 'masterInfo'
@ -401,7 +401,7 @@ export default {
MaxResultCount: 20, MaxResultCount: 20,
}, },
totalCountForDetail:0, totalCountForDetail:0,
//-id //
URLOption:allUrlOption[this.$route.name], URLOption:allUrlOption[this.$route.name],
//-id //-id
URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',

6
PC/InterFace.Dash/src/mixins/TableMixins.js

@ -252,8 +252,14 @@ export const tableMixins = {
_allRes.masterInfo = res[1] _allRes.masterInfo = res[1]
this.initInlineHttpBack(_allRes) this.initInlineHttpBack(_allRes)
}).catch(()=>{ }).catch(()=>{
getDetailed(val.id, _url)
.then(info=>{
this.initInlineHttpBack(info)
this.Loading.DrawerLoading = false
}).catch((data)=>{
this.Loading.DrawerLoading = false this.Loading.DrawerLoading = false
}) })
})
} }
// 没有主表信息 // 没有主表信息
else{ else{

4
PC/UI.WinIn.FasterZ.Inventory/src/components/commonTabel-drawer/index.vue

@ -335,7 +335,7 @@ export default {
label: "详情", label: "详情",
name: 'xq' name: 'xq'
}] }]
if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ if(this.propsData.masterInfo){
this.initDropdownTabsData.push({ this.initDropdownTabsData.push({
label: "主表信息", label: "主表信息",
name: 'masterInfo' name: 'masterInfo'
@ -401,7 +401,7 @@ export default {
MaxResultCount: 20, MaxResultCount: 20,
}, },
totalCountForDetail:0, totalCountForDetail:0,
//-id //
URLOption:allUrlOption[this.$route.name], URLOption:allUrlOption[this.$route.name],
//-id //-id
URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',

6
PC/UI.WinIn.FasterZ.Inventory/src/mixins/TableMixins.js

@ -252,8 +252,14 @@ export const tableMixins = {
_allRes.masterInfo = res[1] _allRes.masterInfo = res[1]
this.initInlineHttpBack(_allRes) this.initInlineHttpBack(_allRes)
}).catch(()=>{ }).catch(()=>{
getDetailed(val.id, _url)
.then(info=>{
this.initInlineHttpBack(info)
this.Loading.DrawerLoading = false
}).catch((data)=>{
this.Loading.DrawerLoading = false this.Loading.DrawerLoading = false
}) })
})
} }
// 没有主表信息 // 没有主表信息
else{ else{

4
PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue

@ -335,7 +335,7 @@ export default {
label: "详情", label: "详情",
name: 'xq' name: 'xq'
}] }]
if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ if(this.propsData.masterInfo){
this.initDropdownTabsData.push({ this.initDropdownTabsData.push({
label: "主表信息", label: "主表信息",
name: 'masterInfo' name: 'masterInfo'
@ -401,7 +401,7 @@ export default {
MaxResultCount: 20, MaxResultCount: 20,
}, },
totalCountForDetail:0, totalCountForDetail:0,
//-id //
URLOption:allUrlOption[this.$route.name], URLOption:allUrlOption[this.$route.name],
//-id //-id
URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',

6
PC/UI.WinIn.FasterZ.Job/src/mixins/TableMixins.js

@ -252,8 +252,14 @@ export const tableMixins = {
_allRes.masterInfo = res[1] _allRes.masterInfo = res[1]
this.initInlineHttpBack(_allRes) this.initInlineHttpBack(_allRes)
}).catch(()=>{ }).catch(()=>{
getDetailed(val.id, _url)
.then(info=>{
this.initInlineHttpBack(info)
this.Loading.DrawerLoading = false
}).catch((data)=>{
this.Loading.DrawerLoading = false this.Loading.DrawerLoading = false
}) })
})
} }
// 没有主表信息 // 没有主表信息
else{ else{

3
PC/UI.WinIn.FasterZ.Job/src/utils/baseData/urlOption.js

@ -86,8 +86,7 @@ export const InspectJobDetail = {
export const InspectJobSummaryDetail = { export const InspectJobSummaryDetail = {
baseURL:'InspectJobSummaryDetail/base',//主表-列表 baseURL:'InspectJobSummaryDetail/base',//主表-列表
detailURL:'app/inspect-job-summary-detail',//主表-明细 + 明细-查看主表 detailURL:'app/inspect-job-summary-detail',//主表-明细 + 明细-查看主表
hasDetail:true, hasDetail:false
isMaster:false
} }
export const IssueJob = { export const IssueJob = {

4
PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue

@ -335,7 +335,7 @@ export default {
label: "详情", label: "详情",
name: 'xq' name: 'xq'
}] }]
if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){ if(this.propsData.masterInfo){
this.initDropdownTabsData.push({ this.initDropdownTabsData.push({
label: "主表信息", label: "主表信息",
name: 'masterInfo' name: 'masterInfo'
@ -401,7 +401,7 @@ export default {
MaxResultCount: 20, MaxResultCount: 20,
}, },
totalCountForDetail:0, totalCountForDetail:0,
//-id //
URLOption:allUrlOption[this.$route.name], URLOption:allUrlOption[this.$route.name],
//-id //-id
URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId', URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',

6
PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js

@ -252,8 +252,14 @@ export const tableMixins = {
_allRes.masterInfo = res[1] _allRes.masterInfo = res[1]
this.initInlineHttpBack(_allRes) this.initInlineHttpBack(_allRes)
}).catch(()=>{ }).catch(()=>{
getDetailed(val.id, _url)
.then(info=>{
this.initInlineHttpBack(info)
this.Loading.DrawerLoading = false
}).catch((data)=>{
this.Loading.DrawerLoading = false this.Loading.DrawerLoading = false
}) })
})
} }
// 没有主表信息 // 没有主表信息
else{ else{

Loading…
Cancel
Save