Merge branch 'master' of http://115.190.214.62:3001/Teams/kunshan-bzfm-mes-vue
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
<dict-tag :options="options.locationTypeOptions" :value="scope.row.locationType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态(停用/启用)" align="center" v-if="columns.showColumn('status')">
|
||||
<el-table-column prop="status" label="状态" align="center" v-if="columns.showColumn('status')">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="options.statusOptions" :value="scope.row.status" />
|
||||
</template>
|
||||
@@ -149,7 +149,7 @@
|
||||
|
||||
<el-col :lg="12">
|
||||
<el-form-item label="库位类型" prop="locationType">
|
||||
<el-select v-model="form.locationType" placeholder="请选择库位类型(半成品/成品/临时/返工/报废)">
|
||||
<el-select v-model="form.locationType" placeholder="请选择库位类型">
|
||||
<el-option
|
||||
v-for="item in options.locationTypeOptions"
|
||||
:key="item.dictValue"
|
||||
@@ -223,8 +223,8 @@ const columns = ref([
|
||||
{ visible: true, align: 'center', type: '', prop: 'areaName', label: '区域名称', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: '', prop: 'capacity', label: '容量' },
|
||||
{ visible: false, align: 'center', type: '', prop: 'unit', label: '容量单位', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: 'dict', prop: 'locationType', label: '库位类型(半成品/成品/临时/返工/报废)', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: 'dict', prop: 'status', label: '状态(停用/启用)', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: 'dict', prop: 'locationType', label: '库位类型', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: 'dict', prop: 'status', label: '状态', showOverflowTooltip: true },
|
||||
{ visible: true, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: '', prop: 'updatedTime', label: '更新时间', showOverflowTooltip: true },
|
||||
{ visible: false, align: 'center', type: '', prop: 'description', label: '描述', showOverflowTooltip: true }
|
||||
@@ -292,8 +292,41 @@ const state = reactive({
|
||||
warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }]
|
||||
},
|
||||
options: {
|
||||
// 库位类型(半成品/成品/临时/返工/报废) 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
locationTypeOptions: [],
|
||||
// 库位类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
locationTypeOptions: [
|
||||
{
|
||||
dictValue: '原材料',
|
||||
dictLabel: '原材料'
|
||||
},
|
||||
{
|
||||
dictValue: '半成品',
|
||||
dictLabel: '半成品'
|
||||
},
|
||||
{
|
||||
dictValue: '产成品',
|
||||
dictLabel: '产成品'
|
||||
},
|
||||
{
|
||||
dictValue: '临时',
|
||||
dictLabel: '临时'
|
||||
},
|
||||
{
|
||||
dictValue: '返工',
|
||||
dictLabel: '返工'
|
||||
},
|
||||
{
|
||||
dictValue: '退货',
|
||||
dictLabel: '退货'
|
||||
},
|
||||
{
|
||||
dictValue: '转用',
|
||||
dictLabel: '转用'
|
||||
},
|
||||
{
|
||||
dictValue: '报废',
|
||||
dictLabel: '报废'
|
||||
}
|
||||
],
|
||||
// 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
|
||||
statusOptions: [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user