Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-labor...

董国庆

2025-05-08 786c5b60fc744cd98430b96a4de3f581a9d0b79c

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

 culture/src/router/index.js

@@ -23,7 +23,8 @@
    }
 */

const routes = [{
const routes = [
    {
        path: "/",
        redirect: "/projectList/list",
    },
@@ -42,7 +43,8 @@
            title: "项目组管理",
        },
        component: Layouts,
        children: [{
        children: [
            {
                path: "list",
                name: "ProjectList",
                meta: {
@@ -68,7 +70,8 @@
            title: "系统管理",
        },
        component: Layouts,
        children: [{
        children: [
            {
                path: "user",
                name: "User",
                meta: {
@@ -126,108 +129,118 @@
        meta: {
            title: "菌种库",
        },
        children: [{
        children: [
            {
                path: "/strain-library",
                component: Parent,
                meta: {
                    title: "菌种库管理",
                   title: "菌种库管理",
                },
                children: [{
                        path: "strain-library-manage",
                        name: "StrainLibraryManage",
                        meta: {
                            title: "原始细胞库",
                            keepAlive: true,
                        },
                        component: () => import("../views/strain-library/strain-library-manage"),
                children: [
                   {
                       path: "strain-library-manage",
                       name: "StrainLibraryManage",
                       meta: {
                           title: "原始细胞库",
                           keepAlive: true,
                       },
                       component: () => import("../views/strain-library/strain-library-manage"),
                   },
                   {
                       path: "strain-library-manage/add",
                       name: "StrainLibraryManageAdd",
                       meta: {
                           title: "新增原始细胞库",
                           keepAlive: true,
                           hide: true
                       },
                       component: () => import("../views/strain-library/strain-library-manage/add.vue"),
                   },
                   {
                       path: "strain-library-manage/record",
                       name: "StrainRecord",
                       meta: {
                           title: "出入库记录",
                           keepAlive: true,
                           hide: true
                       },
                       component: () => import("../views/strain-library/strain-library-manage/record.vue"),
                   },
                   {
                       path: "main-cell-library",
                       name: "MainCellLibrary",
                       meta: {
                           title: "主细胞库",
                           keepAlive: true,
                       },
                       component: () => import("../views/strain-library/main-cell-library"),
                   },
                   {
                       path: "main-cell-library/add",
                       name: "MainCellLibraryAdd",
                       meta: {
                           title: "新增主细胞",
                           keepAlive: true,
                           hide: true
                       },
                       component: () => import("../views/strain-library/main-cell-library/add.vue"),
                   },
                   {
                     path: "production-cell-library",
                     name: "ProductionCellLibrary",
                     meta: {
                        title: "生产细胞库",
                        keepAlive: true,
                     },
                     component: () => import("../views/strain-library/production-cell-library"),
                   },
                   {
                    path: "production-cell-library/add",
                    name: "ProductionCellLibraryAdd",
                    meta: {
                        title: "新增生产细胞",
                        keepAlive: true,
                        hide: true
                    },
                    {
                        path: "strain-library-manage/add",
                        name: "StrainLibraryManageAdd",
                        meta: {
                            title: "新增原始细胞库",
                            keepAlive: true,
                            hide: true
                        },
                        component: () => import("../views/strain-library/strain-library-manage/add.vue"),
                    },
                    {
                        path: "strain-library-manage/record",
                        name: "StrainRecord",
                        meta: {
                            title: "出入库记录",
                            keepAlive: true,
                            hide: true
                        },
                        component: () => import("../views/strain-library/strain-library-manage/record.vue"),
                    },
                    {
                        path: "main-cell-library",
                        name: "MainCellLibrary",
                        meta: {
                            title: "主细胞库",
                            keepAlive: true,
                        },
                        component: () => import("../views/strain-library/main-cell-library"),
                    },
                    {
                        path: "main-cell-library/add",
                        name: "MainCellLibraryAdd",
                        meta: {
                            title: "新增主细胞",
                            keepAlive: true,
                            hide: true
                        },
                        component: () => import("../views/strain-library/main-cell-library/add.vue"),
                    },
                    {
                        path: "production-cell-library",
                        name: "ProductionCellLibrary",
                        meta: {
                            title: "生产细胞库",
                            keepAlive: true,
                        },
                        component: () => import("../views/strain-library/production-cell-library"),
                    },
                    {
                        path: "production-cell-library/add",
                        name: "ProductionCellLibraryAdd",
                        meta: {
                            title: "新增生产细胞",
                            keepAlive: true,
                            hide: true
                        },
                        component: () => import("../views/strain-library/production-cell-library/add.vue"),
                    },
                    {
                        path: "strain-flow-chart",
                        name: "StrainFlowChart",
                        meta: {
                            title: "菌种传代产生流程图",
                            keepAlive: true,
                        },
                        component: () => import("../views/strain-library/strain-flow-chart"),
                    },
                    component: () => import("../views/strain-library/production-cell-library/add.vue"),
                   }
                ]
           },
           {
            path: 'pedigree-vhart',
            name: 'PedigreeChart',
            meta: {
                title: "菌种传代生产谱系图",
            },
            {
                path: 'pedigree-vhart',
                name: 'PedigreeChart',
                meta: {
                    title: "菌种传代生产谱系图",
                },
                component: () => import("../views/pedigree-chart"),
            }
            component: () => import("../views/pedigree-chart"),
           },
           {
            path: 'add-pedigree',
            name: 'AddPedigree',
            meta: {
                title: "新增菌种传代生产谱系图",
            },
            component: () => import("../views/pedigree-chart/add"),
           },
           {
            path: 'add-pedigree',
            name: 'AddPedigree',
            meta: {
                title: "新增菌种传代生产谱系图",
            },
            component: () => import("../views/pedigree-chart/add"),
           }
        ]
    },

    
    {
        path: "/dataManagement",
        component: Layouts,
        meta: {
            title: "实验室数据管理",
        },
        children: [{
        children: [
            {
                path: "approvalPlan",
                meta: {
                    title: "项目课题方案审批",
@@ -285,7 +298,8 @@
                    // keepAlive: true,
                },
                component: Parent,
                children: [{
                children: [
                    {
                        path: "manage",
                        meta: {
                            title: "样品管理",
@@ -420,7 +434,8 @@
        meta: {
            title: "专业报告库审批",
        },
        children: [{
        children: [
            {
                path: "feasibilityStudy",
                meta: {
                    title: "可研报告库",
@@ -470,103 +485,122 @@
                component: () => import("../views/reportLibrary/projectProposalLibrary/index.vue"),
            },
        ],
    }, {
        path: "/strainReportLibrary",
        component: Layouts,
        meta: {
            title: "菌种报告库",
        },
        children: [{
                path: "reportLibraryOne",
                meta: {
                    title: "报告库一",
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOne/index.vue"),
            },
            {
                path: "add",
                meta: {
                    title: "新增报告",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOne/add.vue"),
            },
            {
                path: "reportLibraryTwo",
                meta: {
                    title: "报告库二",
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneTWO/index.vue"),
            },
            {
                path: "addTwo",
                meta: {
                    title: "新增报告",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneTWO/add.vue"),
            },
            {
                path: "reportLibraryThree",
                meta: {
                    title: "报告库三",
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneThree/index.vue"),
            },
            {
                path: "addThree",
                meta: {
                    title: "新增报告",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneThree/add.vue"),
            },
            {
                path: "reportLibraryFour",
                meta: {
                    title: "报告库四",
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneFour/index.vue"),
            },
            {
                path: "addFour",
                meta: {
                    title: "新增报告",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/strainReportLibrary/reportLibraryOneFour/add.vue"),
            },
           
        ],
    },
    {
        path: "/deliveryAssessment",
        component: Layouts,
        meta: {
            title: "菌种报告评定",
            title: "工作交付评定",
        },
        children: [{
        children: [
            {
                path: "projectTeamIntegral",
                meta: {
                    title: "菌种项目组评定表",
                    title: "项目组总积分",
                },
                component: () => import("../views/deliveryAssessment/projectTeamIntegral"),
            },
            {
                path: "projectTeamIntegral-detail",
                meta: {
                    title: "评定详情",
                    title: "积分详情",
                    hide: true
                },
                component: () => import("../views/deliveryAssessment/projectTeamIntegral/detail.vue"),
            },
            {
                // 超级管理员
                path: "taskList",
                meta: {
                    title: "课题列表",
                },
                component: () => import("../views/deliveryAssessment/taskList"),
            },
            {
                // 工艺工程师 审批人 实验员 超级管理员
                path: "restsTask",
                meta: {
                    title: "实验员其他任务",
                },
                component: () => import("../views/deliveryAssessment/restsTask"),
            },
            {
                // 超级管理员 工艺工程师
                path: "clinicalTrial",
                meta: {
                    title: "临床试验积分列表",
                },
                component: () => import("../views/deliveryAssessment/clinicalTrial"),
            },
            {
                // 化验师 审批人
                path: "testingAndEvaluation",
                meta: {
                    title: "检测项评定列表",
                },
                component: () => import("../views/deliveryAssessment/testingAndEvaluation"),
            },
            {
                // 化验师 实验员
                path: "experimentResults",
                meta: {
                    title: "实验结果评定",
                },
                component: () => import("../views/deliveryAssessment/experimentResults"),
            },
            {
                // 化验师 工艺工程师 审批人
                path: "assayTaskList",
                meta: {
                    title: "课题评定列表",
                },
                component: () => import("../views/deliveryAssessment/assayTaskList"),
            },
            {
                // 工艺工程师
                path: "processEngineerEvaluate",
                meta: {
                    title: "工艺工程师工作评定详情",
                },
                component: () => import("../views/deliveryAssessment/processEngineerEvaluate"),
            },
            {
                // 工艺工程师
                path: "testerWorkerEvaluate",
                meta: {
                    title: "实验员工作评定",
                },
                component: () => import("../views/deliveryAssessment/testerWorkerEvaluate"),
            },
            {
                // 工艺工程师
                path: "addTesterWorkerEvaluate",
                name: 'AddTesterWorkerEvaluate',
                meta: {
                    title: "新增实验员工作评定",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/deliveryAssessment/testerWorkerEvaluate/add"),
            },
            {
                // 工艺工程师
                path: "chemistEvaluate",
                meta: {
                    title: "化验师工作评定",
                },
                component: () => import("../views/deliveryAssessment/chemistEvaluate"),
            },
            {
                // 工艺工程师
                path: "addchemistEvaluate",
                name: 'AddchemistEvaluate',
                meta: {
                    title: "新增化验师工作评定",
                    hide: true,
                    keepAlive: true,
                },
                component: () => import("../views/deliveryAssessment/chemistEvaluate/add"),
            },
        ]
    }
@@ -630,4 +664,4 @@
    // }
});

export default router;
export default router;

 culture/src/views/pedigree-chart/add.vue

New file
@@ -0,0 +1,256 @@
<template>
  <el-form
    :model="form"
    :rules="rules"
    ref="pedigreeForm"
    label-position="top"
    class="strain-form"
  >
    <div class="card">
      <div class="form-items-row">
        <el-form-item label="菌种源" prop="strainSource" required>
          <div class="flex-row">
            <div class="input-wrapper">
              <el-input
                v-model="form.strainSource"
                placeholder="请输入"
                class="fixed-width-input"
              ></el-input>
            </div>
            <span class="form-text">代—</span>
            <div class="input-wrapper">
              <el-input
                v-model="form.generation"
                placeholder="请输入"
                class="fixed-width-input"
              ></el-input>
            </div>
            <span class="form-text">细胞库</span>
          </div>
        </el-form-item>
        <el-form-item label="传代菌种编号" prop="strainNo" required>
          <el-input
            v-model="form.strainNo"
            placeholder="请输入"
            class="fixed-width-input"
          ></el-input>
        </el-form-item>
        <el-form-item label="传代菌种名称" prop="strainName" required>
          <el-input
            v-model="form.strainName"
            placeholder="请输入"
            class="fixed-width-input"
          ></el-input>
        </el-form-item>
      </div>
    </div>
    <div class="chart">
      <div class="header">
        <div class="title">菌种传代生产谱系图</div>
        <div class="option-btn">
          <el-button type="primary" class="el-icon-plus"> 新增</el-button>
          <el-button type="primary">设置传代计划数</el-button>
          <el-button type="primary">详情</el-button>
        </div>
      </div>
    </div>
    <div class="end-btn">
      <el-button type="primary" @click="handleSubmit">提交</el-button>
      <el-button @click="handleDraft">存草稿</el-button>
      <el-button @click="handleCancel">取消</el-button>
    </div>
    <!-- 签字确认组件 -->
    <SignatureCanvas
      :visible.sync="signatureVisible"
      @confirm="handleSignatureConfirm"
    />
  </el-form>
</template>

<script>
import SignatureCanvas from "@/components/SignatureCanvas.vue";

export default {
  name: "AddPedigree",
  components: {
    SignatureCanvas,
  },
  data() {
    return {
      signatureVisible: false,
      form: {
        strainSource: "",
        generation: "",
        cellBank: "",
        strainNo: "",
        strainName: "",
        remarks: "",
      },
      rules: {
        strainSource: [
          { required: true, message: "请输入菌种源", trigger: "blur" },
        ],
        strainNo: [
          { required: true, message: "请输入传代菌种编号", trigger: "blur" },
        ],
        strainName: [
          { required: true, message: "请输入传代菌种名称", trigger: "blur" },
        ],
      },
    };
  },
  methods: {
    handleSubmit() {
      this.$refs.pedigreeForm.validate((valid) => {
        if (valid) {
          this.signatureVisible = true;
        }
      });
    },
    handleDraft() {
      // 实现存草稿逻辑
      console.log("save draft", this.form);
    },
    handleCancel() {
      this.$router.back();
    },
    handleSignatureConfirm(signatureImage) {
      this.signatureVisible = false;
      // 处理提交逻辑
      console.log("submit form with signature:", this.form, signatureImage);
      this.$router.back();
    },
  },
};
</script>

<style scoped lang="less">
.card {
  min-height: 145px;
  background: rgba(255, 255, 255, 0.8);
  box-shadow: 0px 10px 19px 0px rgba(0, 0, 0, 0.06);
  border-radius: 16px;
  border: 4px solid #ffffff;
  padding: 0 20px;
  display: flex;
  align-items: center;
}
.chart {
  padding: 20px 38px;
  background: rgba(255,255,255,0.8);
  box-shadow: 0px 10px 19px 0px rgba(0,0,0,0.06);
  border-radius: 16px;
  border: 4px solid #FFFFFF;
  margin-top: 30px;
  .header {
    display: flex;
    justify-content: space-between;
    align-items: center;
    .title {
        font-size: 18px;
    }
    .option-btn {
        display: flex;
        gap: 10px;
        .el-button {
          margin-left: 0;
        }
    }
  }
}

.form-items-row {
  display: flex;
  flex-wrap: wrap;
  width: 100%;
  align-items: center;

  @media (min-width: 1200px) {
    flex-direction: row;
    justify-content: space-between;
  }

  @media (max-width: 1199px) {
    flex-direction: column;
    align-items: flex-start;
  }
}

.flex-row {
  display: flex;
  align-items: center;
  flex-wrap: wrap;

  @media (max-width: 768px) {
    flex-direction: column;
    align-items: flex-start;
    width: 100%;
  }
}

.strain-form {
  width: 100%;

  :deep(.el-form-item) {
    margin-bottom: 15px;
    display: flex;
    flex-direction: column;
    align-items: flex-start;

    @media (min-width: 1200px) {
      margin-right: 10px;
    }

    @media (max-width: 1199px) {
      width: 100%;
      margin-right: 0;
    }

    .el-form-item__label {
      padding: 0 0 8px;
      line-height: 1.2;
      text-align: left;
    }

    .el-form-item__content {
      width: 100%;
    }
  }
}

.input-wrapper {
  @media (min-width: 769px) {
    width: 290px;
    min-width: 290px;
  }

  @media (max-width: 768px) {
    width: 100%;
  }
}

.fixed-width-input {
  width: 100%;

  @media (min-width: 769px) {
    width: 290px !important;
    min-width: 290px !important;
  }
}

.form-text {
  margin: 0 8px;
  white-space: nowrap;

  @media (max-width: 768px) {
    margin: 8px 0;
  }
}

.end-btn {
  margin-top: 20px;
  display: flex;
  flex-wrap: wrap;
  gap: 10px;
}
</style> 

 culture/src/views/pedigree-chart/index.vue

@@ -177,6 +177,11 @@
        status: "",
      };
    },
    handleNewStrain() {
      this.$router.push({
        path: "/strain/add-pedigree",
      });
    },
    handleSearch() {
      // 实现查询逻辑
      console.log("查询条件：", this.form);