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

董国庆

2025-06-26 0df97749b48909fb2e11f098ef167eed2ae3e440

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

 culture/src/components/chooseProject/servce.js

@@ -2,5 +2,5 @@

// 添加项目课题方案
export function getDataList(data) {
  return axios.post('/api/t_project_team/pageList', { ...data })
  return axios.post('/api/t_project_team/pageList1', { ...data })
}

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

@@ -39,7 +39,7 @@
              {{ row.status === 1 ? "保存" : "废弃" }}
            </template>
          </el-table-column>
          <el-table-column label="菌种保存/废弃时间" prop="storageTime" />
          <el-table-column label="菌种入库时间/菌种废弃时间" prop="storageTime" />
          <el-table-column v-if="roleType == 3" label="操作">
            <template #default="{ row }">
              <el-button type="text" @click="handleConfirm(row)">确认入库</el-button>

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

@@ -43,7 +43,7 @@
              {{ row.status === 1 ? "保存" : "废弃" }}
            </template>
          </el-table-column>
          <el-table-column label="菌种保存/废弃时间" prop="storageTime" />
          <el-table-column label="菌种入库时间/菌种废弃时间" prop="storageTime" />
          <el-table-column label="操作" v-if="roleType == 3">
            <template #default="{ row }">
              <el-button type="text" @click="handleConfirm(row)"

 culture/src/views/strainReportLibrary/reportLibraryOne/add.vue

@@ -16,7 +16,7 @@
                <template>
                    <el-table-column prop="teamName" label="项目组名称" />
                    <el-table-column prop="personCharge" label="项目负责人" />
                    <el-table-column prop="staffName" label="项目组成员" />
                    <el-table-column prop="staffName" label="菌种实验员" />
                    <el-table-column prop="createTime" label="创建时间" />
                </template>
            </Table>

 culture/src/views/strainReportLibrary/reportLibraryOneFour/add.vue

@@ -16,7 +16,7 @@
                <template>
                    <el-table-column prop="teamName" label="项目组名称" />
                    <el-table-column prop="personCharge" label="项目负责人" />
                    <el-table-column prop="staffName" label="项目组成员" />
                    <el-table-column prop="staffName" label="菌种实验员" />
                    <el-table-column prop="createTime" label="创建时间" />
                </template>
            </Table>

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/add.vue

@@ -16,7 +16,7 @@
                <template>
                    <el-table-column prop="teamName" label="项目组名称" />
                    <el-table-column prop="personCharge" label="项目负责人" />
                    <el-table-column prop="staffName" label="项目组成员" />
                    <el-table-column prop="staffName" label="菌种实验员" />
                    <el-table-column prop="createTime" label="创建时间" />
                </template>
            </Table>

 culture/src/views/strainReportLibrary/reportLibraryOneThree/add.vue

@@ -16,7 +16,7 @@
                <template>
                    <el-table-column prop="teamName" label="项目组名称" />
                    <el-table-column prop="personCharge" label="项目负责人" />
                    <el-table-column prop="staffName" label="项目组成员" />
                    <el-table-column prop="staffName" label="菌种实验员" />
                    <el-table-column prop="createTime" label="创建时间" />
                </template>
            </Table>