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

13404089107

4 天以前 69def06b56f9ab466fda99d309af81e0d70c637d

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

 culture/src/views/login/index.vue

@@ -99,7 +99,7 @@
      loginReq(this.loginForm).then(res => {
        sessionStorage.setItem('token', res.token)
        sessionStorage.setItem('userInfo', JSON.stringify(res.userInfo.user))
        this.$router.push('/projectList')
        this.$router.replace('/middleground')
      })
    }
  }

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

@@ -49,7 +49,7 @@
          </el-form-item>
        </div>
      </div>
      <div class="card" style="margin-top: 30px; display: block">
      <div class="card" v-if="roleType != 4" style="margin-top: 30px; display: block">
        <Table
          :height="null"
          :total="total"
@@ -67,7 +67,7 @@
            </template>
          </el-table-column>
          <el-table-column label="菌种保存/废弃时间" prop="storageTime" />
          <el-table-column label="操作">
          <el-table-column v-if="roleType == 3" label="操作">
            <template #default="{ row }">
              <el-button type="text" @click="handleConfirm(row)"
                >确认入库</el-button
@@ -88,8 +88,8 @@
              >设置传代计划数</el-button
            >
            <el-button type="primary" @click="showDetail">详情</el-button>
            <el-button type="primary" @click="handleEdit">编辑</el-button>
            <el-button type="primary" @click="handleDelete">删除</el-button>
            <el-button type="primary" @click="handleEdit" v-if="roleType == 1">编辑</el-button>
            <el-button type="primary" @click="handleDelete" v-if="roleType == 1">删除</el-button>
          </div>
        </div>

@@ -202,6 +202,7 @@
      storageVisible: false,
      treeData: [],
      total: 0,
      roleType: JSON.parse(sessionStorage.getItem('userInfo')).roleType || 1,  // 1.超级管理员 2.审批人 3.工程师 4.实验员
    };
  },
  computed: {
@@ -222,6 +223,7 @@
    this.initEvents();
  },
  created() {

    if (this.$route.query.id) {
      this.reloadData();
    }
@@ -244,7 +246,7 @@
          strainSourceStart: this.form.strainSourceStart,
          strainSourceEnd: this.form.strainSourceEnd,
          ...nodeModel.data,
          status: "edit",
          formStatus: "edit",
        });
      } else if (nodeModel.label === "子代" || nodeModel.label === "孙代") {
        this.dialogTitle = `${nodeModel.label}详情`;
@@ -276,7 +278,7 @@
            strainCode1: this.form.strainCode,
            strainName1: this.form.strainName,
            ...nodeModel.data,
            status: "edit",
            formStatus: "edit",
          });
        }
      }
@@ -971,6 +973,7 @@
              strainCode: this.form.strainCode,
              strainSourceStart: this.form.strainSourceStart,
              strainSourceEnd: this.form.strainSourceEnd,
              formStatus: 'add'
            });
          }
        });
@@ -1286,7 +1289,7 @@
          strainSourceStart: this.form.strainSourceStart,
          strainSourceEnd: this.form.strainSourceEnd,
          ...nodeModel.data,
          status: "detail",
          formStatus: "detail",
        });
      } else if (nodeModel.label === "子代" || nodeModel.label === "孙代") {
        this.dialogTitle = `${nodeModel.label}详情`;

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

@@ -25,7 +25,7 @@
          </el-form-item>
        </div>
      </div>
      <div class="card" style="margin-top: 30px; display: block">
      <div class="card" style="margin-top: 30px; display: block" v-if="roleType != 4">
        <Table
          :height="null"
          :total="total"
@@ -43,7 +43,7 @@
            </template>
          </el-table-column>
          <el-table-column label="菌种保存/废弃时间" prop="storageTime" />
          <el-table-column label="操作">
          <el-table-column label="操作" v-if="roleType == 3">
            <template #default="{ row }">
              <el-button type="text" @click="handleConfirm(row)"
                >确认入库</el-button
@@ -64,8 +64,8 @@
              >设置传代计划数</el-button
            >
            <el-button type="primary" @click="showDetail">详情</el-button>
            <el-button type="primary" @click="handleEdit">编辑</el-button>
            <el-button type="primary" @click="handleDelete">删除</el-button>
            <el-button type="primary" @click="handleEdit" v-if="roleType == 1">编辑</el-button>
            <el-button type="primary" @click="handleDelete" v-if="roleType == 1">删除</el-button>
          </div>
        </div>

@@ -168,6 +168,8 @@
      current: 1,
      size: 10,
      comfirmId: "",
      roleType: Number(JSON.parse(sessionStorage.getItem('userInfo')).roleType || 1),  // 1.超级管理员 2.审批人 3.工程师 4.实验员

    };
  },
  computed: {

 culture/src/views/pedigree-chart/components/AddSublevelPlan.vue

@@ -1,6 +1,6 @@
<template>
    <!-- 设置传代计划数弹窗 -->
    <el-dialog :title="planForm.status === 'detail' ? '传代计划数详情' : '设置菌种传代计划数'" :visible.sync="planDialogVisible"
    <el-dialog :title="planForm.formStatus === 'detail' ? '传代计划数详情' : '设置菌种传代计划数'" :visible.sync="planDialogVisible"
        width="40%" :close-on-click-modal="false">
        <el-form :model="planForm" :rules="planRules" ref="planForm" label-position="top">
            <el-row :gutter="20">
@@ -45,13 +45,13 @@
            <el-row :gutter="20">
                <el-col :span="10">
                    <el-form-item label="传代计划数" prop="generationCount">
                        <el-input-number :disabled="planForm.status === 'detail'" v-model="planForm.generationCount"
                        <el-input-number :disabled="planForm.formStatus === 'detail'" v-model="planForm.generationCount"
                            :controls="false" :min="1" placeholder="请输入" />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <div v-if="planForm.status !== 'detail'" class="dialog-footer">
        <div v-if="planForm.formStatus !== 'detail'" class="dialog-footer">
            <el-button type="primary" @click="handleSubmit">提交签字</el-button>
        </div>
    </el-dialog>

 culture/src/views/pedigree-chart/components/ParentForm.vue

@@ -1,7 +1,7 @@
<template>
  <!-- 新增母代弹窗 -->
  <el-dialog
    :title="planForm.status == 'add' ? '新增母代' : planForm.status == 'edit' ? '编辑母代' : '母代详情'"
    :title="planForm.formStatus == 'add' ? '新增母代' : planForm.formStatus == 'edit' ? '编辑母代' : '母代详情'"
    :visible.sync="planDialogVisible"
    width="40%"
    :close-on-click-modal="false"
@@ -45,19 +45,19 @@
            <el-input disabled v-model="planForm.strainName"></el-input>
          </el-form-item>
        </el-col>
        <el-col v-if="planForm.vaccinateSignature && planForm.status == 'detail'" :span="10">
        <el-col v-if="planForm.vaccinateSignature && planForm.formStatus == 'detail'" :span="10">
            <el-form-item label="接种操作人签字">
              <el-image :src="planForm.vaccinateSignature" />
            </el-form-item>
          </el-col>
          <el-col v-if="planForm.preserveSignature && planForm.status == 'detail'" :span="10">
          <el-col v-if="planForm.preserveSignature && planForm.formStatus == 'detail'" :span="10">
            <el-form-item label="菌种保藏人签字">
              <el-image :src="planForm.preserveSignature" />
            </el-form-item>
          </el-col>
      </el-row>
    </el-form>
    <div v-if="planForm.status == 'add'" class="dialog-footer">
    <div v-if="planForm.formStatus == 'add'" class="dialog-footer">
      <el-button type="primary" @click="handleSubmit">提交</el-button>
    </div>
  </el-dialog>
@@ -124,7 +124,7 @@
      });
    },
    handleStatus(status) {
      if (this.planForm.status === "detail") return;
      if (this.planForm.formStatus === "detail") return;
      this.planForm.isDiscarded = status === "save";
      this.$forceUpdate();
    },

 culture/src/views/pedigree-chart/components/PlanForm.vue

@@ -1,6 +1,6 @@
<template>
    <!-- 设置传代计划数弹窗 -->
    <el-dialog :title="planForm.status == 'add' ? '新增传代计划数' : planForm.status == 'edit' ? '编辑传代计划数' : '传代计划数详情'" :visible.sync="planDialogVisible"
    <el-dialog :title="planForm.formStatus == 'add' ? '新增传代计划数' : planForm.formStatus == 'edit' ? '编辑传代计划数' : '传代计划数详情'" :visible.sync="planDialogVisible"
        width="40%" :close-on-click-modal="false">
        <el-form :model="planForm" :rules="planRules" ref="planForm" label-position="top">
            <el-form-item label="菌种源" prop="strainSourceStart">
@@ -28,13 +28,13 @@
                </el-col>
                <el-col :span="10">
                    <el-form-item label="传代计划数" prop="generationCount">
                        <el-input-number :disabled="planForm.status === 'detail'" v-model="planForm.generationCount"
                        <el-input-number :disabled="planForm.formStatus === 'detail'" v-model="planForm.generationCount"
                            :controls="false" :min="1" placeholder="请输入" />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <div v-if="planForm.status !== 'detail'" class="dialog-footer">
        <div v-if="planForm.formStatus !== 'detail'" class="dialog-footer">
            <el-button type="primary" @click="handleSubmit">提交签字</el-button>
        </div>
    </el-dialog>
@@ -75,7 +75,7 @@
                ...this.planForm,
                ...value
            }
            if (value.status == 'edit') {
            if (value.formStatus == 'edit') {
                this.planForm.strainCode = value.strainCode1
                this.planForm.strainName = value.strainName1
            }