| 
					
				 | 
			
			
				@@ -53,7 +53,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <div class="weight">注:设置后商家下单的仓库可以选择对应仓库的品类</div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-form-item label="强制仓品类" prop="qiangzhiCategoryIds"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <!-- <el-form-item label="强制仓品类" prop="qiangzhiCategoryIds"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <el-checkbox-group v-model="diaLogForm.qiangzhiCategoryIds"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <el-checkbox v-for="(item, index) in dataList" :key="index" :label="item.id"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -61,7 +61,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </el-checkbox> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-checkbox-group> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-form-item> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div slot="footer" class="dialog-footer"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -180,7 +180,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         updateBy: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         updateTime: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         categoryIds: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        qiangzhiCategoryIds: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // qiangzhiCategoryIds: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       diaLogRules: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: [{ required: true, trigger: 'blur', message: '请输入' }], 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -295,7 +295,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           type: row.type + '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           stockIds: row.stockIds === undefined ? arr : row.stockIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           categoryIds: row.kingDeeCategories !== null ? row.kingDeeCategories.map(k => k.id) : [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          qiangzhiCategoryIds: row.stockForceCategories?.map(k => k.categoryId) || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          // qiangzhiCategoryIds: row.stockForceCategories?.map(k => k.categoryId) || [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.showDialogForm = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 |