From 42feb0af0ae1d486d0474c76711fdb67c778bcf3 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期六, 28 六月 2025 10:04:30 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
index 2787802..2093b2c 100644
--- a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
+++ b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
@@ -61,12 +61,12 @@
       <el-row v-if="!dialogTitle.includes('新增')" :gutter="20">
         <el-col v-if="form.vaccinateSignature" :span="10">
           <el-form-item label="接种操作人签字">
-            <el-image :src="form.vaccinateSignature" />
+            <el-image :src="getFullUrl(form.vaccinateSignature)"  :preview-src-list="[getFullUrl(form.vaccinateSignature)]" />
           </el-form-item>
         </el-col>
         <el-col v-if="form.preserveSignature" :span="10">
           <el-form-item label="菌种保藏人签字">
-            <el-image :src="form.preserveSignature" />
+            <el-image :src="getFullUrl(form.preserveSignature)"  :preview-src-list="[getFullUrl(form.vaccinateSignature)]" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -78,6 +78,7 @@
 </template>
 <script>
 import moment from 'moment'
+import { getFullUrl } from "@/utils/utils";
 export default {
   data() {
     return {
@@ -114,11 +115,14 @@
     };
   },
   methods: {
+    getFullUrl(url) {
+      if (url) {
+        return getFullUrl(url);
+      }
+    },
     openInitData(value) {
-      console.log(value);
       this.dialogTitle = value.title;
       // 获取用户信息
-      console.log('qweqwwqr4qw4rqw854',sessionStorage.getItem("userInfo"));
       const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
     
       
@@ -131,25 +135,22 @@
       ).padStart(2, "0")}:${String(now.getMinutes()).padStart(2, "0")}:${String(
         now.getSeconds()
       ).padStart(2, "0")}`;
-      console.log('qweqweqwe///////', value)
       this.form = {
         ...this.form,
         ...value.form,
         formStatus: value.formStatus || '',
-        thisName: userInfo.nickName || "",
+        thisName: value.form.createBy ? value.form.createBy : userInfo.nickName,
         thisTime: value.form && value.form.vaccinateTime
           ? value.form && value.form.vaccinateTime
           : formatTime,
         type: 1,
         confirmTime: value.confirmTime ? moment(value.confirmTime).format('YYYY-MM-DD HH:mm:ss') : moment().format('YYYY-MM-DD HH:mm:ss')
       };
-      console.log('485484848', this.form);
       this.$forceUpdate()
 
       this.dialogVisible = true;
     },
     closeDialog() {
-      console.log('78978998789798');
       this.dialogVisible = false;
     },
     handleSubmit() {

--
Gitblit v1.7.1