mes-ocea-before.git

			@@ -375,7 +375,7 @@
			>
			<template slot="header">
			<div style="line-height: 14px;">可用数量</div>
			<!-- <div class="th" @click.stop>
			<div class="th" @click.stop>
			<el-input
			type="text"
			v-model="queryParamTwo.availableStockQuantity"
			@@ -384,7 +384,7 @@
			@clear="handleStockList"
			size="mini"
			></el-input>
			</div> -->
			</div>
			</template>
			<template slot-scope="scope">
			<span>{{ scope.row.availableStockQuantity }}</span>
			@@ -393,7 +393,7 @@
			<el-table-column label="库存数量" prop="stockQuantity" align="center">
			<template slot="header">
			<div style="line-height: 14px;">库存数量</div>
			<!-- <div class="th" @click.stop>
			<div class="th" @click.stop>
			<el-input
			type="text"
			v-model="queryParamTwo.stockQuantity"
			@@ -402,7 +402,7 @@
			@clear="handleStockList"
			size="mini"
			></el-input>
			</div> -->
			</div>
			</template>
			<template slot-scope="scope">
			<span>{{ scope.row.stockQuantity }}</span>
			@@ -1382,6 +1382,30 @@
			<span>{{ scope.row.stockQuantity }}</span>
			</template>
			</el-table-column>
			<el-table-column label="是否工序库存" prop="operationStockStatus" align="center">
			<template slot-scope="scope">
			<span v-if="scope.row.operationStockStatus">是</span>
			<span v-else>否</span>
			</template>
			</el-table-column>
			<el-table-column label="所属工序" prop="name" align="center">
			<template slot="header">
			<div style="line-height: 14px;">所属工序</div>
			<div class="th" @click.stop>
			<el-input
			type="text"
			v-model="queryParamTwo.name"
			@keyup.enter.native="handleStockList"
			clearable
			@clear="handleStockList"
			size="mini"
			></el-input>
			</div>
			</template>
			<template slot-scope="scope">
			<span>{{ scope.row.name }}</span>
			</template>
			</el-table-column>
			<el-table-column label="库位号" prop="ifsLocation" align="center">
			<template slot="header" slot-scope="scope">
			<div style="line-height: 14px;">库位号</div>
			@@ -2200,6 +2224,14 @@
			}
			},
			watch: {
			showFeedForm:{
			handler(newVal,oldVal){
			if(!newVal){
			this.$refs.stockTable.toggleAllSelection(false)
			}
			},
			deep: true
			},
			workstationId() {
			this.$nextTick(() => {
			if (this.currItem != null && this.currItem === 'feed') {