Browse Source

Merge pull request 'projects/mesxc-lb' (#250) from projects/mesxc-lb into projects/mesxc-test

Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/250
pull/251/head
高天泽 6 months ago
parent
commit
1ea2fe2738
11 changed files with 27 additions and 12 deletions
  1. +2
    -1
      src/views/specialEquipment/basic/FireFighthing.vue
  2. +2
    -1
      src/views/specialEquipment/basic/Manage.vue
  3. +1
    -2
      src/views/specialEquipment/basic/Safety.vue
  4. +4
    -1
      src/views/specialEquipment/check/Content-add.vue
  5. +4
    -1
      src/views/specialEquipment/check/Content-edit.vue
  6. +2
    -1
      src/views/specialEquipment/components/EquipmentInfoForm.vue
  7. +4
    -1
      src/views/specialEquipment/components/manageDrawerForm.vue
  8. +2
    -1
      src/views/specialEquipment/maintain/PlanConfig--add.vue
  9. +2
    -1
      src/views/specialEquipment/maintain/Repair--add.vue
  10. +2
    -1
      src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
  11. +2
    -1
      src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue

+ 2
- 1
src/views/specialEquipment/basic/FireFighthing.vue View File

@@ -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',
}, },
], ],
[ [


+ 2
- 1
src/views/specialEquipment/basic/Manage.vue View File

@@ -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' }],


+ 1
- 2
src/views/specialEquipment/basic/Safety.vue View File

@@ -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' }],


+ 4
- 1
src/views/specialEquipment/check/Content-add.vue View File

@@ -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) => ({


+ 4
- 1
src/views/specialEquipment/check/Content-edit.vue View File

@@ -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) => ({


+ 2
- 1
src/views/specialEquipment/components/EquipmentInfoForm.vue View File

@@ -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) {


+ 4
- 1
src/views/specialEquipment/components/manageDrawerForm.vue View File

@@ -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;


+ 2
- 1
src/views/specialEquipment/maintain/PlanConfig--add.vue View File

@@ -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) {


+ 2
- 1
src/views/specialEquipment/maintain/Repair--add.vue View File

@@ -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) => ({


+ 2
- 1
src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue View File

@@ -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) {


+ 2
- 1
src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue View File

@@ -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) {


Loading…
Cancel
Save