#119 projects/mes-lb

已合併
g7hoo 9 月之前 將 2 次代碼提交從 projects/mes-lb合併至 projects/mes-test
  1. +2
    -1
      src/views/extend/processFlowView/components/BomSelector.vue
  2. +34
    -23
      src/views/extend/processFlowView/components/ProcessBomList.vue
  3. +1
    -1
      src/views/extend/processFlowView/components/ProcessDetail.vue

+ 2
- 1
src/views/extend/processFlowView/components/BomSelector.vue 查看文件

@@ -19,7 +19,7 @@
</el-col> </el-col>
</el-row> </el-row>


<el-row style="border: 1px solid #ccc; display: flex">
<el-row v-if="filteredBomList.length" style="border: 1px solid #ccc; display: flex">
<el-col :span="8"> <el-col :span="8">
<div class="select-list"> <div class="select-list">
<div class="sl__header" style="background: #f3f4fb; padding: 12px"> <div class="sl__header" style="background: #f3f4fb; padding: 12px">
@@ -78,6 +78,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<div class="no-data-bg" v-else></div>
</div> </div>
</template> </template>
; ;


+ 34
- 23
src/views/extend/processFlowView/components/ProcessBomList.vue 查看文件

@@ -218,34 +218,45 @@ export default {
this.total = 0; this.total = 0;
} }


this.selectedBoms = [];
// 获取设备及bom列表 // 获取设备及bom列表
this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', { this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', {
sectionId, sectionId,
flowDetId: detId, flowDetId: detId,
}).then(({ code, data }) => {
if (code == 0) {
this.bomList = data.map((eq) => {
eq.materialsBom = eq.materialsBom || [];
eq.valuesBom = eq.valuesBom || [];
// 设置选中状态
eq.materialsBom.chosen = eq.materialsBomChoseId ?? null;
eq.valuesBom.chosen = eq.valuesBomChoseId ?? null;
if (eq.equChose || eq.materialsBom.chosen || eq.valuesBom.chosen) {
this.selectedBoms.push({
equipmentId: eq.id,
equMaterialBomId: eq.materialsBom.chosen,
equValueBomId: eq.valuesBom.chosen,
});
}
// 设置设备id
eq.materialsBom.equipmentId = eq.id;
eq.valuesBom.equipmentId = eq.id;
return eq;
});
} else {
})
.then(({ code, data }) => {
if (code == 0) {
this.bomList = data.map((eq) => {
eq.materialsBom = eq.materialsBom || [];
eq.valuesBom = eq.valuesBom || [];
// 设置选中状态
eq.materialsBom.chosen = eq.materialsBomChoseId ?? null;
eq.valuesBom.chosen = eq.valuesBomChoseId ?? null;
if (
eq.equChose ||
eq.materialsBom.chosen ||
eq.valuesBom.chosen
) {
this.selectedBoms.push({
equipmentId: eq.id,
equMaterialBomId: eq.materialsBom.chosen,
equValueBomId: eq.valuesBom.chosen,
});
}
// 设置设备id
eq.materialsBom.equipmentId = eq.id;
eq.valuesBom.equipmentId = eq.id;
return eq;
});
} else {
this.bomList.splice(0);
this.selectedBoms = [];
}
})
.catch((err) => {
this.bomList.splice(0); this.bomList.splice(0);
}
});
this.selectedBoms = [];
});
}, },
async handleAddEquipment() { async handleAddEquipment() {
this.open = true; this.open = true;


+ 1
- 1
src/views/extend/processFlowView/components/ProcessDetail.vue 查看文件

@@ -34,7 +34,7 @@
class="btn-refresh" class="btn-refresh"
@click="handleUpdateLayout" @click="handleUpdateLayout"
icon="el-icon-refresh"> icon="el-icon-refresh">
刷新布局
保存布局
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"


Loading…
取消
儲存