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/components/AddSublevelForm.vue | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/culture/src/views/pedigree-chart/components/AddSublevelForm.vue b/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
index 2513aea..d744dfb 100644
--- a/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
+++ b/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
@@ -1,11 +1,6 @@
<template>
- <el-dialog
- :title="dialogTitle"
- :visible.sync="dialogVisible"
- width="40%"
- @close="closeDialog"
- :close-on-click-modal="false"
- >
+ <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%" @close="closeDialog"
+ :close-on-click-modal="false">
<el-form :model="form" :rules="rules" ref="form" label-position="top">
<el-row :gutter="20">
<el-col :span="10">
@@ -30,20 +25,12 @@
</el-col>
<el-col :span="10">
<el-form-item label="接种菌种编号" prop="strainCode">
- <el-input
- :disabled="dialogTitle.includes('详情')"
- v-model="form.strainCode"
- placeholder="请输入"
- ></el-input>
+ <el-input :disabled="dialogTitle.includes('详情')" v-model="form.strainCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="接种菌种名称" prop="strainName">
- <el-input
- :disabled="dialogTitle.includes('详情')"
- v-model="form.strainName"
- placeholder="请输入"
- ></el-input>
+ <el-input :disabled="dialogTitle.includes('详情')" v-model="form.strainName" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -60,17 +47,13 @@
<el-row :gutter="20">
<el-col :span="10">
<el-form-item v-if="form.status === 2" label="废弃原因说明" required>
- <el-input
- :disabled="dialogTitle.includes('详情')"
- v-model="form.discardReason"
- placeholder="请输入"
- ></el-input>
+ <el-input :disabled="dialogTitle.includes('详情')" v-model="form.discardReason" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="10">
- <el-form-item label="菌种入库时间" prop="confirmTime" >
+ <el-form-item label="菌种入库时间" prop="confirmTime">
<el-input disabled v-model="form.confirmTime"></el-input>
</el-form-item>
</el-col>
@@ -78,12 +61,14 @@
<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.preserveSignature)]" />
</el-form-item>
</el-col>
</el-row>
@@ -95,6 +80,7 @@
</template>
<script>
+import { getFullUrl } from '@/utils/utils';
import moment from 'moment';
export default {
data() {
@@ -135,7 +121,14 @@
};
},
methods: {
+
+ getFullUrl(url) {
+ if (url) {
+ return getFullUrl(url);
+ }
+ },
openInitData(value) {
+
this.dialogTitle = value.title;
// 获取用户信息
const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
@@ -148,8 +141,7 @@
).padStart(2, "0")}:${String(now.getMinutes()).padStart(2, "0")}:${String(
now.getSeconds()
).padStart(2, "0")}`;
- console.log(value);
-
+
this.form = {
parentId: value.parentId,
...this.form,
@@ -157,15 +149,15 @@
formStatus: value.formStatus,
strainCode1: value.strainCode1,
strainName1: value.strainName1,
- thisName: userInfo.nickName || "",
+ thisName: value.createBy ? value.createBy : userInfo.nickName,
thisTime: value.form.vaccinateTime
? value.form.vaccinateTime
: formatTime,
- confirmTime: value.confirmTime ? moment(value.confirmTime).format('YYYY-MM-DD HH:mm:ss') : moment().format('YYYY-MM-DD HH:mm:ss')
+ confirmTime: value.confirmTime ? moment(value.confirmTime).format('YYYY-MM-DD HH:mm:ss') : moment().format('YYYY-MM-DD HH:mm:ss')
};
this.dialogVisible = true;
},
- close(){
+ close() {
this.dialogVisible = false;
},
closeDialog() {
--
Gitblit v1.7.1