Browse Source

Merge branch 'feature-0712' into 'dev'

fix: 行政区划过滤掉第一层数据

See merge request project/water/shuili-vue!147
sy-water-data-board-ui
黄星淮 9 months ago
parent
commit
9e1c60c98f
  1. 3
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  2. 1
      src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
  3. 1
      src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
  4. 1
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  5. 1
      src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
  6. 1
      src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
  7. 1
      src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
  8. 1
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

3
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -68,8 +68,9 @@ export default {
if (i.parentid === pid) { if (i.parentid === pid) {
const newItem = { const newItem = {
label: i.name, label: i.name,
value: i.id, value: i.id
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue

@ -73,6 +73,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue

@ -75,6 +75,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -100,6 +100,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@ -69,6 +69,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue

@ -70,6 +70,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue

@ -66,6 +66,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

1
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -99,6 +99,7 @@ export default {
label: i.name, label: i.name,
value: i.id, value: i.id,
}; };
if (i.parentid === items.data[0].parentid) newItem.disabled = true;
if (i.layer != 3) newItem.children = []; if (i.layer != 3) newItem.children = [];
res.push(newItem); res.push(newItem);
getChildren(newItem.children, newItem.value); getChildren(newItem.children, newItem.value);

Loading…
Cancel
Save