fzq #20

Merged
zwq merged 10 commits from fzq into develop 2022-02-28 10:33:31 +08:00
5 changed files with 13 additions and 9 deletions
Showing only changes of commit 64c27487c5 - Show all commits

View File

@ -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'

View File

@ -98,7 +98,7 @@
/>
</base-table>
</div>
<cacheArea-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
<shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
</div>
</template>
@ -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,

View File

@ -75,7 +75,7 @@ const tableProps = [
align: 'center'
},
{
prop: 'name',
prop: 'shelfName',
label: i18n.t('module.basicData.cache.ShelfName'),
align: 'center'
},

View File

@ -12,7 +12,7 @@
>
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
<el-form-item :label="$t('module.basicData.cache.ShelfName')" prop="name">
<el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
<el-input v-model="dataForm.shelfName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.ShelfCode')" prop="code">
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfCode')])" clearable />
@ -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({

View File

@ -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 => {