Commit 32586b8a authored by jingnan's avatar jingnan 👀

看板跳转站位缺件明细修改

parent c5de55b0
...@@ -1905,6 +1905,7 @@ ...@@ -1905,6 +1905,7 @@
<ExpireWarningDialog ref="ExpireWarningDialog" /> <ExpireWarningDialog ref="ExpireWarningDialog" />
<SummaryOfStationMissingPartsDialog <SummaryOfStationMissingPartsDialog
ref="SummaryOfStationMissingPartsDialog" ref="SummaryOfStationMissingPartsDialog"
:summary-of-station-missing-parts-params="summaryOfStationMissingPartsParams"
/> />
<SiteProblemManagementSummaryDialog <SiteProblemManagementSummaryDialog
ref="SiteProblemManagementSummaryDialog" ref="SiteProblemManagementSummaryDialog"
...@@ -2604,10 +2605,6 @@ export default { ...@@ -2604,10 +2605,6 @@ export default {
const chartDom = document.getElementById('outsourcEchart') const chartDom = document.getElementById('outsourcEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做,需要做的时候删除这段代码!')
return
}
that.routerSummaryOfStationMissingParts( that.routerSummaryOfStationMissingParts(
'外购成品', '外购成品',
params.name, params.name,
...@@ -2648,10 +2645,6 @@ export default { ...@@ -2648,10 +2645,6 @@ export default {
const chartDom = document.getElementById('sparepartsEchart') const chartDom = document.getElementById('sparepartsEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做,需要做的时候删除这段代码!')
return
}
that.routerSummaryOfStationMissingParts( that.routerSummaryOfStationMissingParts(
'零组件', '零组件',
params.name, params.name,
...@@ -2690,10 +2683,6 @@ export default { ...@@ -2690,10 +2683,6 @@ export default {
const chartDom = document.getElementById('standardEchart') const chartDom = document.getElementById('standardEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做,需要做的时候删除这段代码!')
return
}
that.routerSummaryOfStationMissingParts( that.routerSummaryOfStationMissingParts(
'标准件', '标准件',
params.name, params.name,
...@@ -2791,7 +2780,7 @@ export default { ...@@ -2791,7 +2780,7 @@ export default {
if (res.message.includes('成功')) { if (res.message.includes('成功')) {
Object.entries(res.items).forEach(([key, value]) => { Object.entries(res.items).forEach(([key, value]) => {
const targetIndex = superviseOption.series[0].data.findIndex(el => (el.name === key)) const targetIndex = superviseOption.series[0].data.findIndex(el => (el.name === key))
superviseOption.series[0].data[targetIndex].value = value superviseOption.series[0].data[targetIndex] && (superviseOption.series[0].data[targetIndex].value = value)
}) })
} }
}) })
...@@ -2987,7 +2976,9 @@ export default { ...@@ -2987,7 +2976,9 @@ export default {
name: 'summaryOfStationMissingParts', name: 'summaryOfStationMissingParts',
query: { query: {
name: name, name: name,
serialNumber: serialNumber, rootPage: 'AssembleKanban',
serialNumber: this.$route.query.serialNumber,
sorties: this.$route.query.sorties,
seriesName: seriesName seriesName: seriesName
} }
} }
......
...@@ -56,6 +56,11 @@ export default { ...@@ -56,6 +56,11 @@ export default {
'fieldName': 'sorties', 'fieldName': 'sorties',
'operator': 'EQ', 'operator': 'EQ',
'value': queryData.sorties 'value': queryData.sorties
},
{
'fieldName': 'state',
'operator': 'NEQ',
'value': 'Finish'
} }
] ]
if (queryData.rootPage === 'ExperimentKanban') { if (queryData.rootPage === 'ExperimentKanban') {
......
...@@ -9,30 +9,75 @@ ...@@ -9,30 +9,75 @@
class="summary-of-station-missing-parts-dialog" class="summary-of-station-missing-parts-dialog"
:destroy-on-close="true" :destroy-on-close="true"
@close="close" @close="close"
@opened="opened"
> >
<!-- <SummaryOfStationMissingParts /> --> <dee-as-com
:default-data="extraParams"
:lay-config="{
typeName: 'ExtSupportingItem',
layKey: 'stationMissingPartsSearch'
}"
@searchEvent="searchEvent"
/>
<dee-as-com
ref="table"
table-height="calc(100vh - 270px)"
class="list-table"
:lay-config="cmpOptions"
/>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
// import SummaryOfStationMissingParts from '@/views/mes/materialMatch/summaryOfStationMissingParts/index'
export default { export default {
name: 'SummaryOfStationMissingPartsDialog', name: 'SummaryOfStationMissingPartsDialog',
components: { components: {
// SummaryOfStationMissingParts
}, },
props: { }, props: {
summaryOfStationMissingPartsParams: {
type: Object,
default: () => {}
}
},
data() { data() {
return { return {
visible: false visible: false,
cmpOptions: { layKey: 'stationMissingParts', typeName: 'ExtSupportingItem' },
extraParams: {}
} }
}, },
computed: { computed: {
}, },
created() {}, created() {},
methods: { methods: {
opened() {
const queryData = this.summaryOfStationMissingPartsParams.query
this.extraParams = {
isOk: queryData.seriesName === '齐套' ? 'Y' : 'N',
sorties: queryData.sorties || '',
typeName: queryData.name
}
if (queryData.rootPage === 'ExperimentKanban') {
this.extraParams.positionNo = queryData.serialNumber
}
setTimeout(() => {
this.$refs.table.$refs.asCom.getData(this.extraParams)
}, 500)
},
close() { close() {
this.$parent.SummaryOfStationMissingPartsParams = {}
this.visible = false this.visible = false
},
searchEvent(data) {
const searchItem = data && data.items || []
let defaultItem = {}
if (searchItem && searchItem.length) {
defaultItem = searchItem.reduce((acc, item) => {
acc[item.fieldName] = item.value
return acc
}, {})
} else {
defaultItem = this.extraParams
}
this.$refs.table.$refs.asCom.getData(defaultItem)
} }
} }
} }
......
...@@ -1979,7 +1979,7 @@ ...@@ -1979,7 +1979,7 @@
</div> </div>
<JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" :job-plan-execution-query-params="JobPlanExecutionQueryParams" /> <JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" :job-plan-execution-query-params="JobPlanExecutionQueryParams" />
<SQCDPDialog ref="SQCDPDialog" :sqcdp-params="sqcdpParams" /> <SQCDPDialog ref="SQCDPDialog" :sqcdp-params="sqcdpParams" />
<SummaryOfStationMissingPartsDialog ref="SummaryOfStationMissingPartsDialog" /> <SummaryOfStationMissingPartsDialog ref="SummaryOfStationMissingPartsDialog" :summary-of-station-missing-parts-params="summaryOfStationMissingPartsParams" />
<SiteProblemManagementSummaryDialog ref="SiteProblemManagementSummaryDialog" :site-problem-management-summary-params="siteProblemManagementSummaryParams" /> <SiteProblemManagementSummaryDialog ref="SiteProblemManagementSummaryDialog" :site-problem-management-summary-params="siteProblemManagementSummaryParams" />
</div> </div>
</template> </template>
...@@ -2592,10 +2592,6 @@ export default { ...@@ -2592,10 +2592,6 @@ export default {
const chartDom = document.getElementById('missPartsEchart') const chartDom = document.getElementById('missPartsEchart')
const myChart = echarts.init(chartDom) const myChart = echarts.init(chartDom)
myChart.on('click', function(params) { myChart.on('click', function(params) {
if (params) {
console.log('跳转暂时未做,需要做的时候删除这段代码!')
return
}
that.routerSummaryOfStationMissingParts(params.name, params.seriesName) that.routerSummaryOfStationMissingParts(params.name, params.seriesName)
}) })
myChart.setOption(optionParts) myChart.setOption(optionParts)
...@@ -2805,11 +2801,13 @@ export default { ...@@ -2805,11 +2801,13 @@ export default {
* 站位缺件汇总 * 站位缺件汇总
*/ */
routerSummaryOfStationMissingParts(name, seriesName) { routerSummaryOfStationMissingParts(name, seriesName) {
this.SummaryOfStationMissingPartsParams = { this.summaryOfStationMissingPartsParams = {
name: 'summaryOfStationMissingParts', name: 'summaryOfStationMissingParts',
query: { query: {
name: name, name: name,
serialNumber: this.info.serialNumber, rootPage: 'ExperimentKanban',
serialNumber: this.$route.query.serialNumber,
sorties: this.$route.query.sorties,
seriesName: seriesName seriesName: seriesName
} }
} }
......
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