Merge pull request '修改bug' (#60) from zwq into develop
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	continuous-integration/drone/push Build is passing
				
			Reviewed-on: #60
This commit is contained in:
		@@ -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'
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
 
 | 
			
		||||
@@ -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'), {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user