diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue index c0c027b..6b5c49c 100644 --- a/src/views/business/comps/template/comps/dl/DL003.vue +++ b/src/views/business/comps/template/comps/dl/DL003.vue @@ -385,7 +385,7 @@ export default { nddw: '', ly: 'ELN配制', sxrq: null, - kc: item.jzjrtj + header1.targetDiluentVolumeUnit, + kc: item.jzjrtj, kcdw: header1.targetDiluentVolumeUnit, syl: null, type: null, //生成的时候传null diff --git a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue index e72b361..b287bd7 100644 --- a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue +++ b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue @@ -119,7 +119,10 @@ export default { this.upload.isUploading = false this.$refs.upload.clearFiles() this.$alert("
", "导入结果", { dangerouslyUseHTMLString: true }) - this.$emit('callback') + if(response.code == 200) { + this.$emit('callback') + this.cancel() + } }, // 提交上传文件 submitFileForm() { diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue index 663a666..3c6a9d7 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue @@ -54,8 +54,8 @@