Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/store/modules/storeFull.js

+/*
+ * @Author: gjn
+ * @Date: 2024-06-14 11:34:56
+ * @Description:
+ */
+
+export default {
+  state: {
+    isFullscreen: false
+  },
+  mutations: {
+    setFullscreen(state) {
+      state.isFullscreen = !state.isFullscreen
+    }
+  }
+}

applications/dee-mes/src/api/kanban.js

+import { post } from '../utils/http'
+/**
+ *  获取站位
+ */
+export function getMaterial(params) {
+  return post('/DxProcessMaterialLot/look/getMaterial', params)
+}
+/**
+ *站位
+ * @param {*} params
+ * @returns
+ */
+export function getAllPlan(params) {
+  return post(`/DxProcessPlan/look/getAllPlan?sorties=${params.sorties}&planeType=${params.planeType}`)
+}
+
+/**
+ * 架次SQCDP
+ * @param {*} params
+ * @returns
+ */
+export function sortiesSQCDP(params) {
+  return post(`/FactoryCalendar/look/SQCDP?sorties=${params.sorties}&planeType=${params.planeType}`)
+}
+
+/**
+ * 架次配套情况
+ * @param {*} params
+ * @returns
+ */
+export function sortiesFitRates(params) {
+  return post(`/DxProcessPlan/look/fitRates?sorties=${params.sorties}&planeType=${params.planeType}&typeName=${params.typeName}`)
+}
+
+/**
+ * 架次三期预警
+ * @param {*} params
+ * @returns
+ */
+export function sortiesThree() {
+  return post('/Inventory/look/recursionThree/three')
+}
+/**
+ * 架次现场督办
+ * @param {*} paramss
+ * @returns
+ */
+export function sortiesSpotProblem(params) {
+  return post(`/SpotProblem/look/getSpotProblem?sorties=${params.sorties}&planeType=${params.planeType}`)
+}
+/**
+ * 架次行动项
+ * @param {*} paramss
+ * @returns
+ */
+export function sortiesActionitems(params) {
+  return post(`/ActionItem/look/actionItem?airModel=${params.planeType}&sorties=${params.sorties}`)
+}
+/**
+ * 站位sqcdp数据
+ * @param {*} planId
+ * @returns
+ */
+export function stationSQCDP(planId) {
+  return post(`/FactoryCalendar/look/plan/SQCDP?planId=${planId}`)
+}
+
+/**
+ * 周作业计划完成趋势
+ * @param {*} planId
+ * @returns
+ */
+export function completion(planId) {
+  return post(`/JoExecutePlan/look/plan/completion?planId=${planId}`)
+}
+
+/**
+ * 站位三天滚动计划
+ * @param {*} planId
+ * @returns
+ */
+export function stationPlan(planId) {
+  return post(`/DxProcessPlan/look/three/plan?planId=${planId}`)
+}
+/**
+ * 现场问题督办echart
+ * @param {*} planId
+ * @returns
+ */
+export function stationSpotProblemEchart(planId) {
+  return post(`/SpotProblem/look/plan/spotProblem?planId=${planId}`)
+}
+/**
+ * 现场问题督办table
+ * @param {*} planId
+ * @returns
+ */
+export function stationSpotProblemTable(planId) {
+  return post(`/SpotProblem/look/plan/getSpotProblem?planId=${planId}`)
+}
+/**
+ * 物料配套及缺件情况 echart
+ * @param {*} planId
+ * @returns
+ */
+export function stationFitRates(planId) {
+  return post(`/StorageRequestItem/look/plan/fitRates?planId=${planId}`)
+}
+/**
+ * 物料配套及缺件情况 table
+ * @param {*} planId
+ * @returns
+ */
+export function stationMaterialLacke(planId) {
+  return post(`/WrMaterialLack/look/plan/materialLack?planId=${planId}`)
+}
+/**
+ *站位缺件汇总  获取站位
+ */
+export function getStationPosition(params) {
+  return post('/DxProcessPlan/find/recursion', params)
+}
+
+/**
+ * 站位缺件汇总  获取数据
+ */
+export function getSummaryOfStationMissingParts(params) {
+  return post(`/WrMaterialLack/lackOfParts?planId=${params.planId}&typeName=${params.typeName}&pageSize=${params.pageSize}&pageForm=${params.pageForm}&isOk=${params.seriesName}`, {})
+}
+
+/**
+ * sqcdp维护 获取站位
+ */
+export function getAllPosition() {
+  return post(`/DxProcessPlan/getAllPosition`, {})
+}
+
+/**
+ * sqcdp维护 获取站位
+ */
+export function searchDictData(params) {
+  return post(`/DictData/search`, params)
+}
+
+/**
+ * sqcdp维护 初始化年份
+ */
+export function getAllFactoryYear() {
+  return post(`/FactoryCalendar/getAllFactoryYear`, {})
+}
+
+/**
+ * sqcdp维护 初始化年份
+ */
+export function getCalendarData(params) {
+  return post(`/FactoryCalendar/find/recursion`, params)
+}
+
+/**
+ * 现场问题管理查询 获取数据
+ */
+export function getSummarizingData(params) {
+  return post(`/SpotProblem/summarizing`, params)
+}

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue

@@ -400,7 +400,7 @@ export default {
     resetForm() {
       this.header = this.basicData
       if (!this.header) return
-      this.$set(this.form, 'supplier', this.header.supplierFullName.label || '')
+      this.$set(this.form, 'supplier', this.header.supplierFullName && this.header.supplierFullName.label || '')
       // this.$set(this.form, 'arrivalDate', this.header.arrivalDate)
       const childrenAddOrEdit = this.header.materialTypeName.label === '外购成品' && (this.operateType === 'ADD' || (this.operateType === 'MODIFY' && !this.form.isRoot))
       const parentIsVirtual = this.form.isVirtual

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

+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="行动项"
+    :modal-append-to-body="false"
+    class="actionitems-dialog"
+    :destroy-on-close="true"
+    @close="close"
+    @opened="opened"
+  >
+    <!-- <Actionitems /> -->Actionitems
+  </el-dialog>
+</template>
+<script>
+// import Actionitems from '@/views/mes/actionItemManagement/actionItemManagementSearch/index'
+export default {
+  name: 'ActionitemsDialog',
+  components: {
+    // Actionitems
+  },
+  props: { },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: {
+  },
+  created() {},
+  methods: {
+    opened() {
+      this.$children[0].$children[0].getAirModelList()
+    },
+    close() {
+      this.visible = false
+      this.$parent.actionitemsParams = {}
+    }
+  }
+}
+</script>
+
+<style lang='scss'>
+.actionitems-dialog{
+  position: absolute;
+  .el-dialog__header{
+    text-align: center;
+  }
+   .el-dialog {
+     max-height:100%;
+     max-width:100%;
+}
+}
+</style>

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

+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="三期预警"
+    :modal-append-to-body="false"
+    class="expire-warning-dialog"
+    :destroy-on-close="true"
+    @close="close"
+    @opened="opened"
+  >
+    <!-- <ExpireWarning /> -->ExpireWarning
+  </el-dialog>
+</template>
+<script>
+// import ExpireWarning from '@/views/mes/InsideStorageOperation/StorageExpireWarning/index.vue'
+export default {
+  name: 'ExpireWarningDialog',
+  components: {
+    // ExpireWarning
+  },
+  props: { },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: { },
+  created() {},
+  methods: {
+    opened() {
+      this.$children[0].$children[0].$refs.highSearch.save()
+      this.$parent.StorageExpireWarningParams = {}
+    },
+    close() {
+      this.$parent.StorageExpireWarningParams = {}
+      this.visible = false
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.expire-warning-dialog{
+  position: absolute;
+  .el-dialog__header{
+    text-align: center;
+  }
+   .el-dialog {
+     max-height:100%;
+     max-width:100%;
+}
+}
+</style>

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

+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="作业计划执行查询"
+    :modal-append-to-body="false"
+    class="job-plan-execution-query-dialog"
+    :destroy-on-close="true"
+    @close="close"
+    @opened="opened"
+  >
+    JobPlanExecutionQuery <!-- <JobPlanExecutionQuery /> -->
+  </el-dialog>
+</template>
+<script>
+// import JobPlanExecutionQuery from '@/views/mes/physicalQualityAndConfiguratioCnontrol/jobPlanExecutionSummary'
+export default {
+  name: 'JobPlanExecutionQueryDialog',
+  components: {
+    // JobPlanExecutionQuery
+  },
+  props: {},
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: {},
+  created() {},
+  methods: {
+    opened() {
+      this.$children[0].$children[0].getAirModelList()
+      // this.$parent.JobPlanExecutionQueryParams = {}
+    },
+    close() {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.job-plan-execution-query-dialog {
+  position: absolute;
+  .el-dialog__header {
+    text-align: center;
+  }
+  .el-dialog {
+    max-height: 100%;
+    max-width: 100%;
+  }
+}
+</style>

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

+
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="sqcdp维护"
+    :modal-append-to-body="false"
+    class="sqcdp-dialog"
+    :destroy-on-close="true"
+    @close="close"
+    @opened="opened"
+  >
+    <!-- <SQCDP /> -->SQCDP
+  </el-dialog>
+</template>
+<script>
+// import SQCDP from '@/views/mes/baseData/sqcdp/index.vue'
+export default {
+  name: 'SQCDPDialog',
+  components: {
+    // SQCDP
+  },
+  props: { },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: {
+  },
+  created() {},
+  methods: {
+    opened() {
+      this.$children[0].$children[0].initYear()
+    },
+    close() {
+      this.$parent.sqcdpParams = {}
+      this.visible = false
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.sqcdp-dialog{
+  position: absolute;
+  .el-dialog__header{
+    text-align: center;
+  }
+   .el-dialog {
+     max-height:100%;
+     max-width:100%;
+}
+}
+</style>

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

+
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="现场问题管理查询"
+    :modal-append-to-body="false"
+    class="site-problem-management-summary-dialog"
+    :destroy-on-close="true"
+    @close="close"
+    @opened="opened"
+  >
+    SiteProblemManagementSummary<!-- <SiteProblemManagementSummary /> -->
+  </el-dialog>
+</template>
+<script>
+// import SiteProblemManagementSummary from '@/views/mes/physicalQualityAndConfiguratioCnontrol/siteProblemManagementSummary/index.vue'
+export default {
+  name: 'SQCDPDialog',
+  components: {
+    // SiteProblemManagementSummary
+  },
+  props: { },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: {
+  },
+  created() {},
+  methods: {
+    opened() {
+      this.$children[0].$children[0].init()
+      this.$parent.siteProblemManagementSummaryParams = {}
+    },
+    close() {
+      this.$parent.siteProblemManagementSummaryParams = {}
+      this.visible = false
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.site-problem-management-summary-dialog{
+  position: absolute;
+  .el-dialog__header{
+    text-align: center;
+  }
+   .el-dialog {
+     max-height:100%;
+     max-width:100%;
+}
+}
+</style>

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

+
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    fullscreen
+    :modal="false"
+    title="站位缺件汇总"
+    :modal-append-to-body="false"
+    class="summary-of-station-missing-parts-dialog"
+    :destroy-on-close="true"
+    @close="close"
+  >
+    <!-- <SummaryOfStationMissingParts /> -->
+  </el-dialog>
+</template>
+<script>
+// import SummaryOfStationMissingParts from '@/views/mes/materialMatch/summaryOfStationMissingParts/index'
+export default {
+  name: 'SummaryOfStationMissingPartsDialog',
+  components: {
+    // SummaryOfStationMissingParts
+  },
+  props: { },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  computed: {
+  },
+  created() {},
+  methods: {
+    close() {
+      this.$parent.SummaryOfStationMissingPartsParams = {}
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style lang='scss'>
+.summary-of-station-missing-parts-dialog{
+  position: absolute;
+  .el-dialog__header{
+    text-align: center;
+  }
+   .el-dialog {
+     max-height:100%;
+     max-width:100%;
+}
+}
+</style>

applications/dee-mes/src/views/assemblyPlanManagement/instructionIdentification/components/right/index.vue

@@ -181,6 +181,7 @@
                   强制关闭
                 </el-button>
                 <el-button
+                  v-if="loginUser==='1'"
                   size="mini"
                   @click.native.prevent="scrap(scope.row)"
                 >