From 81fdb75575f86cec35af628ab9127482f9be80f1 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Wed, 1 Apr 2026 10:44:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL003.vue               | 2 +-
 src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue          | 5 ++++-
 src/views/business/resource/gsp/comps/rkjl/Xz.vue                  | 4 ++--
 src/views/business/storageLocation/comps/StorageLocationImport.vue | 5 ++++-
 src/views/business/study/comp/wzlb/bacteriaList.vue                | 2 +-
 src/views/business/study/comp/wzlb/cellList.vue                    | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

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("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { 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 @@
           <!-- 有效期 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
-              <el-date-picker v-model="form.yxq" type="date" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" :placeholder="$t('form.placeholderInput')">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd  HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/storageLocation/comps/StorageLocationImport.vue b/src/views/business/storageLocation/comps/StorageLocationImport.vue
index 3e62f5a..ca6e1b3 100644
--- a/src/views/business/storageLocation/comps/StorageLocationImport.vue
+++ b/src/views/business/storageLocation/comps/StorageLocationImport.vue
@@ -119,7 +119,10 @@ export default {
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.$emit('callback')
+      if(response.code == 200) {
+        this.$emit('callback')
+        this.cancel()
+      }
     },
     // 提交上传文件
     submitFileForm() {
diff --git a/src/views/business/study/comp/wzlb/bacteriaList.vue b/src/views/business/study/comp/wzlb/bacteriaList.vue
index 820a9ea..f5bfe5b 100644
--- a/src/views/business/study/comp/wzlb/bacteriaList.vue
+++ b/src/views/business/study/comp/wzlb/bacteriaList.vue
@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
diff --git a/src/views/business/study/comp/wzlb/cellList.vue b/src/views/business/study/comp/wzlb/cellList.vue
index e57cad2..6a99a2d 100644
--- a/src/views/business/study/comp/wzlb/cellList.vue
+++ b/src/views/business/study/comp/wzlb/cellList.vue
@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">