Merge branch 'develop' into fzq

'修改导出后空白bug'
Merge pull request '修改首页详情' (#82 ) from zwq into develop
2022-05-30 13:42:36 +08:00 · 2022-05-30 13:41:50 +08:00 · 2022-04-02 16:04:35 +08:00 · 2022-04-02 16:04:07 +08:00 · 2022-03-28 13:56:31 +08:00 · 2022-03-28 13:56:03 +08:00
11 changed files with 150 additions and 45 deletions
--- 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/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-19 10:24:03
+ * @LastEditTime: 2022-03-28 11:13:15
 * @Description: file content
 */
 export default {
@@ -56,7 +56,8 @@ export default {
    location: 'Location',
    locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
    locationInfo: 'Location Point Info',
-    storageCode: 'storageBoxCode'
+    storageCode: 'storageBoxCode',
+    storageBoxFid: 'StorageBox FID Code'
  },
  factory: {
    placeholderName: 'Name Or Code',
@@ -362,6 +363,11 @@ export default {
    publishTask: 'Publish The Task',
    startPosition: 'Start',
    endPosition: 'End',
-    taskType: 'Task Type'
+    taskType: 'Task Type',
+    ExWarehouse: 'Ex Warehouse',
+    InWarehouse: 'In Warehouse',
+    Circulation: 'Circulation',
+    Initialization: 'Initialization',
+    Damage: 'Damage'
  }
 }
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:45:01
+ * @LastEditTime: 2022-03-28 11:13:13
 * * @Description: file content
 */
 export default {
@@ -56,7 +56,8 @@ export default {
    location: '库位',
    locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
    locationInfo: '库位点信息',
-    storageCode: '存储箱号'
+    storageCode: '存储箱号',
+    storageBoxFid: '存储箱名FID编码'
  },
  factory: {
    placeholderName: '名称或编码',
@@ -366,6 +367,11 @@ export default {
    publishTask: '发布任务',
    startPosition: '起点',
    endPosition: '终点',
-    taskType: '任务类型'
+    taskType: '任务类型',
+    ExWarehouse: '出库',
+    InWarehouse: '入库',
+    Circulation: '流转',
+    Initialization: '初始化',
+    Damage: '损坏'
  }
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -216,6 +216,7 @@ export const constantRoutes = [
        path: 'staff',
        component: () => import('@/views/basicData/GroupModule/staff'),
        name: 'staff',
+        hidden: true,
        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
      {
@@ -517,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/basicData/Cache/components/locationAttr-add.vue
+++ b/src/views/basicData/Cache/components/locationAttr-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:36:54
+ * @LastEditTime: 2022-03-23 11:03:08
 * @Description:
 -->
 <template>
--- a/src/views/basicData/Cache/components/storageBox-add.vue
+++ b/src/views/basicData/Cache/components/storageBox-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:23:19
+ * @LastEditTime: 2022-03-23 11:04:20
 * @Description:
 -->
 <template>
@@ -30,6 +30,9 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item :label="$t('module.basicData.visual.storageBoxFid')" prop="storageBoxFid">
+        <el-input v-model="dataForm.storageBoxFid" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.storageBoxFid')])" clearable />
+      </el-form-item>
      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="note">
        <el-input v-model="dataForm.note" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
      </el-form-item>
@@ -54,7 +57,8 @@ export default {
        code: '',
        status: '',
        enName: '',
-        note: ''
+        note: '',
+        storageBoxFid: ''
      },
      options: [
        {
--- a/src/views/basicData/Cache/storageBox.vue
+++ b/src/views/basicData/Cache/storageBox.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 10:55:34
+ * @LastEditTime: 2022-03-23 11:06:20
 * @Description:
 -->
 <template>
@@ -101,6 +101,11 @@ const tableProps = [
    filter: basicData('storage'),
    align: 'center'
  },
+  {
+    prop: 'storageBoxFid',
+    label: i18n.t('module.basicData.visual.storageBoxFid'),
+    align: 'center'
+  },
  {
    prop: 'note',
    label: i18n.t('module.basicData.storageBox.remark'),
@@ -173,6 +178,7 @@ export default {
      storageBoxList(this.listQuery).then(response => {
        if (response.data.records) {
          this.list = response.data.records
+          console.log(this.list)
        } else {
          this.list.splice(0, this.list.length)
        }
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/src/views/basicData/Warehouse/CurrentTask.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:45:43
+ * @LastEditTime: 2022-03-22 10:36:05
 * @Description:
 -->
 <template>
@@ -194,20 +194,20 @@ export default {
        size: 10
      },
      taskTypeList: [{
-        'label': '出库',
+        'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
        'value': 0
      }, {
-        'label': '入库',
+        'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
        'value': 1
      }, {
-        'label': '流转',
+        'label': i18n.t('module.basicData.Warehouse.Circulation'),
        'value': 2
      }],
      TaskStatusList: [{
-        'label': '初始化',
+        'label': i18n.t('module.basicData.Warehouse.Initialization'),
        'value': 0
      }, {
-        'label': '损坏',
+        'label': i18n.t('module.basicData.Warehouse.Damage'),
        'value': 1
      }],
      VehicleNameList: [{
--- 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
+      })
    }
  }
 }
--- a/src/views/report-manage/CurrentInventory.vue
+++ b/src/views/report-manage/CurrentInventory.vue
@@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-04 20:54:54
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:31:14
+ * @LastEditTime: 2022-05-30 13:40:33
 -->
 <template>
  <div class="app-container">
@@ -223,6 +223,7 @@ export default {
        //   link.click()
        //   URL.revokeObjectURL(link.href)
        // }
+        this.getList()
      })
    }
    // 新增 / 修改
Author	SHA1	Message	Date
Fanzink	c595794b1a	Merge branch 'develop' into fzq	2022-05-30 13:42:36 +08:00
Fanzink	72ac5b9998	'修改导出后空白bug'	2022-05-30 13:41:50 +08:00
朱文强	ddc3f5d49d	Merge pull request '修改首页详情' (#82 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #82	2022-04-02 16:04:35 +08:00
zwq	db0a906323	修改首页详情	2022-04-02 16:04:07 +08:00
朱文强	93a412d243	Merge pull request '修改bug' (#81 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #81	2022-03-28 13:56:31 +08:00
zwq	aa85593884	修改bug	2022-03-28 13:56:03 +08:00
朱文强	a77918c059	Merge pull request 'fzq' (#80 ) from fzq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #80	2022-03-28 13:54:27 +08:00
Fanzink	d8336aced0	'修改存储箱字段'	2022-03-28 11:13:51 +08:00
Fanzink	43983bc929	'修改存储箱字段'	2022-03-28 11:12:03 +08:00
朱文强	6d3309ed2b	Merge pull request '修改bug' (#79 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #79	2022-03-22 11:27:14 +08:00
zwq	cae8938e22	修改bug	2022-03-22 11:26:34 +08:00