|  |  |  | @ -4,13 +4,13 @@ | 
			
		
	
		
			
				
					|  |  |  |  |       <el-form :model="filterQuery" size="mini" label-width="100px" v-if="showSearch"> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-row> | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6"> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="DI/物资编码:"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="药品标识:"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入药品标识"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             </el-form-item> | 
			
		
	
		
			
				
					|  |  |  |  |           </el-col> | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6"> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="物资名称:"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="药品通用名称:"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物药品通用名称"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             </el-form-item> | 
			
		
	
		
			
				
					|  |  |  |  |           </el-col> | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6"> | 
			
		
	
	
		
			
				
					|  |  |  | @ -25,16 +25,16 @@ | 
			
		
	
		
			
				
					|  |  |  |  |           </el-col> | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6"> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="生产企业:" class="query-form-item"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人" | 
			
		
	
		
			
				
					|  |  |  |  |                         clearable="true"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             </el-form-item> | 
			
		
	
		
			
				
					|  |  |  |  |           </el-col> | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6"> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item label="物资分类:" class="query-form-item"> | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称" | 
			
		
	
		
			
				
					|  |  |  |  |               <el-input v-model="filterQuery.manufactory" style="width: 105%" placeholder="请输入生产企业/注册备案人" | 
			
		
	
		
			
				
					|  |  |  |  |                         clearable="true"></el-input> | 
			
		
	
		
			
				
					|  |  |  |  |             </el-form-item> | 
			
		
	
		
			
				
					|  |  |  |  |           </el-col> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--<el-col :span="6">--> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--  <el-form-item label="物资分类:" class="query-form-item">--> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--    <el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"--> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--              clearable="true"></el-input>--> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--  </el-form-item>--> | 
			
		
	
		
			
				
					|  |  |  |  |           <!--</el-col>--> | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |           <el-col :span="6" v-if="productRemarkSet.remarkEnable1"> | 
			
		
	
		
			
				
					|  |  |  |  |             <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item"> | 
			
		
	
	
		
			
				
					|  |  |  | @ -75,8 +75,8 @@ | 
			
		
	
		
			
				
					|  |  |  |  |         </el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column type="selection" width="55" v-if="type!=3"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="序号" type="index" width="55"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="药品标识" prop="nameCode" width="120" show-overflow-tooltip></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="药品通用名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="计量单位" prop="measname" width="90"></el-table-column> | 
			
		
	
	
		
			
				
					|  |  |  | @ -88,7 +88,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |         <el-table-column label="供应商" prop="supName" width="180"></el-table-column> | 
			
		
	
		
			
				
					|  |  |  |  |       </el-table> | 
			
		
	
		
			
				
					|  |  |  |  |     </el-card> | 
			
		
	
	
		
			
				
					|  |  |  | @ -218,6 +218,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  |       } else | 
			
		
	
		
			
				
					|  |  |  |  |         this.filterQuery.invCode = this.invQueryData.invCode; | 
			
		
	
		
			
				
					|  |  |  |  |       this.filterQuery.filterNoInv = 1; | 
			
		
	
		
			
				
					|  |  |  |  |       this.filterQuery.productsType = 2; | 
			
		
	
		
			
				
					|  |  |  |  |       //寄售 | 
			
		
	
		
			
				
					|  |  |  |  |       if (this.invQueryData.advanceType == 3) { | 
			
		
	
		
			
				
					|  |  |  |  |         getInvPreProductStock(this.filterQuery) | 
			
		
	
	
		
			
				
					|  |  |  | 
 |