'更新'

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-11 16:33:41
+ * @LastEditTime: 2022-03-15 17:03:28
  * @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
@@ -47,13 +47,7 @@
             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>
@@ -117,33 +111,13 @@
                       )
                     "
                   >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
               <div class="dashboard-layout-footer">
-                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
+                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
               </div>
             </el-col>
           </el-row>
@@ -216,26 +190,8 @@
                       )
                     "
                   >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
@@ -283,33 +239,13 @@
                       )
                     "
                   >
-                    <div
-                      v-if="
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
               <div class="dashboard-layout-footer">
-                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
-                }}
+                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
               </div>
             </el-col>
           </el-row>
@@ -330,7 +266,7 @@ import testdata from './testdata'
 import processStorageType from './processStorageType'
 
 export default {
-  name: 'Dashboard',
+  name: 'ProcessStorageLink1',
   components: { processStorageType },
   data() {
     return testdata
@@ -353,13 +289,13 @@ export default {
         } else {
           this.typeVisible = true
           this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id)
+            this.$refs.typeRef.init(item.id, item.name)
           })
         }
       }
     },
-    setStorageList(locationId, dataForm) {
-      const obj = Object.assign({ locationId }, dataForm)
+    setStorageList(locationId, locationName, dataForm) {
+      const obj = Object.assign({ locationId, locationName }, dataForm)
       this.selectStorageList.push(obj)
     },
     handleChange(v) {
@@ -367,10 +303,10 @@ export default {
     },
     submitLinkList() {
       const tipArr = this.selectStorageList.map(item => {
-        return item.locationId
+        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/basicData/Warehouse/components/processStorageType.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 14:48:18
+ * @LastEditTime: 2022-03-15 11:02:46
  * @Description:
 -->
 <template>
@@ -49,6 +49,7 @@ export default {
     return {
       visible: false,
       locationId: '',
+      locationName: '',
       dataForm: {
         portAttrId: 1,
         storageId: ''
@@ -65,8 +66,9 @@ export default {
     }
   },
   methods: {
-    init(id) {
+    init(id, name) {
       this.locationId = id
+      this.locationName = name
       const listQuery = {
         current: 1,
         size: 999
@@ -78,6 +80,9 @@ export default {
           this.storageBoxArr.splice(0, this.list.length)
         }
       })
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
       this.visible = true
     },
     // 表单提交
@@ -85,7 +90,7 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.visible = false
-          this.$emit('refreshDataList', this.locationId, this.dataForm)
+          this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
         }
       })
     }