解决页面展示bug问题

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

@@ -571,12 +571,12 @@ export default {
 		    	// 赋值-三坐标系列				
 		    	this.tenant = {
 					threeDimensionalConf:  res.data.threeDimensionalConf==null? "0" : res.data.threeDimensionalConf,
-                    threeDimensionalPrograme: res.data.threeDimensionalPrograme,
+                    threeDimensionalPrograme: res.data.threeDimensionalPrograme==null? "": res.data.threeDimensionalPrograme,
 					threeDimensionalDeviationConf: res.data.threeDimensionalDeviationConf==null? "0" : res.data.threeDimensionalDeviationConf,
-	    			threeDimensionalDeviationPrograme: res.data.threeDimensionalDeviationPrograme,
+	    			threeDimensionalDeviationPrograme: res.data.threeDimensionalDeviationPrograme==null? "":res.data.threeDimensionalDeviationPrograme,
 	    			// 工序抽检配置
 	    			randomCheckConf: res.data.randomCheckConf==null? "0" : res.data.randomCheckConf,
-	    			threeDimensionalPrograme: res.data.threeDimensionalPrograme
+	    			threeDimensionalPrograme: res.data.threeDimensionalPrograme==null? "" : res.data.threeDimensionalPrograme
 				};
 
 		    	// 获取【人工质检】数据

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

@@ -345,7 +345,8 @@ export default {
     			name: val.name,
     			resourceId: val.resourceId,
     			resourceIds: val.resourceId +','+ val.name,
-		        workTime: val.workTime
+		        workTime: val.workTime,
+				filePath: val.filePath
     		};
     		this.fileObj= {
     			nc: '1', // 表示已经上传
@@ -434,6 +435,28 @@ export default {
     },
     submitForm () {
       this.$refs.form.validate((valid) => {
+		let bool = true;
+		let msg = ""
+		if(this.toolList.length ==0){
+            bool = false
+			msg = "刀具设备不能为空"
+		}else {		
+			this.toolList.forEach(item => {
+              if(!item.toolId){				 
+				 bool = false
+				 msg = "刀具名称不能为空"
+				 return false
+			  }			  
+			});  
+		}
+        if(!bool){
+            this.$message({
+	            message: msg,
+	            type: 'warning'
+	        });
+			return false
+		}
+
         if (valid) {
         	//添加数据
         	this.tenant.toolList = this.toolList;