Compare commits
No commits in common. "1ea2fe27382e7ecced304c17b0785bc064918d30" and "b5049b22fadf6a119f1a57788e775ae19b9db337" have entirely different histories.
1ea2fe2738
...
b5049b22fa
@ -251,8 +251,7 @@ export default {
|
||||
select: true,
|
||||
label: '负责人',
|
||||
prop: 'responsiblePeopleId',
|
||||
url: '/base/core-worker/workerList',
|
||||
// url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/listAll',
|
||||
},
|
||||
],
|
||||
[
|
||||
|
@ -244,8 +244,7 @@ export default {
|
||||
select: true,
|
||||
label: '负责人',
|
||||
prop: 'responsiblePeopleId',
|
||||
url: '/base/core-worker/workerList',
|
||||
// url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/listAll',
|
||||
},
|
||||
],
|
||||
[{ input: true, label: '备注', prop: 'remark' }],
|
||||
|
@ -120,6 +120,7 @@ import {
|
||||
createEquipment,
|
||||
updateEquipment,
|
||||
deleteEquipment,
|
||||
getEquipment,
|
||||
getEquipmentPage,
|
||||
exportEquipmentExcel,
|
||||
} from '@/api/base/equipment';
|
||||
@ -243,7 +244,7 @@ export default {
|
||||
select: true,
|
||||
label: '负责人',
|
||||
prop: 'responsiblePeopleId',
|
||||
url: '/base/core-worker/workerList',
|
||||
url: '/base/core-worker/listAll',
|
||||
},
|
||||
],
|
||||
[{ input: true, label: '备注', prop: 'remark' }],
|
||||
|
@ -164,10 +164,7 @@ export default {
|
||||
}))
|
||||
);
|
||||
}
|
||||
const workerlist = await this.$axios(
|
||||
// '/base/core-worker/listAll'
|
||||
'/base/core-worker/workerList'
|
||||
);
|
||||
const workerlist = await this.$axios('/base/core-worker/listAll');
|
||||
if (workerlist.code == 0) {
|
||||
inspectorList = inspectorList.concat(
|
||||
workerlist.data.map((item) => ({
|
||||
|
@ -555,10 +555,7 @@ export default {
|
||||
}))
|
||||
);
|
||||
}
|
||||
const workerlist = await this.$axios(
|
||||
'/base/core-worker/workerList'
|
||||
// '/base/core-worker/listAll'
|
||||
);
|
||||
const workerlist = await this.$axios('/base/core-worker/listAll');
|
||||
if (workerlist.code == 0) {
|
||||
inspectorList = inspectorList.concat(
|
||||
workerlist.data.map((item) => ({
|
||||
|
@ -356,8 +356,7 @@ export default {
|
||||
async getRpList() {
|
||||
this.formLoading = true;
|
||||
const { code, data } = await this.$axios(
|
||||
'/base/core-worker/workerList'
|
||||
// '/base/core-worker/listAll'
|
||||
'/base/core-worker/listAll'
|
||||
);
|
||||
// debugger;
|
||||
if (code == 0) {
|
||||
|
@ -182,10 +182,7 @@ export default {
|
||||
|
||||
async getRpList() {
|
||||
this.formLoading = true;
|
||||
const { code, data } = await this.$axios(
|
||||
'/base/core-worker/workerList'
|
||||
// '/base/core-worker/listAll'
|
||||
);
|
||||
const { code, data } = await this.$axios('/base/core-worker/listAll');
|
||||
// debugger;
|
||||
if (code == 0) {
|
||||
this.rpList = data;
|
||||
|
@ -390,8 +390,7 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
@ -639,8 +639,7 @@ export default {
|
||||
);
|
||||
/** worker */
|
||||
const workerList = await this.$axios({
|
||||
url: '/base/core-worker/workerList',
|
||||
// url: '/base/core-worker/listAll',
|
||||
url: '/base/core-worker/listAll',
|
||||
});
|
||||
list = list.concat(
|
||||
(workerList.data || []).map((item) => ({
|
||||
|
@ -326,8 +326,7 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
@ -598,8 +598,7 @@ export default {
|
||||
const urls = [
|
||||
'/base/core-production-line/listAll',
|
||||
'/base/core-department/listAll',
|
||||
'/base/core-worker/workerList',
|
||||
// '/base/core-worker/listAll',
|
||||
'/base/core-worker/listAll',
|
||||
];
|
||||
let res;
|
||||
switch (source) {
|
||||
|
Loading…
Reference in New Issue
Block a user