|
|
|
@ -215,7 +215,7 @@ export default { |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -230,7 +230,7 @@ export default { |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -248,7 +248,7 @@ export default { |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -265,7 +265,7 @@ export default { |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
addDisplay: false, |
|
|
|
addDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -280,7 +280,7 @@ export default { |
|
|
|
span: 12, |
|
|
|
span: 12, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -288,6 +288,7 @@ export default { |
|
|
|
trigger: 'blur', |
|
|
|
trigger: 'blur', |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
|
|
|
|
width: 120, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '主管工艺员', |
|
|
|
label: '主管工艺员', |
|
|
|
@ -298,7 +299,7 @@ export default { |
|
|
|
// search: true, |
|
|
|
// search: true, |
|
|
|
addDisplay: false, |
|
|
|
addDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -315,6 +316,7 @@ export default { |
|
|
|
// value: "id", |
|
|
|
// value: "id", |
|
|
|
// res:"data.records" |
|
|
|
// res:"data.records" |
|
|
|
// }, |
|
|
|
// }, |
|
|
|
|
|
|
|
width: 120, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '主管工艺员', |
|
|
|
label: '主管工艺员', |
|
|
|
@ -324,7 +326,7 @@ export default { |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
hide: true, |
|
|
|
hide: true, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -352,7 +354,7 @@ export default { |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
rules: [ |
|
|
|
rules: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
required: true, |
|
|
|
@ -369,7 +371,7 @@ export default { |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
dicUrl: '/api/blade-system/dict/dictionary?code=workCenterJfCenter', //字典中取值 |
|
|
|
dicUrl: '/api/blade-system/dict/dictionary?code=workCenterJfCenter', //字典中取值 |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
label: 'dictValue', |
|
|
|
label: 'dictValue', |
|
|
|
value: 'dictKey', |
|
|
|
value: 'dictKey', |
|
|
|
@ -381,6 +383,7 @@ export default { |
|
|
|
trigger: 'blur', |
|
|
|
trigger: 'blur', |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
|
|
|
|
width: 120, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '描述', |
|
|
|
label: '描述', |
|
|
|
@ -390,7 +393,7 @@ export default { |
|
|
|
hide: true, |
|
|
|
hide: true, |
|
|
|
overflow: true, |
|
|
|
overflow: true, |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
sortable: true, |
|
|
|
sortable: 'custom', |
|
|
|
// rules: [ |
|
|
|
// rules: [ |
|
|
|
// { |
|
|
|
// { |
|
|
|
// required: true, |
|
|
|
// required: true, |
|
|
|
@ -472,6 +475,7 @@ export default { |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
addDisplay: false, |
|
|
|
addDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
|
|
|
|
width: 150, |
|
|
|
}, |
|
|
|
}, |
|
|
|
], |
|
|
|
], |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -723,17 +727,14 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 排序 |
|
|
|
// 排序 |
|
|
|
sortChange({ prop, order }) { |
|
|
|
sortChange({ prop, order }) { |
|
|
|
if (!prop) { |
|
|
|
this.query.descs = undefined; |
|
|
|
// 如果取消排序,清空排序参数 |
|
|
|
this.query.ascs = undefined; |
|
|
|
this.query.orderByField = undefined; |
|
|
|
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs'; |
|
|
|
this.query.isAsc = undefined; |
|
|
|
this.query[orderByFieldKey] = !prop |
|
|
|
} else { |
|
|
|
? undefined |
|
|
|
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); |
|
|
|
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); |
|
|
|
this.query.orderByField = orderByField; |
|
|
|
// // 重新加载数据 |
|
|
|
this.query.isAsc = order === 'ascending' ? true : false; |
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
} |
|
|
|
|
|
|
|
// 重新加载数据 |
|
|
|
|
|
|
|
this.onLoad(); |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
onLoad() { |
|
|
|
onLoad() { |
|
|
|
getList({ |
|
|
|
getList({ |
|
|
|
|