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

applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue

@@ -1905,6 +1905,7 @@
     <ExpireWarningDialog ref="ExpireWarningDialog" />
     <SummaryOfStationMissingPartsDialog
       ref="SummaryOfStationMissingPartsDialog"
+      :summary-of-station-missing-parts-params="summaryOfStationMissingPartsParams"
     />
     <SiteProblemManagementSummaryDialog
       ref="SiteProblemManagementSummaryDialog"
@@ -2604,10 +2605,6 @@ export default {
           const chartDom = document.getElementById('outsourcEchart')
           const myChart = echarts.init(chartDom)
           myChart.on('click', function(params) {
-            if (params) {
-              console.log('跳转暂时未做，需要做的时候删除这段代码！')
-              return
-            }
             that.routerSummaryOfStationMissingParts(
               '外购成品',
               params.name,
@@ -2648,10 +2645,6 @@ export default {
           const chartDom = document.getElementById('sparepartsEchart')
           const myChart = echarts.init(chartDom)
           myChart.on('click', function(params) {
-            if (params) {
-              console.log('跳转暂时未做，需要做的时候删除这段代码！')
-              return
-            }
             that.routerSummaryOfStationMissingParts(
               '零组件',
               params.name,
@@ -2690,10 +2683,6 @@ export default {
           const chartDom = document.getElementById('standardEchart')
           const myChart = echarts.init(chartDom)
           myChart.on('click', function(params) {
-            if (params) {
-              console.log('跳转暂时未做，需要做的时候删除这段代码！')
-              return
-            }
             that.routerSummaryOfStationMissingParts(
               '标准件',
               params.name,
@@ -2791,7 +2780,7 @@ export default {
           if (res.message.includes('成功')) {
             Object.entries(res.items).forEach(([key, value]) => {
               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 {
         name: 'summaryOfStationMissingParts',
         query: {
           name: name,
-          serialNumber: serialNumber,
+          rootPage: 'AssembleKanban',
+          serialNumber: this.$route.query.serialNumber,
+          sorties: this.$route.query.sorties,
           seriesName: seriesName
         }
       }

applications/dee-mes/src/privateComponents/components/Visualization/Dialog/SiteProblemManagementSummaryDialog.vue

@@ -56,6 +56,11 @@ export default {
           'fieldName': 'sorties',
           'operator': 'EQ',
           'value': queryData.sorties
+        },
+        {
+          'fieldName': 'state',
+          'operator': 'NEQ',
+          'value': 'Finish'
         }
       ]
       if (queryData.rootPage === 'ExperimentKanban') {

applications/dee-mes/src/privateComponents/components/Visualization/Dialog/SummaryOfStationMissingPartsDialog.vue

@@ -9,30 +9,75 @@
     class="summary-of-station-missing-parts-dialog"
     :destroy-on-close="true"
     @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>
 </template>
 <script>
-// import SummaryOfStationMissingParts from '@/views/mes/materialMatch/summaryOfStationMissingParts/index'
 export default {
   name: 'SummaryOfStationMissingPartsDialog',
   components: {
-    // SummaryOfStationMissingParts
   },
-  props: { },
+  props: {
+    summaryOfStationMissingPartsParams: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
-      visible: false
+      visible: false,
+      cmpOptions: { layKey: 'stationMissingParts', typeName: 'ExtSupportingItem' },
+      extraParams: {}
     }
   },
   computed: {
   },
   created() {},
   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() {
-      this.$parent.SummaryOfStationMissingPartsParams = {}
       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)
     }
   }
 }

applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue

@@ -1979,7 +1979,7 @@
     </div>
     <JobPlanExecutionQueryDialog ref="JobPlanExecutionQueryDialog" :job-plan-execution-query-params="JobPlanExecutionQueryParams" />
     <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" />
   </div>
 </template>
@@ -2592,10 +2592,6 @@ export default {
           const chartDom = document.getElementById('missPartsEchart')
           const myChart = echarts.init(chartDom)
           myChart.on('click', function(params) {
-            if (params) {
-              console.log('跳转暂时未做，需要做的时候删除这段代码！')
-              return
-            }
             that.routerSummaryOfStationMissingParts(params.name, params.seriesName)
           })
           myChart.setOption(optionParts)
@@ -2805,11 +2801,13 @@ export default {
      * 站位缺件汇总
      */
     routerSummaryOfStationMissingParts(name, seriesName) {
-      this.SummaryOfStationMissingPartsParams = {
+      this.summaryOfStationMissingPartsParams = {
         name: 'summaryOfStationMissingParts',
         query: {
           name: name,
-          serialNumber: this.info.serialNumber,
+          rootPage: 'ExperimentKanban',
+          serialNumber: this.$route.query.serialNumber,
+          sorties: this.$route.query.sorties,
           seriesName: seriesName
         }
       }