Merge pull request 'gtz' (#76) from gtz into develop

Reviewed-on: http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui/pulls/76

src/router/index.js

@@ -57,19 +57,6 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/dashboard',
-    children: [
-      {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true }
-      }
-    ]
-  },
   // {
   //   path: '/',
   //   component: () => import('@/views/ChoicePart'),
@@ -91,6 +78,20 @@ export const constantRoutes = [
     component: () => import('@/views/error-page/401'),
     hidden: true
   },
+  {
+    path: '/dashboard',
+    component: Layout,
+    redirect: '/dashboard',
+    name: 'Dash',
+    children: [
+      {
+        path: 'dashboard',
+        component: () => import('@/views/dashboard/index'),
+        name: 'Dashboard',
+        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
+      }
+    ]
+  },
   {
     path: '/',
     component: Layout,

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-18 09:25:04
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-18 16:33:59
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue
 -->
@@ -104,13 +104,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -135,7 +135,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -164,7 +164,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -233,13 +233,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -264,7 +264,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -293,7 +293,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -325,13 +325,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -356,7 +356,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -385,7 +385,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -457,7 +457,7 @@ export default {
       this.selectStorageList.splice(0, this.selectStorageList.length)
     },
     setType(item) {
-      if (item.attribute !== 3) {
+      if (item.attribute !== '3') {
         if (
           this.selectStorageList.findIndex(
             StorageItem => StorageItem.locationId === item.id

src/views/dashboard/components/PortDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-17 10:49:54
+ * @LastEditTime: 2022-03-18 16:18:38
  * @Description:
 -->
 <template>
@@ -18,7 +18,7 @@
         {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
       </el-form-item>
       <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
-        {{ dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
+        {{ 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 }}

src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 20:07:40
+ * @LastEditTime: 2022-03-18 16:29:33
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -35,9 +35,9 @@
             <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
               <el-row>
                 <el-col v-for="z in i.rowVoList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
@@ -54,17 +54,17 @@
             <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
               <el-row v-if="item < Math.ceil((shelfVoList[0].rowVoList[0].portVoList.length - (current - 1) * 80) / 20)">
                 <el-col v-for="z in i.rowVoList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
               <el-row v-else>
                 <el-col v-for="z in i.rowVoList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>