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,11 +218,13 @@ 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 || [];
@@ -230,7 +232,11 @@ 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,
@@ -244,7 +250,12 @@ export default {
 						});
 					} else {
 						this.bomList.splice(0);
+						this.selectedBoms = [];
 					}
+				})
+				.catch((err) => {
+					this.bomList.splice(0);
+					this.selectedBoms = [];
 				});
 		},
 		async handleAddEquipment() {

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"