Merge branch 'develop' into fzq

2022-05-30 13:42:36 +08:00 · 2022-05-30 13:42:36 +08:00 · c595794b1a
--- a/src/api/orderManage/00A.js
+++ b/src/api/orderManage/00A.js
@ -2,13 +2,13 @@
 * @Author: zwq
 * @Date: 2022-01-17 14:55:09
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:13:22
+ * @LastEditTime: 2022-03-28 13:52:12
 * @Description:
 */

 import request from '@/utils/request'

-export function ProcessInfoList(data) { // 获取工单工艺列表
+export function ProcessInfoList(data) { // 获取工单列表
  return request({
    url: '/api/wms/work/order/page',
    method: 'post',
--- a/src/router/index.js
+++ b/src/router/index.js
@ -518,7 +518,6 @@ export const constantRoutes = [
        path: 'menumanager',
        component: () => import('@/views/MenuManager'),
        name: 'MenuManager',
-        hidden: true,
        meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
      {
--- a/src/views/QualityManager/scrap/index.vue
+++ b/src/views/QualityManager/scrap/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:54:40
+ * @LastEditTime: 2022-03-28 13:52:30
 * @Description:
 -->
 <template>
@ -37,8 +37,8 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
-        <el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
+      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
+        <el-select v-model="formData.workOrderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
          <el-option
            v-for="(item, index) in orderList"
            :key="index"
@ -88,7 +88,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 import { getEqList } from '@/api/equipment/maintain'
-import { ExecutionInfoList } from '@/api/orderManage/00A'
+import { ProcessInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
 * 表格表头配置项 TypeScript接口注释
@ -182,7 +182,7 @@ export default {
      formData: {
        timeSlot: null,
        substrateId: '',
-        orderId: '',
+        workOrderId: '',
        equipmentId: '',
        current: 1,
        size: 10,
@ -254,7 +254,7 @@ export default {
      if (result1.code === 0) {
        this.device = result1.data.records
      }
-      const result2 = await ExecutionInfoList({
+      const result2 = await ProcessInfoList({
        current: 1,
        size: 999
      })
--- a/src/views/dashboard/components/PortDetail.vue
+++ b/src/views/dashboard/components/PortDetail.vue
@ -1,32 +1,52 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 16:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-04-02 15:57:14
 * @Description:
 -->
 <template>
  <el-dialog
    :title="'btn.detail' | i18nFilter"
    :visible.sync="visible"
+    width="70%"
  >
-    <el-form ref="dataForm" :model="dataForm" label-width="150px">
-      <el-form-item :label="$t('module.dashboard.name')" prop="name">
-        {{ dataForm.name }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.attribute')" prop="attribute">
-        {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
-        {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
-        {{ dataForm.workOrderNo }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.storageBoxCode')" prop="storageBoxCode">
-        {{ dataForm.storageBoxCode }}
-      </el-form-item>
-    </el-form>
+    <el-row :gutter="10">
+      <el-form ref="dataForm" :model="dataForm" label-width="150px">
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.name')" prop="name">
+            {{ dataForm.name }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.attribute')" prop="attribute">
+            {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
+            {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
+            {{ dataForm.workOrderNo }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.storageBoxCode')" prop="storageBoxCode">
+            {{ dataForm.storageBoxCode }}
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
    </span>
@ -34,11 +54,56 @@
 </template>

 <script>
+import i18n from '@/lang'
+import { listSubstrate } from '@/api/report-manage/report'
+import BaseTable from '@/components/BaseTable'
+
+const tableProps = [
+  {
+    prop: 'substrateCode',
+    label: i18n.t('module.report.substrate.substrateCode'),
+    align: 'center'
+  },
+  {
+    prop: 'subPosition',
+    label: i18n.t('module.report.substrate.location'),
+    align: 'center'
+  },
+  {
+    prop: 'storeTime',
+    label: i18n.t('module.report.substrate.storeTime'),
+    align: 'center'
+  },
+  {
+    prop: 'status',
+    label: i18n.t('module.report.substrate.substrateStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'subStorageStatusName',
+    label: i18n.t('module.report.substrate.subStorageStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'machineHandID',
+    label: i18n.t('module.report.substrate.machineHandID'),
+    align: 'center'
+  }
+]

 export default {
+  components: { BaseTable },
  data() {
    return {
      visible: false,
+      tableProps,
+      list: [],
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 500,
+        locationStorageSubID: ''
+      },
      dataForm: {
        code: null,
        createTime: null,
@ -69,6 +134,23 @@ export default {
      console.log(data)
      this.visible = true
      this.dataForm = data
+      this.listQuery.locationStorageSubID = data.locationStorageSubId
+      this.listLoading = true
+      listSubstrate(this.listQuery).then(response => {
+        if (response.data) {
+          this.list = response.data
+          for (var x = 0; x < this.list.length; x++) {
+            if (this.list[x].subStorageStatus === 1) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.load')
+            } else if (this.list[x].subStorageStatus === 2) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.unload')
+            }
+          }
+        } else {
+          this.list.splice(0, this.list.length)
+        }
+        this.listLoading = false
+      })
    }
  }
 }