mes-ocea-before.git

			@@ -398,13 +398,13 @@
			<!-- </el-table>-->
			<!-- </el-card>-->
			<!-- </el-tab-pane>-->
			<el-tab-pane label="工单供应表" v-if="this.dataForm.id">
			<!-- <el-tab-pane label="工单供应表" v-if="this.dataForm.id">
			<manufacturing-order :operationId="this.dataForm.id" ref="manufacturing"></manufacturing-order>
			</el-tab-pane>
			<el-tab-pane label="工单所需物料" v-if="this.dataForm.id">
			</el-tab-pane> -->
			<!-- <el-tab-pane label="工单所需物料" v-if="this.dataForm.id">
			<operation-supply :operationId="this.dataForm.id" :routingOperationId="this.dataForm.moRoutingOperationId"
			ref="manufacturing"></operation-supply>
			</el-tab-pane>
			</el-tab-pane> -->
			</el-tabs>

			<span slot="footer" class="dialog-footer">

			@@ -115,6 +115,8 @@
			var query = {}
			this.workstationFeedList = []
			if (this.workstationId && this.workstationId != null) {
			let operationTaskId=JSON.parse(localStorage.getItem("OPERATION_TASK_ID"))
			query.operationTaskId=operationTaskId
			getWorkstationFeed(query, this.workstationId)
			.then((response) => {
			var data = response.data

			@@ -62,7 +62,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="BOM" prop="bomId">
			<el-select style="width:100%" :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
			<el-select style="width:100%" v-model="dataForm.bomId" placeholder="" filterable>
			<el-option
			v-for="item in bomList"
			:key="item.id"

	src/views/plan/operationtask/operationtask-form.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/product/workbench/productInDialog.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/technology/routing/routing-form.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史