13404089107
2025-06-20 495992fffef22917368ce9365bb8a896da7ca94f
提交修改bug
7个文件已修改
36 ■■■■■ 已修改文件
culture/src/utils/request.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/projectList/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/strain-library/breeding-record/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/strain-library/strain-library-manage/components/StrainDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/strain-library/validation/primitive-cell/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/system/role/detail.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/views/system/user/components/inherit.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
culture/src/utils/request.js
@@ -55,6 +55,7 @@
        console.error('数据解密失败:', e);
      }
    }
    console.log('15151515',res);
    
    if (res.data.code == 200) {
      if (!res.data) {
culture/src/views/projectList/index.vue
@@ -62,22 +62,24 @@
            <el-button
              v-if="row.status == 1"
              type="text"
              style="margin-right: 10px;"
              @click="handleChangeStatus(row, 2)"
              >封存</el-button
            >
            <el-button
              v-if="row.status == 2"
              type="text"
              style="margin-right: 10px;"
              @click="handleChangeStatus(row, 1)"
              >解封</el-button
            >
            <el-button type="text" @click="handleProject('edit', row.id)"
            <el-button type="text" style="margin-right: 10px;" @click="handleProject('edit', row.id)"
              >编辑</el-button
            >
            <el-button type="text" @click="handleProject('detail', row.id)"
            <el-button type="text" style="margin-right: 10px;" @click="handleProject('detail', row.id)"
              >详情</el-button
            >
            <el-button type="text" @click="handleDel(row)">删除</el-button>
            <el-button type="text"  @click="handleDel(row)">删除</el-button>
          </template>
        </el-table-column>
      </template>
@@ -99,6 +101,7 @@
<script>
import { getProjectList, changeStatus, deleteProject } from "./service";
import moment from "moment";
export default {
  name: "ProjectList",
  data() {
culture/src/views/strain-library/breeding-record/index.vue
@@ -118,7 +118,7 @@
      tableData: [],
      delData: null,
      total: 0,
      roleType: JSON.parse(sessionStorage.getItem('userInfo')).roleType,
      roleType: Number(JSON.parse(sessionStorage.getItem('userInfo')).roleType),
    };
  },
  created() {
culture/src/views/strain-library/strain-library-manage/components/StrainDetail.vue
@@ -72,7 +72,7 @@
          </el-table-column>
          <el-table-column prop="boundTime" label="操作时间" />
          <el-table-column prop="handleName" label="操作人姓名" />
          <el-table-column prop="preserveName" label="签核确认人姓名" />
          <el-table-column prop="preserveName" label="菌种保藏人签字" />
          <el-table-column label="状态">
            <template #default="{ row }">
              <el-tag :type="row.confirmTime ? 'success' : 'warning'">
culture/src/views/strain-library/validation/primitive-cell/index.vue
@@ -58,8 +58,8 @@
              @click="$router.push('/strain/validation/confirm-detail?id=' + row.id)">确认</el-button>
            <el-button type="text" v-if="roleType == 4" @click="handleDetail(row)">详情</el-button>
            <el-button type="text" v-if="roleType != 4" @click="handleDetail2(row)">详情</el-button>
            <el-button type="text" v-if="roleType == 4 && currentType == 'draft'" @click="handleEdit(row)">编辑</el-button>
            <el-button type="text" v-if="roleType == 4 && currentType == 'draft'" @click="handleDelete(row)">删除</el-button>
            <el-button type="text" v-if="(roleType == 1)||(roleType == 4 && currentType == 'draft')" @click="handleEdit(row)">编辑</el-button>
            <el-button type="text" v-if="(roleType == 1)||(roleType == 4 && currentType == 'draft')" @click="handleDelete(row)">删除</el-button>
          </template>
        </el-table-column>
      </template>
@@ -95,7 +95,7 @@
      showDelConfirm: false,
      editDialogValue: {},
      currentDetail: {},
      roleType: JSON.parse(sessionStorage.getItem("userInfo")).roleType,
      roleType:Number(JSON.parse(sessionStorage.getItem("userInfo")).roleType),
      form: {
        identifyingStrainCode: "",
        identifyingStrainName: "",
culture/src/views/system/role/detail.vue
@@ -87,8 +87,8 @@
          </div>
        </el-form>
        <Table :data="data" :total="pagination.total" :queryForm="pagination" @currentChange="handleCurrentChange"
          @sizeChange="handleSizeChange">
        <Table :data="data" :total="pagination.total" :queryForm="pagination" @handleCurrentChange="handleCurrentChange"
          @handleSizeChange="handleSizeChange">
          <el-table-column label="序号" type="index" width="50">
          </el-table-column>
          <el-table-column prop="nickName" label="姓名"></el-table-column>
@@ -104,7 +104,7 @@
            <template slot-scope="{row}">
              <div class="status_class">
                <div :class="row.status == 0 ? 'green' : 'red'"></div>
                <div>{{ row.status == 0 ? '正常' : '停用' }}</div>
                <div>{{ row.status == 0 ? '正常' : '禁用' }}</div>
                <div v-if="row.status == 1" style="cursor: pointer;" @click="dialogVisibleView = true, rowView = row">
                  <i class="el-icon-warning"></i>
                </div>
culture/src/views/system/user/components/inherit.vue
@@ -1,12 +1,12 @@
<template>
    <div>
        <el-dialog :visible.sync="dialogVisible" @close="$emit('close')" title="账号继承" :show-close="false">
        <el-dialog :visible.sync="dialogVisible" :z-index="1000" @close="$emit('close')" title="账号继承" :show-close="false">
            <div class="inherit-title">当前账号</div>
            <div class="inherit-content">
                <div>姓名:张三</div>
                <div>电话:102929292929</div>
                <div>角色:工艺工程师</div>
                <div>登录账号:328746378</div>
                <div>姓名:{{row.nickName}}</div>
                <div>电话:{{row.phonenumber}}</div>
                <div>角色:{{row.roleName}}</div>
                <div>登录账号:{{row.userName}}</div>
            </div>
            <div class="inherit-table-title">
                <div class="inherit-title">继承账号</div>