Merge pull request 'projects/mesxc-lb' (#250) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #250
This commit is contained in:
commit
1ea2fe2738
@ -251,7 +251,8 @@ export default {
|
||||
select: true,
|
||||
label: '负责人',
|
||||
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,
|
||||
label: '负责人',
|
||||
prop: 'responsiblePeopleId',
|
||||
url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/workerList',
|
||||
// url: '/base/core-worker/listAll',
|
||||
},
|
||||
],
|
||||
[{ input: true, label: '备注', prop: 'remark' }],
|
||||
|
@ -120,7 +120,6 @@ import {
|
||||
createEquipment,
|
||||
updateEquipment,
|
||||
deleteEquipment,
|
||||
getEquipment,
|
||||
getEquipmentPage,
|
||||
exportEquipmentExcel,
|
||||
} from '@/api/base/equipment';
|
||||
@ -244,7 +243,7 @@ export default {
|
||||
select: true,
|
||||
label: '负责人',
|
||||
prop: 'responsiblePeopleId',
|
||||
url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/workerList',
|
||||
},
|
||||
],
|
||||
[{ 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) {
|
||||
inspectorList = inspectorList.concat(
|
||||
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) {
|
||||
inspectorList = inspectorList.concat(
|
||||
workerlist.data.map((item) => ({
|
||||
|
@ -356,7 +356,8 @@ export default {
|
||||
async getRpList() {
|
||||
this.formLoading = true;
|
||||
const { code, data } = await this.$axios(
|
||||
'/base/core-worker/listAll'
|
||||
'/base/core-worker/workerList'
|
||||
// '/base/core-worker/listAll'
|
||||
);
|
||||
// debugger;
|
||||
if (code == 0) {
|
||||
|
@ -182,7 +182,10 @@ export default {
|
||||
|
||||
async getRpList() {
|
||||
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;
|
||||
if (code == 0) {
|
||||
this.rpList = data;
|
||||
|
@ -390,7 +390,8 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
@ -639,7 +639,8 @@ export default {
|
||||
);
|
||||
/** worker */
|
||||
const workerList = await this.$axios({
|
||||
url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/workerList',
|
||||
// url: '/base/core-worker/listAll',
|
||||
});
|
||||
list = list.concat(
|
||||
(workerList.data || []).map((item) => ({
|
||||
|
@ -326,7 +326,8 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
@ -598,7 +598,8 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
Ladataan…
Viittaa uudesa ongelmassa
Block a user