Merge pull request 'gtz' (#61) from gtz into test

Reviewed-on: #61

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

@@ -0,0 +1,16 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-15 16:58:26
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
+ */
+
+export default {
+  first: 'First Row',
+  second: 'Second Row',
+  title: 'WMS Inventory Information',
+  pageHeader: 'No.',
+  pageFooter: ' Page'
+}

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

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:12:46
  * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:39
+ * @LastEditTime: 2022-03-15 16:44:11
  * @Description: file content
  */
 
@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'
 
 export default {
   basicData,
@@ -29,5 +30,6 @@ export default {
   quality,
   factory,
   formManage,
-  report
+  report,
+  dashboard
 }

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

@@ -0,0 +1,16 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-15 16:58:30
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
+ */
+
+export default {
+  first: '第一排',
+  second: '第二排',
+  title: 'WMS库存信息',
+  pageHeader: '第',
+  pageFooter: '页'
+}

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

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:12:46
  * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:47
+ * @LastEditTime: 2022-03-15 16:44:05
  * @Description: file content
  */
 
@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'
 
 export default {
   basicData,
@@ -29,5 +30,6 @@ export default {
   quality,
   factory,
   formManage,
-  report
+  report,
+  dashboard
 }

src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 16:29:46
+ * @LastEditTime: 2022-03-15 14:15:30
  * @Description:
 -->
 <template>
@@ -33,7 +33,6 @@ import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 // import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -60,7 +59,6 @@ const tableProps = [
   {
     prop: 'code',
     label: i18n.t('module.basicData.cache.LocationCode'),
-    filter: timeFormatter,
     align: 'center'
   },
   {

src/views/basicData/Warehouse/components/processStorageLink.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 11:03:18
+ * @LastEditTime: 2022-03-15 14:27:57
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -276,7 +276,7 @@ import testdata from './testdata'
 import processStorageType from './processStorageType'
 
 export default {
-  name: 'Dashboard',
+  name: 'ProcessStorageLink1',
   components: { processStorageType },
   data() {
     return testdata
@@ -316,7 +316,7 @@ export default {
         return item.locationName
       })
       const obj = {
-        id: this.id,
+        workSequenId: this.id,
         processLocationStorageList: this.selectStorageList
       }
       this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {

src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 16:03:15
+ * @LastEditTime: 2022-03-15 16:47:57
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -11,7 +11,7 @@
     <el-card class="dashboard-main">
       <el-row class="dashboard-title">
         <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">WMS库存信息</div>
+        <div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
       </el-row>
       <el-row class="dashboard-legend">
         <div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
@@ -24,7 +24,7 @@
         </div>
         <div class="dashboard-legend-search">
           <el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
-            <el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
+            <el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
           </el-select>
         </div>
       </el-row>
@@ -41,7 +41,7 @@
                 </el-col>
               </el-row>
               <div class="dashboard-layout-footer">
-                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
+                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
               </div>
             </el-col>
           </el-row>
@@ -68,7 +68,7 @@
                 </el-col>
               </el-row>
               <div class="dashboard-layout-footer">
-                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
+                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
               </div>
             </el-col>
           </el-row>

src/views/dashboard/testdata.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 15:47:47
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 16:00:03
+ * @LastEditTime: 2022-03-15 16:46:04
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
  */
@@ -2604,5 +2604,5 @@ export default {
   },
   current: 1,
   totalPage: 1,
-  rowIndex: ['一', '二']
+  rowIndex: ['module.dashboard.first', 'module.dashboard.second']
 }