Merge pull request 'projects/mes-lb' (#119) from projects/mes-lb into projects/mes-test

Reviewed-on: #119

src/views/extend/processFlowView/components/BomSelector.vue

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

src/views/extend/processFlowView/components/ProcessBomList.vue

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

src/views/extend/processFlowView/components/ProcessDetail.vue

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