~zhangleilei/supipe.git

			@@ -14,14 +14,15 @@
			</div>
			<div class="header_item">
			<span class="header_label">供应商：</span>
			<el-select v-model="search.supplierId" placeholder="请选择供应商" clearable>
			<!-- <el-select v-model="search.supplierId" placeholder="请选择供应商" clearable>
			<el-option
			v-for="item in optionsSupplierType"
			:key="item.id"
			:label="item.supplierName"
			:value="item.id">
			</el-option>
			</el-select>
			</el-select> -->
			<el-input v-model="search.supplierName" clearable placeholder="请输入供应商"></el-input>
			</div>
			<div class="header_item">
			<span class="header_label">入库时间：</span>
			@@ -118,15 +119,16 @@
			<el-form-item label="入库重量：" prop="changeStock">
			<el-input v-model="ruleForm.changeStock" :size="size" type="number" clearable placeholder="请输入入库重量"></el-input>
			</el-form-item>
			<el-form-item label="供应商：" prop="supplierId">
			<el-select v-model="ruleForm.supplierId" placeholder="请选择供应商">
			<el-form-item label="供应商：" prop="supplierName">
			<!-- <el-select v-model="ruleForm.supplierId" placeholder="请选择供应商">
			<el-option
			v-for="item in optionsSupplierType"
			:key="item.id"
			:label="item.supplierName"
			:value="item.id">
			</el-option>
			</el-select>
			</el-select> -->
			<el-input v-model="ruleForm.supplierName" :size="size" clearable placeholder="请输入供应商"></el-input>
			</el-form-item>
			</el-form>
			<div slot="footer">
			@@ -170,10 +172,10 @@
			message: '请输入入库重量',
			trigger: 'blur'
			}],
			supplierId: [{
			supplierName: [{
			required: true,
			message: '请选择供应商',
			trigger: 'change'
			message: '请输入供应商',
			trigger: 'blur'
			}],
			factoryName: [{
			required: true,