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-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">
<div class="select-list">
<div class="sl__header" style="background: #f3f4fb; padding: 12px">
@ -78,7 +78,6 @@
</div>
</el-col>
</el-row>
<div class="no-data-bg" v-else></div>
</div>
</template>
;

View File

@ -218,13 +218,11 @@ export default {
this.total = 0;
}
this.selectedBoms = [];
// bom
this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', {
sectionId,
flowDetId: detId,
})
.then(({ code, data }) => {
}).then(({ code, data }) => {
if (code == 0) {
this.bomList = data.map((eq) => {
eq.materialsBom = eq.materialsBom || [];
@ -232,11 +230,7 @@ export default {
//
eq.materialsBom.chosen = eq.materialsBomChoseId ?? null;
eq.valuesBom.chosen = eq.valuesBomChoseId ?? null;
if (
eq.equChose ||
eq.materialsBom.chosen ||
eq.valuesBom.chosen
) {
if (eq.equChose || eq.materialsBom.chosen || eq.valuesBom.chosen) {
this.selectedBoms.push({
equipmentId: eq.id,
equMaterialBomId: eq.materialsBom.chosen,
@ -250,12 +244,7 @@ export default {
});
} else {
this.bomList.splice(0);
this.selectedBoms = [];
}
})
.catch((err) => {
this.bomList.splice(0);
this.selectedBoms = [];
});
},
async handleAddEquipment() {

View File

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