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

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

@@ -568,8 +568,17 @@ export default {
 		    		this.$refs.program.radio = res.data.programConf
 		    	}
 		    	this.$refs.program.tableData = this.setKeyList(res.data.programList)
-		    	// 赋值-三坐标系列
-		    	this.tenant = {...res.data};
+		    	// 赋值-三坐标系列				
+		    	this.tenant = {
+					threeDimensionalConf:  res.data.threeDimensionalConf==null? "0" : res.data.threeDimensionalConf,
+                    threeDimensionalPrograme: res.data.threeDimensionalPrograme,
+					threeDimensionalDeviationConf: res.data.threeDimensionalDeviationConf==null? "0" : res.data.threeDimensionalDeviationConf,
+	    			threeDimensionalDeviationPrograme: res.data.threeDimensionalDeviationPrograme,
+	    			// 工序抽检配置
+	    			randomCheckConf: res.data.randomCheckConf==null? "0" : res.data.randomCheckConf,
+	    			threeDimensionalPrograme: res.data.threeDimensionalPrograme
+				};
+
 		    	// 获取【人工质检】数据
 		    	/*if(!!res.data.programTest){
 		    		this.$refs.quality.radio = res.data.programTest

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

@@ -19,7 +19,7 @@
 		      	</el-form-item>
 		    	<!-- 上传程序 -->
 		      	<el-form-item :label='$t("resource.form.pgUpload")+"："' prop="filePath">
-		      		<el-input v-model="fileObj.filePath" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
+		      		<el-input v-model="tenant.filePath" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
 		          	<el-upload
 		          		accept=".*"
 					  	class="upload-demo"
@@ -271,7 +271,9 @@ export default {
 	  	console.log("文件上传成功!", response)
 	  	if(response.isSuccess){
 	  		// [上传程序]字段的值
+			this.tenant.filePath = response.data.url  
 	  		this.fileObj.filePath = response.data.url
+			this.$refs.form.validateField('filePath');  
 	  		// [程序大小]字段的值
 	  		this.fileObj.size = response.data.size
 	  		// [程序id]