merge test

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

@@ -94,13 +94,6 @@ export default {
 			choosedEquipments: [],
 			searchBarFormConfig: [{ label: '工序下设备' }],
 			tableProps: [
-				// {
-				// 	prop: 'createTime',
-				// 	label: '添加时间',
-				// 	fixed: true,
-				// 	width: 180,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				// },
 				{ prop: 'equipmentId', label: '设备名称' },
 				{ prop: 'materialName', label: '物料BOM' },
 				{ prop: 'valueName', label: '参数BOM' },
@@ -112,7 +105,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 			},
-			searchText: '',
+			searchText: ''
 		};
 	},
 	watch: {