productDev/funingyunwei.git

			@@ -36,7 +36,7 @@
			<div class="list">
			<div class="list_search">
			<div class="list_search_left">
			<el-input v-model="form.code" style="width: 200px; margin-right: 10px;" placeholder="请输入物料名称/编码"></el-input>
			<el-input v-model="form.materialCode" style="width: 200px; margin-right: 10px;" placeholder="请输入物料名称/编码"></el-input>
			<el-select v-model="form.status" style="width: 150px; margin-right: 10px;" placeholder="盘点状态">
			<el-option label="已盘" :value="1"></el-option>
			<el-option label="未盘" :value="0"></el-option>
			@@ -68,7 +68,13 @@
			<el-table-column prop="materialUnitName" label="单位" show-overflow-tooltip />
			<el-table-column prop="warehouseName" label="所在仓库" show-overflow-tooltip />
			<el-table-column prop="stock" label="账面数量" show-overflow-tooltip />
			<el-table-column prop="actStock" label="盘点数量" show-overflow-tooltip />
			<el-table-column label="盘点数量" show-overflow-tooltip>
			<template slot-scope="{row}">
			<span style="color: red;" v-if="row.type === 1">{{row.actStock}}</span>
			<span style="color: green;" v-else-if="row.type === 2">{{row.actStock}}</span>
			<span v-else>{{row.actStock}}</span>
			</template>
			</el-table-column>
			<el-table-column prop="remark" label="备注" show-overflow-tooltip />
			</el-table>
			</div>
			@@ -104,7 +110,7 @@
			info: {},
			list: [],
			form: {
			code: '',
			materialCode: '',
			status: '',
			type: ''
			},
			@@ -139,6 +145,7 @@
			this.form.name = ''
			this.form.status = ''
			this.form.type = ''
			this.form.materialCode = ''
			this.page = 1
			this.getList()
			},
			@@ -148,12 +155,13 @@
			page: this.page,
			model: {
			stocktakingId: this.id,
			code: this.form.code,
			materialCode: this.form.materialCode,
			status: this.form.status,
			type: this.form.type
			}
			}).then(res => {
			this.list = res.records
			this.total = res.total
			})
			}
			}