update 完成厂务,优化dialog
This commit is contained in:
parent
0ef30e1985
commit
db5b5091e1
@ -163,7 +163,6 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
console.log('mounted>..')
|
||||
/** 计算 defaultPlaceholders */
|
||||
const prefix = '请输入'
|
||||
Object.entries(this.defaultNames).map(([key, value]) => {
|
||||
@ -254,7 +253,17 @@ export default {
|
||||
const opt = this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]
|
||||
if (opt) {
|
||||
// if opt is valid
|
||||
return opt.placeholder ? opt.placeholder : this.defaultPlaceholders[opt.name]
|
||||
return opt.placeholder
|
||||
? opt.placeholder
|
||||
: this.defaultPlaceholders[opt.name]
|
||||
? this.defaultPlaceholders[opt.name]
|
||||
: opt.label
|
||||
? (opt.type === 'select' ? '请选择' : '请输入') + opt.label
|
||||
: null
|
||||
|
||||
// : opt.type === 'select'
|
||||
// ? '请选择'
|
||||
// : '请输入'
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -62,12 +62,29 @@ const tableConfigs = [
|
||||
{ prop: 'createTime', name: '添加时间' },
|
||||
{ prop: 'name', name: '工段名称' },
|
||||
{ prop: 'code', name: '工段编码' },
|
||||
{ prop: 'productionLineId', name: '产线ID' },
|
||||
// { prop: 'productionLineId', name: '产线ID' },
|
||||
{ prop: 'productionLineName', name: '产线' },
|
||||
{ prop: 'remark', name: '备注' },
|
||||
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
|
||||
]
|
||||
|
||||
const addOrUpdateConfigs = {}
|
||||
const addOrUpdateConfigs = {
|
||||
type: 'dialog',
|
||||
infoUrl: '/monitoring/workshopSection',
|
||||
fields: [
|
||||
{ name: 'name', label: '工段名称' },
|
||||
{ name: 'code', label: '工段编码', api: '/monitoring/workshopSection/getCode' },
|
||||
{ name: 'productionLineId', label: '所属产线', type: 'select', options: [] },
|
||||
'description',
|
||||
'remark'
|
||||
],
|
||||
operations: [
|
||||
{ name: 'reset', url: true, showAlways: true },
|
||||
{ name: 'cancel', url: true, showAlways: true },
|
||||
{ name: 'save', url: '/monitoring/workshopSection', permission: '', showOnEdit: false },
|
||||
{ name: 'update', url: '/monitoring/workshopSection', permission: '', showOnEdit: true }
|
||||
]
|
||||
}
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@ -78,6 +95,7 @@ export default {
|
||||
key: ''
|
||||
},
|
||||
dataList: [],
|
||||
plList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
totalPage: 0,
|
||||
@ -91,9 +109,27 @@ export default {
|
||||
BaseTable
|
||||
},
|
||||
activated() {
|
||||
this.getProductLine()
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
// 获取产线列表
|
||||
getProductLine() {
|
||||
this.$http.get(this.$http.adornUrl('/monitoring/productionLine/list')).then(({ data: res }) => {
|
||||
if (res && res.code === 0) {
|
||||
// this.plList = res.data
|
||||
console.log('res', res)
|
||||
this.addOrUpdateConfigs.fields.forEach(item => {
|
||||
if (item.name === 'productionLineId') item.options = res.data.map(item => ({ label: item.name, value: item.id }))
|
||||
})
|
||||
} else {
|
||||
this.addOrUpdateConfigs.fields.forEach(item => {
|
||||
if (item.name === 'productionLineId') item.options.splice(0)
|
||||
})
|
||||
// this.plList.splice(0)
|
||||
}
|
||||
})
|
||||
},
|
||||
// 获取数据列表
|
||||
getDataList() {
|
||||
this.addOrUpdateVisible = false
|
||||
|
Loading…
Reference in New Issue
Block a user