mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '修改bug' (#60) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #60
This commit is contained in:
朱文强 2022-03-15 14:38:09 +08:00
commit d4e0384e10
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
View File

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

6
src/views/basicData/Warehouse/components/processStorageLink.vue
View File

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