src/lang/i18n/en/module/basicData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:58:20
+ * @LastEditTime: 2022-03-12 14:22:52
  * @Description: file content
  */
 export default {
@@ -54,8 +54,7 @@ export default {
     editLocation: 'Edit Location Point',
     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',
+    locationInfo: 'Location Point Info'
-    storageCode: 'storageBoxCode'
   },
   factory: {
     placeholderName: 'Name Or Code',
@@ -166,10 +165,7 @@ export default {
     addCacheArea: 'add Ports Shelf',
     warning: 'Layers and Columns must be integer!',
     logisticsEquipment: 'Logistics Equipment',
-    processEquipment: 'Process Equipment',
+    processEquipment: 'Process Equipment'
-    sheCode: 'Shelf Code',
-    sheName: 'Shelf Name',
-    locaNum: 'Location Number'
   },
   storageBox: {
     name: 'Name',

src/lang/i18n/zh/module/basicData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:58:12
+ * @LastEditTime: 2022-03-12 14:23:06
  */
 export default {
   visual: {
@@ -53,8 +53,7 @@ export default {
     editLocation: '编辑库位点',
     location: '库位',
     locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
-    locationInfo: '库位点信息',
+    locationInfo: '库位点信息'
-    storageCode: '存储箱号'
   },
   factory: {
     placeholderName: '名称或编码',
@@ -156,10 +155,7 @@ export default {
     status: '状态',
     warning: '行列标必须为整数！',
     logisticsEquipment: '物流设备',
-    processEquipment: '工艺设备',
+    processEquipment: '工艺设备'
-    sheCode: '货架编码',
-    sheName: '货架名',
-    locaNum: '库存数量'
   },
   storageBox: {
     name: '存储箱名称',

src/router/index.js

@@ -218,9 +218,9 @@ export const constantRoutes = [
         meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {
-        path: '/DataDictionary',
+        path: '/dataDictionary',
         component: () => import('@/views/basicData/index'),
-        name: 'DataDictionary',
+        name: 'dataDictionary',
         meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
         children: [{
           path: 'dataDictionary',
@@ -260,7 +260,7 @@ export const constantRoutes = [
       {
         path: 'processList',
         component: () => import('@/views/art/processList'),
-        name: 'processList',
+        name: 'Process',
         meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
       }
     ]
@@ -268,7 +268,7 @@ export const constantRoutes = [
   {
     path: '/Warehouse',
     component: Layout,
-    redirect: '/Warehouse/StorageBoxInfo',
+    redirect: '/Warehouse/workOrderManage',
     name: 'Warehouse',
     meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
     children: [
@@ -497,7 +497,7 @@ export const constantRoutes = [
     path: '/basic',
     component: Layout,
     redirect: '/user/manager',
-    name: 'basic',
+    name: 'ArticleManager',
     meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
     children: [
       {

src/views/basicData/Cache/components/location-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:14:02
+ * @LastEditTime: 2022-03-10 21:00:58
  * @Description:
 -->
 <template>
@@ -17,7 +17,7 @@
       @getDataList="getList"
       @add="addNew"
     />
-    <div style="title">{{ sheCode }}:{{ shCode }}    {{ sheName }}：{{ shName }}    {{ locaNum }}：{{ num }}
+    <div style="title">货架编码:{{ shCode }}    货架名称：{{ shName }}    库存量：{{ num }}
       <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
     </div>
     <base-table
@@ -102,11 +102,11 @@ const tableProps = [
     label: i18n.t('module.basicData.cache.columnMark'),
     align: 'center'
   },
-  // {
+  {
-  //   prop: 'locationType',
+    prop: 'locationType',
-  //   label: i18n.t('module.basicData.cache.locationType'),
+    label: i18n.t('module.basicData.cache.locationType'),
-  //   align: 'center'
+    align: 'center'
-  // },
+  },
   {
     prop: 'statusName',
     label: i18n.t('module.basicData.cache.status'),
@@ -147,10 +147,7 @@ export default {
         size: 990,
         shelfId: '',
         id: ''
-      },
+      }
-      sheCode: this.$t('module.basicData.cache.sheCode'),
-      sheName: this.$t('module.basicData.cache.sheName'),
-      locaNum: this.$t('module.basicData.cache.locaNum')
     }
   },
   created() {

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-11 11:03:31
+ * @LastEditTime: 2022-03-10 21:14:13
  * @Description:
 -->
 <template>
@@ -26,9 +26,9 @@
       <el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
         <el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
       </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
+      <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
         <el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
-      </el-form-item> -->
+      </el-form-item>
       <!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
         <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
       </el-form-item> -->

src/views/basicData/Warehouse/CurrentTask.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:35:17
+ * @LastEditTime: 2022-03-12 14:21:37
  * @Description:
 -->
 <template>
@@ -86,7 +86,7 @@ import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
+// import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -118,7 +118,6 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
-    filter: timeFormatter,
     align: 'center'
   },
   {

src/views/basicData/Warehouse/HistoricalTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:37:13
+ * @LastEditTime: 2022-01-13 15:49:01
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
         <el-date-picker
           v-model="formData.timeSlot"
           type="daterange"
@@ -55,7 +55,7 @@
           :range-separator="$t('module.orderManage.order.To')"
           clearable
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
       </el-form-item>
@@ -92,7 +92,7 @@ import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
+// import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -124,27 +124,31 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
-    filter: timeFormatter,
     align: 'center'
   },
   {
-    prop: 'taskSource',
+    prop: 'status',
-    label: i18n.t('module.basicData.Warehouse.TaskSource'),
+    label: i18n.t('module.basicData.Warehouse.TaskStatus'),
     align: 'center'
   },
+  // {
+  //   prop: 'taskType',
+  //   label: i18n.t('module.basicData.Warehouse.TaskType'),
+  //   align: 'center'
+  // },
   {
-    prop: 'taskType',
+    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.TaskType'),
+    label: i18n.t('module.basicData.Warehouse.VehicleName'),
     align: 'center'
   },
+  // {
+  //   prop: 'substrateNo',
+  //   label: i18n.t('module.basicData.Warehouse.BoxStatus'),
+  //   align: 'center'
+  // },
   {
-    prop: 'fullCode',
+    prop: 'wcode',
-    label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
+    label: i18n.t('module.basicData.Warehouse.BoxNumber'),
-    align: 'center'
-  },
-  {
-    prop: 'emptyCode',
-    label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
     align: 'center'
   },
   {
@@ -158,23 +162,18 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'anotherCurrLocation',
+    prop: 'updateTime',
-    label: i18n.t('module.basicData.Warehouse.StartLocation'),
+    label: i18n.t('module.basicData.Warehouse.CompletionTime'),
-    align: 'center'
-  },
-  {
-    prop: 'anotherTargetLocation',
-    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
     align: 'center'
   },
   {
     prop: 'currLocation',
-    label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'),
+    label: i18n.t('module.basicData.Warehouse.StartLocation'),
     align: 'center'
   },
   {
-    prop: 'name',
+    prop: 'targetLocation',
-    label: i18n.t('module.basicData.Warehouse.VehicleName'),
+    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
     align: 'center'
   }
 ]
@@ -195,9 +194,9 @@ export default {
         taskType: '',
         status: '',
         equipmentId: '',
-        // timeSlot: [],
+        timeSlot: [],
-        // endTime: '',
+        endTime: '',
-        // startTime: '',
+        startTime: '',
         current: 1,
         size: 10
       },
@@ -232,13 +231,13 @@ export default {
   },
   methods: {
     getList() {
-      // if (this.formData.timeSlot) {
+      if (this.formData.timeSlot) {
-      //   this.formData.startTime = this.formData.timeSlot[0]
+        this.formData.startTime = this.formData.timeSlot[0]
-      //   this.formData.endTime = this.formData.timeSlot[1]
+        this.formData.endTime = this.formData.timeSlot[1]
-      // } else {
+      } else {
-      //   this.formData.startTime = ''
+        this.formData.startTime = ''
-      //   this.formData.endTime = ''
+        this.formData.endTime = ''
-      // }
+      }
       this.listLoading = true
       HistoricalTaskList(this.formData).then(response => {
         if (response.data.records) {

src/views/basicData/Warehouse/ProcessStorageManagement.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:35:21
+ * @LastEditTime: 2022-03-11 10:31:39
  * @Description:
 -->
 <template>
@@ -15,9 +15,9 @@
       size="medium"
       label-width="100px"
     >
-      <el-form-item :label="$t('module.art.processList.processName')" prop="key">
+      <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
         <el-select
-          v-model="listQuery.key"
+          v-model="listQuery.processId"
           :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
           clearable
           filterable
@@ -27,7 +27,7 @@
             v-for="(item, index) in processArr"
             :key="index"
             :label="item.name"
-            :value="item.name"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -65,7 +65,6 @@ import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import i18n from '@/lang'
-import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -102,7 +101,6 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.art.eqName'),
-    filter: timeFormatter,
     align: 'center'
   }
 ]
@@ -133,7 +131,7 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        key: ''
+        processId: ''
       }
     }
   },

src/views/basicData/Warehouse/StorageBoxInfo.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 09:33:28
+ * @LastEditTime: 2022-01-18 14:30:25
  * @Description:
 -->
 <template>
@@ -92,7 +92,7 @@ const tableProps = [
 ]
 
 export default {
-  name: 'ScrapInfo',
+  name: 'StorageBoxInfo',
   components: { Pagination, BaseTable },
   filters: {
     statusFilter(status) {
@@ -123,10 +123,6 @@ export default {
   },
   created() {
     this.getList()
-    this.init()
-  },
-  methods: {
-    init() {
     const listQuery1 = {
       current: 1,
       size: 100
@@ -135,6 +131,7 @@ export default {
       this.storageBoxList = res.data.records
     })
   },
+  methods: {
     getList() {
       this.listLoading = true
       StorageBoxInfoList(this.listQuery).then(response => {

src/views/basicData/Warehouse/components/CurrentTask-add.vue

@@ -2,12 +2,12 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:55:22
+ * @LastEditTime: 2022-03-04 11:05:23
  * @Description:
 -->
 <template>
   <el-dialog
-    :title="$t('module.basicData.Warehouse.PerformTaskManual')"
+    :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
   >
     <el-row :gutter="10">
@@ -22,66 +22,27 @@
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
-                <el-select
+                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
-                  v-model="dataForm.taskCode"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in storageBoxList"
-                    :key="index"
-                    :label="item.code"
-                    :value="item.code"
-                  />
-                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
-                <el-input v-model="dataForm.orderName" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
-                <el-select
+                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
-                  v-model="dataForm.fullCode"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in processArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
+              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
-                <el-select
+                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
-                  v-model="dataForm.TaskStatus"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in TaskStatusArr"
-                    :key="index"
-                    :label="item.dataName"
-                    :value="item.dataCode"
-                  />
-                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
-                <el-input v-model="dataForm.remark" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -90,35 +51,26 @@
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
-                <el-input v-model="dataForm.emptyCode" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
-                <el-select
+                <el-input
                   v-model="dataForm.anotherCurrLocation"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])"
+                  readonly
-                  clearable
-                  filterable
                   :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in processArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
                 />
-                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -134,23 +86,17 @@
 
 <script>
 // import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
-import { list } from '@/api/art-manage/process'
-import { dataDictionaryDataList } from '@/api/basicData/dataDictionary'
-import { StorageBoxRackCode } from '@/api/basicData/Warehouse/StorageBoxInfo'
 
 export default {
   data() {
     return {
       visible: false,
-      processArr: [],
-      TaskStatusArr: [],
-      storageBoxList: [],
       dataForm: {
         id: '',
         taskCode: undefined,
         orderName: undefined,
         fullCode: undefined,
-        TaskStatus: undefined,
+        name: undefined,
         remark: undefined,
         field119: undefined,
         createTime: undefined,
@@ -170,32 +116,6 @@ export default {
     init(id) {
       this.dataForm.id = id
       this.visible = true
-      const lparams = {
-        current: 1,
-        size: 999
-      }
-      list(lparams).then(response => {
-        if (response.data.records) {
-          this.processArr = response.data.records
-        } else {
-          this.processArr.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-      })
-      StorageBoxRackCode(lparams).then(res => {
-        this.storageBoxList = res.data.records
-      })
-      dataDictionaryDataList({
-        current: 1,
-        size: 999,
-        dictTypeId: '6'
-      }).then(response => {
-        if (response.data.records) {
-          this.TaskStatusArr = response.data.records
-        } else {
-          this.TaskStatusArr.splice(0, this.scrapsArr.length)
-        }
-      })
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
       })

src/views/report-manage/components/viewSubstrate.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 15:55:45
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:08:53
+ * @LastEditTime: 2022-03-07 09:28:21
 -->
 <template>
   <div class="app-container">
@@ -12,7 +12,7 @@
       <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
       <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
     </div> -->
-    <div style="title">{{ storageCode }}:{{ num }}
+    <div style="title">存储箱号:{{ num }}
       <el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
     </div>
     <base-table
@@ -104,7 +104,6 @@ export default {
     return {
       addOrUpdateVisible: false,
       num: '',
-      storageCode: this.$t('module.basicData.visual.TipsBefore'),
       tableBtn,
       trueWidth: 200,
       tableProps,
@@ -149,7 +148,7 @@ export default {
     },
     getList() {
       this.listLoading = true
-      this.num = this.listQuery.storageBoxCode
+      this.num = this.listQuery.substrateCode
       this.listQuery.code = this.$route.query.code
       console.log(this.listQuery)
       listSubstrate(this.listQuery).then(response => {