diff --git a/src/views/basicData/Cache/cache.vue b/src/views/basicData/Cache/cache.vue index 71fa389..3d54870 100644 --- a/src/views/basicData/Cache/cache.vue +++ b/src/views/basicData/Cache/cache.vue @@ -134,7 +134,7 @@ export default { methods: { handleClick(raw) { if (raw.type === 'delete') { - this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.tareaName}]?`, this.$t('module.basicData.visual.Tips'), { + this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), { confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'), type: 'warning' diff --git a/src/views/basicData/Cache/components/cache-add.vue b/src/views/basicData/Cache/components/cache-add.vue index 17b8794..b0b574a 100644 --- a/src/views/basicData/Cache/components/cache-add.vue +++ b/src/views/basicData/Cache/components/cache-add.vue @@ -98,7 +98,7 @@ /> - + @@ -107,7 +107,7 @@ import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/C import { areaList, areaDelete } from '@/api/basicData/Cache/area' import BaseTable from '@/components/BaseTable' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' -import cacheAreaAdd from './cacheArea-add.vue' +import shelfAttrAdd from './shelfAttr-add.vue' import shelfBtn from './shelfBtn.vue' const tableBtn = [ { @@ -154,7 +154,7 @@ const tableProps = [ ] export default { - components: { BaseTable, MethodBtn, cacheAreaAdd }, + components: { BaseTable, MethodBtn, shelfAttrAdd }, data() { return { addOrUpdateVisible: false, diff --git a/src/views/basicData/Cache/components/shelf-add.vue b/src/views/basicData/Cache/components/shelf-add.vue index 3ff9c37..9e8ee91 100644 --- a/src/views/basicData/Cache/components/shelf-add.vue +++ b/src/views/basicData/Cache/components/shelf-add.vue @@ -75,7 +75,7 @@ const tableProps = [ align: 'center' }, { - prop: 'name', + prop: 'shelfName', label: i18n.t('module.basicData.cache.ShelfName'), align: 'center' }, diff --git a/src/views/basicData/Cache/components/shelfAttr-add.vue b/src/views/basicData/Cache/components/shelfAttr-add.vue index cf17bac..303085a 100644 --- a/src/views/basicData/Cache/components/shelfAttr-add.vue +++ b/src/views/basicData/Cache/components/shelfAttr-add.vue @@ -12,7 +12,7 @@ > - + @@ -56,15 +56,17 @@ export default { visible: false, isPage: false, dataForm: { + abbr: 'n', id: 0, areaId: '', - name: '', + shelfName: '', code: '', - shelfNumber: '' + shelfNumber: '', + total: '' }, areaArr: [], dataRule: { - name: [ + shelfName: [ { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.ShelfName')]), trigger: 'blur' } ], code: [ @@ -112,6 +114,7 @@ export default { this.$refs['dataForm'].validate((valid) => { if (valid) { const data = this.dataForm + console.log(data) if (this.dataForm.id) { shelfUpdate(data).then(res => { this.$message({ diff --git a/src/views/basicData/Cache/shelf.vue b/src/views/basicData/Cache/shelf.vue index 96c47f8..64b6ac7 100644 --- a/src/views/basicData/Cache/shelf.vue +++ b/src/views/basicData/Cache/shelf.vue @@ -181,6 +181,7 @@ export default { this.listLoading = true this.listQuery.name = key shelfList(this.listQuery).then(response => { + console.log(response) if (response.data.records) { this.list = response.data.records this.list.forEach(item => {