Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/250pull/251/head
@@ -251,7 +251,8 @@ export default { | |||||
select: true, | select: true, | ||||
label: '负责人', | label: '负责人', | ||||
prop: 'responsiblePeopleId', | prop: 'responsiblePeopleId', | ||||
url: '/base/core-worker/listAll', | |||||
url: '/base/core-worker/workerList', | |||||
// url: '/base/core-worker/listAll', | |||||
}, | }, | ||||
], | ], | ||||
[ | [ | ||||
@@ -244,7 +244,8 @@ export default { | |||||
select: true, | select: true, | ||||
label: '负责人', | label: '负责人', | ||||
prop: 'responsiblePeopleId', | prop: 'responsiblePeopleId', | ||||
url: '/base/core-worker/listAll', | |||||
url: '/base/core-worker/workerList', | |||||
// url: '/base/core-worker/listAll', | |||||
}, | }, | ||||
], | ], | ||||
[{ input: true, label: '备注', prop: 'remark' }], | [{ input: true, label: '备注', prop: 'remark' }], | ||||
@@ -120,7 +120,6 @@ import { | |||||
createEquipment, | createEquipment, | ||||
updateEquipment, | updateEquipment, | ||||
deleteEquipment, | deleteEquipment, | ||||
getEquipment, | |||||
getEquipmentPage, | getEquipmentPage, | ||||
exportEquipmentExcel, | exportEquipmentExcel, | ||||
} from '@/api/base/equipment'; | } from '@/api/base/equipment'; | ||||
@@ -244,7 +243,7 @@ export default { | |||||
select: true, | select: true, | ||||
label: '负责人', | label: '负责人', | ||||
prop: 'responsiblePeopleId', | prop: 'responsiblePeopleId', | ||||
url: '/base/core-worker/listAll', | |||||
url: '/base/core-worker/workerList', | |||||
}, | }, | ||||
], | ], | ||||
[{ input: true, label: '备注', prop: 'remark' }], | [{ input: true, label: '备注', prop: 'remark' }], | ||||
@@ -164,7 +164,10 @@ export default { | |||||
})) | })) | ||||
); | ); | ||||
} | } | ||||
const workerlist = await this.$axios('/base/core-worker/listAll'); | |||||
const workerlist = await this.$axios( | |||||
// '/base/core-worker/listAll' | |||||
'/base/core-worker/workerList' | |||||
); | |||||
if (workerlist.code == 0) { | if (workerlist.code == 0) { | ||||
inspectorList = inspectorList.concat( | inspectorList = inspectorList.concat( | ||||
workerlist.data.map((item) => ({ | workerlist.data.map((item) => ({ | ||||
@@ -555,7 +555,10 @@ export default { | |||||
})) | })) | ||||
); | ); | ||||
} | } | ||||
const workerlist = await this.$axios('/base/core-worker/listAll'); | |||||
const workerlist = await this.$axios( | |||||
'/base/core-worker/workerList' | |||||
// '/base/core-worker/listAll' | |||||
); | |||||
if (workerlist.code == 0) { | if (workerlist.code == 0) { | ||||
inspectorList = inspectorList.concat( | inspectorList = inspectorList.concat( | ||||
workerlist.data.map((item) => ({ | workerlist.data.map((item) => ({ | ||||
@@ -356,7 +356,8 @@ export default { | |||||
async getRpList() { | async getRpList() { | ||||
this.formLoading = true; | this.formLoading = true; | ||||
const { code, data } = await this.$axios( | const { code, data } = await this.$axios( | ||||
'/base/core-worker/listAll' | |||||
'/base/core-worker/workerList' | |||||
// '/base/core-worker/listAll' | |||||
); | ); | ||||
// debugger; | // debugger; | ||||
if (code == 0) { | if (code == 0) { | ||||
@@ -182,7 +182,10 @@ export default { | |||||
async getRpList() { | async getRpList() { | ||||
this.formLoading = true; | this.formLoading = true; | ||||
const { code, data } = await this.$axios('/base/core-worker/listAll'); | |||||
const { code, data } = await this.$axios( | |||||
'/base/core-worker/workerList' | |||||
// '/base/core-worker/listAll' | |||||
); | |||||
// debugger; | // debugger; | ||||
if (code == 0) { | if (code == 0) { | ||||
this.rpList = data; | this.rpList = data; | ||||
@@ -390,7 +390,8 @@ export default { | |||||
const urls = [ | const urls = [ | ||||
'/base/core-production-line/listAll', | '/base/core-production-line/listAll', | ||||
'/base/core-department/listAll', | '/base/core-department/listAll', | ||||
'/base/core-worker/listAll', | |||||
'/base/core-worker/workerList', | |||||
// '/base/core-worker/listAll', | |||||
]; | ]; | ||||
let res; | let res; | ||||
switch (source) { | switch (source) { | ||||
@@ -639,7 +639,8 @@ export default { | |||||
); | ); | ||||
/** worker */ | /** worker */ | ||||
const workerList = await this.$axios({ | const workerList = await this.$axios({ | ||||
url: '/base/core-worker/listAll', | |||||
url: '/base/core-worker/workerList', | |||||
// url: '/base/core-worker/listAll', | |||||
}); | }); | ||||
list = list.concat( | list = list.concat( | ||||
(workerList.data || []).map((item) => ({ | (workerList.data || []).map((item) => ({ | ||||
@@ -326,7 +326,8 @@ export default { | |||||
const urls = [ | const urls = [ | ||||
'/base/core-production-line/listAll', | '/base/core-production-line/listAll', | ||||
'/base/core-department/listAll', | '/base/core-department/listAll', | ||||
'/base/core-worker/listAll', | |||||
'/base/core-worker/workerList', | |||||
// '/base/core-worker/listAll', | |||||
]; | ]; | ||||
let res; | let res; | ||||
switch (source) { | switch (source) { | ||||
@@ -598,7 +598,8 @@ export default { | |||||
const urls = [ | const urls = [ | ||||
'/base/core-production-line/listAll', | '/base/core-production-line/listAll', | ||||
'/base/core-department/listAll', | '/base/core-department/listAll', | ||||
'/base/core-worker/listAll', | |||||
'/base/core-worker/workerList', | |||||
// '/base/core-worker/listAll', | |||||
]; | ]; | ||||
let res; | let res; | ||||
switch (source) { | switch (source) { | ||||