| 
					
				 | 
			
			
				@@ -1,7 +1,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <el-dialog 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     width="980px" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    title="商品列表" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    title="辅材列表" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     :visible.sync="innerVisible" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     append-to-body 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     :close-on-click-modal="false" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -11,8 +11,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-form ref="tableScreenForm" :model="tableScreenForm" label-width="70px" size="small" label-position="left"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-row :gutter="20"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-col :xs="24" :sm="8" :lg="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <el-form-item label="商品编号" prop="goodsId"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <el-input v-model="tableScreenForm.goodsId" placeholder="商品编号" size="small" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-form-item label="辅材编号" prop="goodsId"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <el-input v-model="tableScreenForm.goodsId" placeholder="辅材编号" size="small" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-col :xs="24" :sm="8" :lg="8"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -41,8 +41,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-col :xs="24" :sm="8" :lg="8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <el-form-item label="商品代码" prop="goodsCode"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <el-input v-model="tableScreenForm.goodsCode" placeholder="商品代码" size="small" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-form-item label="辅材代码" prop="goodsCode"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <el-input v-model="tableScreenForm.goodsCode" placeholder="辅材代码" size="small" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-col :xs="24" :sm="8" :lg="8"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -74,8 +74,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="parentCategoryName" label="大类类名称" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="categoryName" label="小类名称" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="goodsName" label="辅材名称" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column prop="goodsId" label="商品编码" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column prop="goodsCode" label="商品代码" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column prop="goodsId" label="辅材编码" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column prop="goodsCode" label="辅材代码" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="goodsStockUnit" label="单位" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="goodsSpecification" label="规格型号" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column prop="remark" label="备注" /> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -138,7 +138,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     selectable(row, index) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return !~this.guolvList.indexOf(row.goodsId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // 获取商品列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 获取辅材列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getGoodsList() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       newGetList({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pageNum: this.table_currentPage, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -205,7 +205,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 更改列表当前页 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleTableCurrentChange(val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.table_chooseGoods.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return this.$errorMsg('当前已选择商品') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return this.$errorMsg('当前已选择辅材') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.table_currentPage = val 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.getGoodsList() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -214,7 +214,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getRowKeys(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return row.goodsId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    // table点击选择商品 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // table点击选择辅材 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleChooseGoods(val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.table_chooseGoods = val 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 |