projects/mes-test #133

병합
gtz217 projects/mes-test 에서 projects/mes 로 281 commits 를 머지했습니다 2023-11-30 09:11:34 +08:00
3개의 변경된 파일37개의 추가작업 그리고 25개의 파일을 삭제
Showing only changes of commit 68d3b46bab - Show all commits

파일 보기

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

파일 보기

@@ -218,34 +218,45 @@ export default {
this.total = 0;
}
this.selectedBoms = [];
// 获取设备及bom列表
this.http('/extend/process-flow-det/getEquipmentDetBySectionId', 'post', {
sectionId,
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.selectedBoms = [];
});
},
async handleAddEquipment() {
this.open = true;

파일 보기

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