|
|
@@ -53,7 +53,7 @@ import { |
|
|
|
getMaterialManagePage, |
|
|
|
outInRecordRecordExport |
|
|
|
} from '@/api/consumablesManagement' |
|
|
|
import { sideLibraryList, materialList } from '@/api/basicConfig' |
|
|
|
import { sideLibraryList, getMaterialArr } from '@/api/basicConfig' |
|
|
|
const tableProps = [ |
|
|
|
{ |
|
|
|
prop: 'line', |
|
|
@@ -154,6 +154,7 @@ export default { |
|
|
|
labelField: 'name', |
|
|
|
valueField: 'name', |
|
|
|
defaultSelect: '', |
|
|
|
filterable: true, |
|
|
|
width: 150 |
|
|
|
}, |
|
|
|
{ |
|
|
@@ -230,7 +231,7 @@ export default { |
|
|
|
} |
|
|
|
}, |
|
|
|
getMaterialList() { |
|
|
|
materialList().then((res) => { |
|
|
|
getMaterialArr().then((res) => { |
|
|
|
console.log(res) |
|
|
|
if (res.code === 0) { |
|
|
|
this.formConfig[2].selectOptions = res.data |
|
|
|