fix:[资源库管理][供试品]

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

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() {

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>

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() {

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">

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">