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

董国庆

2025-06-26 8c8b6ec8a6300721984c2c0ad32186596e284b3c

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

 culture/src/App.vue

@@ -138,6 +138,10 @@
  color: rgba(0, 0, 0, 0.6) !important;
}

.el-message {
  z-index: 3000 !important;
}

.el-dialog {
  border-radius: 16px 16px 6px 6px;


 culture/src/components/SelectMember/index.vue

@@ -45,7 +45,12 @@
                            @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
                            @row-click="handleRowClick">
                            <el-table-column type="selection" width="55" v-if="!singleSelect" />
                            <el-table-column label="角色" prop="roleName" />
                            <el-table-column label="角色" prop="roleName" v-if="title != '选择菌种实验员'" />
                            <el-table-column label="角色" prop="roleType" v-else>
                                <template #default="scope">
                                  <span>{{['菌种超级管理员','菌种审批人','菌种工程师','菌种实验员'][scope.row.roleType-1]}}</span>
                                </template>
                            </el-table-column>
                            <el-table-column label="姓名" prop="nickName" />
                            <el-table-column label="创建时间" prop="createTime" />
                        </Table>

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

@@ -56,8 +56,8 @@

            <el-button type="primary" v-if="$route.query.type != 1" @click="setGenerationPlan">设置传代计划数</el-button>
            <el-button type="primary" @click="showDetail">详情</el-button>
            <el-button type="primary" @click="handleEdit" v-if="roleType == 1 && $route.query.type != 1">编辑</el-button>
            <el-button type="primary" @click="handleDelete" v-if="roleType == 1 && $route.query.type != 1">删除</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>


 culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue

@@ -145,7 +145,7 @@
          this.detail = {
            ...res,
            handleSignature: res.handleSignature || '', // 处理签名为空的情况
            purpose: res.purpose.split(',') || [] // 处理 purpose 为空的情况
            purpose: res.purpose&&res.purpose.split(',') || [] // 处理 purpose 为空的情况
          }
          this.tableData = res.list || []
        })

 culture/src/views/strain-library/validation/chief-cell/add.vue

@@ -104,7 +104,7 @@
        handleSignatureConfirm(signatureImage) {
            this.signatureVisible = false;
            const id = this.$route.query.id || this.$route.params.id;
            const submitData = { ...this.form, strainType: 2, isDraft: this.currentAction == 'submit' ? 0 : 1, handleSignature: signatureImage.signature, experimentTime: moment(this.form.experimentTime).format('YYYY-MM-DD') };
            const submitData = { ...this.form, strainType: 2, isDraft: this.currentAction == 'submit' ? 0 : 1, handleSignature: signatureImage.signature, experimentTime:this.form.experimentTime?moment(this.form.experimentTime).format('YYYY-MM-DD'):''};
            if (this.currentAction === 'submit') {
                if (id) {
                    // 编辑

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

@@ -143,8 +143,10 @@
                </div>

                <div class="end-btn" style="margin-top: 38px">
                    <el-button type="primary" @click="addData" :loading="submitLoading" :disabled="submitLoading">发送</el-button>
                    <el-button type="default" @click="saveData" :loading="submitLoading" :disabled="submitLoading">存草稿</el-button>
                    <el-button type="primary" @click="addData" :loading="submitLoading"
                        :disabled="submitLoading">发送</el-button>
                    <el-button type="default" @click="saveData" :loading="submitLoading"
                        :disabled="submitLoading">存草稿</el-button>
                </div>
            </el-form>
        </Card>
@@ -283,7 +285,6 @@
        addData() {
            if (this.submitLoading) return;
            this.submitLoading = true;
            console.log('qeqweqeqwqrew', this.form, this.projectData);

            this.$refs.form.validate(async (valid) => {
                if (!valid) { this.submitLoading = false; return; }
@@ -308,7 +309,7 @@
                    return;
                }
                const params = {
                    isDraft: 0,
                    isDraft: this.form.isDraft ? this.form.isDraft : 0,
                    projectId: this.projectData[0].id,
                    experimentId: this.selectedMember[0].userId,
                    // reportCode: this.form.reportCode,
@@ -318,8 +319,6 @@
                    evaluate: str.join(','),
                    reportType: 1
                };
                console.log('params', params);

                if (this.$route.query.id) {
                    params.id = this.$route.query.id
                    update(params).then(res => {

 culture/src/views/strainReportLibrary/reportLibraryOne/components/approval/index.vue

@@ -235,7 +235,8 @@
    },
    computed: {
        dialogTitle() {
            return this.type === "approve" ? "审批" : "审批详情";

            return !this.obj.isDetail? "审批" : "详情";
        },
        totalScore() {
            return this.assessmentTable.reduce((sum, item) => sum + (item.selectedScore || 0), 0);
@@ -243,6 +244,8 @@
    },
    methods: {
        open() {
            

            if (!this.obj.id) {
                this.$message.error('缺少必要参数');
                return;

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

@@ -241,8 +241,8 @@
        handleApprove(params) {
            approve({ ...params, status: params.statuss }).then(res => {
                if (res.code === 200) {
                    this.$message.success('审核成功')
                    this.showApproval = false
                    this.$message.success('审核成功')
                    this.getLists()
                    if(params.statuss=='2'){
                        this.showEvaluate = true

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

@@ -304,7 +304,7 @@
                        return;
                    }
                    const params = {
                        isDraft: 0,
                        isDraft: this.form.isDraft ? this.form.isDraft : 0,
                        projectId: this.projectData[0].id,
                        experimentId: this.selectedMember[0].userId,
                        // reportCode: this.form.reportCode,

 culture/src/views/strainReportLibrary/reportLibraryOneFour/components/approval/index.vue

@@ -235,7 +235,8 @@
    },
    computed: {
        dialogTitle() {
            return this.type === "approve" ? "审批" : "审批详情";

            return !this.obj.isDetail ? "审批" : "详情";
        },
        totalScore() {
            return this.assessmentTable.reduce((sum, item) => sum + (item.selectedScore || 0), 0);

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

@@ -304,7 +304,7 @@
                    return;
                }
                const params = {
                    isDraft: 0,
                    isDraft: this.form.isDraft ? this.form.isDraft : 0,
                    projectId: this.projectData[0].id,
                    experimentId: this.selectedMember[0].userId,
                    // reportCode: this.form.reportCode,

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/components/approval/index.vue

@@ -235,7 +235,7 @@
    },
    computed: {
        dialogTitle() {
            return this.type === "approve" ? "审批" : "审批详情";
            return !this.obj.isDetail? "审批" : "详情";
        },
        totalScore() {
            return this.assessmentTable.reduce((sum, item) => sum + (item.selectedScore || 0), 0);

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

@@ -303,7 +303,7 @@
                    return;
                }
                const params = {
                    isDraft: 0,
                    isDraft: this.form.isDraft ? this.form.isDraft : 0,
                    projectId: this.projectData[0].id,
                    experimentId: this.selectedMember[0].userId,
                    // reportCode: this.form.reportCode,

 culture/src/views/strainReportLibrary/reportLibraryOneThree/components/approval/index.vue

@@ -235,7 +235,7 @@
    },
    computed: {
        dialogTitle() {
            return this.type === "approve" ? "审批" : "审批详情";
            return !this.obj.isDetail ? "审批" : "详情";
        },
        totalScore() {
            return this.assessmentTable.reduce((sum, item) => sum + (item.selectedScore || 0), 0);