Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/programForm/components/ProgramncMgr.vue

@@ -321,7 +321,7 @@ export default {
 
     	if(val){
     		// 刀具管理
-    		this.toolList = val.toolList;
+    		this.toolList = val.toolList?val.toolList:new Array();
     		this.tenant = {
     			id: val.id,
     			keys: val.keys,
@@ -427,7 +427,7 @@ export default {
         		obj.toolList.map(item => {
         			let target = this.toolSelectList.filter(obj => obj.id = item.toolId)[0];
         			// 把刀具名称带出来
-        			//item.toolName = target.cuttingToolName;
+        			item.toolName = target.cuttingToolName;
         			// 添加数据
         			arr.push(item);
         		});