projects/mes-test #132

Manually merged
gtz217 merged 281 commits from projects/mes-test into projects/mes 2023-11-30 09:11:34 +08:00
3 changed files with 37 additions and 25 deletions
Showing only changes of commit c74269b282 - Show all commits

View File

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

View File

@ -218,11 +218,13 @@ 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 || [];
@ -230,7 +232,11 @@ export default {
// //
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 (
eq.equChose ||
eq.materialsBom.chosen ||
eq.valuesBom.chosen
) {
this.selectedBoms.push({ this.selectedBoms.push({
equipmentId: eq.id, equipmentId: eq.id,
equMaterialBomId: eq.materialsBom.chosen, equMaterialBomId: eq.materialsBom.chosen,
@ -244,7 +250,12 @@ export default {
}); });
} else { } else {
this.bomList.splice(0); this.bomList.splice(0);
this.selectedBoms = [];
} }
})
.catch((err) => {
this.bomList.splice(0);
this.selectedBoms = [];
}); });
}, },
async handleAddEquipment() { async handleAddEquipment() {

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"