Compare commits

..

No commits in common. "c74269b2827fda8af419b7d58cbdd769b2e88419" and "4323982b89cfe0606cffc8cae44cd732f6ec2808" have entirely different histories.

3 changed files with 25 additions and 37 deletions

View File

@ -19,7 +19,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="filteredBomList.length" style="border: 1px solid #ccc; display: flex"> <el-row 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,7 +78,6 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<div class="no-data-bg" v-else></div>
</div> </div>
</template> </template>
; ;

View File

@ -218,45 +218,34 @@ 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 }) => {
.then(({ code, data }) => { if (code == 0) {
if (code == 0) { this.bomList = data.map((eq) => {
this.bomList = data.map((eq) => { eq.materialsBom = eq.materialsBom || [];
eq.materialsBom = eq.materialsBom || []; eq.valuesBom = eq.valuesBom || [];
eq.valuesBom = eq.valuesBom || []; //
// eq.materialsBom.chosen = eq.materialsBomChoseId ?? null;
eq.materialsBom.chosen = eq.materialsBomChoseId ?? null; eq.valuesBom.chosen = eq.valuesBomChoseId ?? null;
eq.valuesBom.chosen = eq.valuesBomChoseId ?? null; if (eq.equChose || eq.materialsBom.chosen || eq.valuesBom.chosen) {
if ( this.selectedBoms.push({
eq.equChose || equipmentId: eq.id,
eq.materialsBom.chosen || equMaterialBomId: eq.materialsBom.chosen,
eq.valuesBom.chosen equValueBomId: eq.valuesBom.chosen,
) { });
this.selectedBoms.push({ }
equipmentId: eq.id, // id
equMaterialBomId: eq.materialsBom.chosen, eq.materialsBom.equipmentId = eq.id;
equValueBomId: eq.valuesBom.chosen, eq.valuesBom.equipmentId = eq.id;
}); return eq;
} });
// id } else {
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;

View File

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