From 3010e03e2f2d0add9d111067f02eac49e23cc9be Mon Sep 17 00:00:00 2001 From: zjk <852185829@qq.com> Date: 星期四, 14 八月 2025 10:16:47 +0800 Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory --- laboratory/src/views/dataManagement/sampleManage/addSample.vue | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laboratory/src/views/dataManagement/sampleManage/addSample.vue b/laboratory/src/views/dataManagement/sampleManage/addSample.vue index 0e094f4..7c06d42 100644 --- a/laboratory/src/views/dataManagement/sampleManage/addSample.vue +++ b/laboratory/src/views/dataManagement/sampleManage/addSample.vue @@ -174,7 +174,7 @@ <el-input v-model="form.sampleCode" :disabled="true" placeholder="自动生成" /> </el-form-item> </el-form> - <!-- <div>取样单编号:{{ form.sampleCode }}</div> --> + <div v-if=" pageType == 'detail'">取样单编号:{{ form.sampleCode }}</div> <div class="header-title-left" style="margin-top: 38px"> <img src="@/assets/public/headercard.png" /> <span>取样操作记录</span> @@ -323,7 +323,7 @@ computed: { ...mapState(["tagList", "isFold"]), isEngineer() { - return this.userRole == '3'; // 工艺工程师 + return this.userRole != '4' ; // 工艺工程师 }, isAssayer() { return this.userRole == '4'; // 化验师 -- Gitblit v1.7.1