修改文档问题

董国庆

2026-02-04 b9629f1814e40cec572e51a8e3a2ccde0ab26614

修改文档问题

 culture/src/utils/utils.js

@@ -90,6 +90,6 @@

export function getAllocateIp() {
  const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
  return  apiConfig.showImgUrl
  // return  apiConfig.showImgUrl
  return userInfo.allocateIp ? 'http://'+userInfo.allocateIp +':11223/images/' : apiConfig.showImgUrl;
}

 laboratory/src/utils/encryption.js

@@ -6,6 +6,7 @@
// 从接口获取密钥
export const fetchEncryptionKey = async () => {
    try {
        return encryptionKey
        const response = await axios.get(`${apiConfig.baseURL}/api/system/getEncryptionKey`)
        if (response.data && response.data.code === 200) {
            // 转换为Buffer并验证字节长度

 laboratory/src/utils/sm4.js

@@ -1,16 +1,18 @@
import { sm4 } from 'sm-crypto';
import { getEncryptionKey, fetchEncryptionKey, getEncryptionKeyBuffer } from './encryption';
import { sm4 } from "sm-crypto";
import {
  getEncryptionKey,
  fetchEncryptionKey,
  getEncryptionKeyBuffer,
} from "./encryption";

// SM4加密函数
export const encryptBySM4 = (data) => {
    const key = fetchEncryptionKey(); // 获取当前密钥
    console.log('qweqweqwe',key);
    
    return sm4.encrypt(JSON.stringify(data), key);

  return sm4.encrypt(JSON.stringify(data), Buffer.from('2022lab02ora12to', 'utf-8'));
};

// SM4解密函数
export const decryptBySM4 = (data) => {
    const key = fetchEncryptionKey(); // 获取当前密钥
    return JSON.parse(sm4.decrypt(data, key));
};
  const key = fetchEncryptionKey(); // 获取当前密钥
  return JSON.parse(sm4.decrypt(data, Buffer.from('2022lab02ora12to', 'utf-8')));
};

 laboratory/src/views/dataManagement/SampleDeliveryRecord/list.vue

@@ -1,7 +1,7 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total"
      @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange">
      @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange">
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="所属项目课题方案：">

 laboratory/src/views/dataManagement/sampleManage/list.vue

@@ -1,6 +1,6 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total" @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange" >
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total" @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange" >
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="所属项目课题方案：">

 laboratory/src/views/dataManagement/sampleRecordList/list.vue

@@ -1,6 +1,6 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total" @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange">
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total" @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange">
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="所属项目课题方案：">

 laboratory/src/views/dataManagement/sampleSubmissionList/list.vue

@@ -1,7 +1,7 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :height="null" :tableData="tableData" :total="total"
      @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange">
      @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange">
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="所属项目课题方案：">

 laboratory/src/views/dataManagement/schemeManagement/list.vue

@@ -1,7 +1,7 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :tableData="tableData" :height="null" :total="total"
      @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange">
      @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange">
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="项目课题方案名称：">

 laboratory/src/views/dataManagement/suspendExperiment/list.vue

@@ -1,6 +1,6 @@
<template>
  <div class="list">
    <TableCustom :queryForm="form" :tableData="tableData" :total="total" @handlePageChange="handlePageChange" @handleSizeChange="handleSizeChange">
    <TableCustom :queryForm="form" :tableData="tableData" :total="total" @handleCurrentChange="handlePageChange" @handleSizeChange="handleSizeChange">
      <template #search>
        <el-form :model="form" labelWidth="auto" inline>
          <el-form-item label="项目课题方案名称：">

 laboratory/src/views/dataManagement/testResultReport/detail.vue

@@ -1,56 +1,22 @@
<template>
  <Card>
    <el-form
      ref="form"
      :model="form"
      :rules="rules"
      inline
      label-position="top"
    >
    <el-form ref="form" :model="form" :rules="rules" inline label-position="top">
      <div class="header-title" style="margin-bottom: 38px">
        <div class="header-title-left">
          <img src="@/assets/public/headercard.png" />
          <div>所属实验调度</div>
        </div>
        <el-button
          type="primary"
          class="el-icon-plus"
          @click="handleAddTask"
          v-if="!isView"
          >选择实验调度</el-button
        >
        <el-button type="primary" class="el-icon-plus" @click="handleAddTask" v-if="!isView">选择实验调度</el-button>
      </div>

      <Table :data="taskTableData" :total="0" :height="null" class="rwuTable">
        <el-table-column
          prop="projectName"
          label="所属项目课题方案"
          width="200"
        ></el-table-column>
        <el-table-column
          prop="experimentCode"
          label="实验编号"
        ></el-table-column>
        <el-table-column
          prop="experimentName"
          label="实验名称"
        ></el-table-column>
        <el-table-column
          prop="experimentDate"
          label="通知时间"
        ></el-table-column>
        <el-table-column
          prop="experimentStartTime"
          label="实验开始时间"
        ></el-table-column>
        <el-table-column
          prop="experimentEndTime"
          label="实验结束时间"
        ></el-table-column>
        <el-table-column
          prop="participantsName"
          label="参加人员"
        ></el-table-column>
        <el-table-column prop="projectName" label="所属项目课题方案" width="200"></el-table-column>
        <el-table-column prop="experimentCode" label="实验编号"></el-table-column>
        <el-table-column prop="experimentName" label="实验名称"></el-table-column>
        <el-table-column prop="experimentDate" label="通知时间"></el-table-column>
        <el-table-column prop="experimentStartTime" label="实验开始时间"></el-table-column>
        <el-table-column prop="experimentEndTime" label="实验结束时间"></el-table-column>
        <el-table-column prop="participantsName" label="参加人员"></el-table-column>
        <el-table-column prop="status" label="状态">
          <template slot-scope="scope">
            <el-tag :type="getStatusType(scope.row.status)">
@@ -66,32 +32,12 @@
          <div>一 、实验结果</div>
        </div>
      </div>
      <Table
        :data="experimentResultData"
        :total="0"
        :height="null"
        class="rwuTable"
      >
        <el-table-column
          prop="projectName"
          label="项目课题方案名称"
        ></el-table-column>
        <el-table-column
          prop="experimentCode"
          label="实验编号"
        ></el-table-column>
        <el-table-column
          prop="experimentName"
          label="实验名称"
        ></el-table-column>
        <el-table-column
          prop="experimentDate"
          label="实验日期"
        ></el-table-column>
        <el-table-column
          prop="schemePersonName"
          label="实验员"
        ></el-table-column>
      <Table :data="experimentResultData" :total="0" :height="null" class="rwuTable">
        <el-table-column prop="projectName" label="项目课题方案名称"></el-table-column>
        <el-table-column prop="experimentCode" label="实验编号"></el-table-column>
        <el-table-column prop="experimentName" label="实验名称"></el-table-column>
        <el-table-column prop="experimentDate" label="实验日期"></el-table-column>
        <el-table-column prop="schemePersonName" label="实验员"></el-table-column>
        <el-table-column prop="createTime" label="创建日期"></el-table-column>
        <el-table-column prop="createBy" label="创建人"></el-table-column>
        <el-table-column prop="status" label="当前状态">
@@ -103,9 +49,7 @@
        </el-table-column>
        <el-table-column label="操作" min-width="100" fixed="right">
          <template slot-scope="scope">
            <el-button type="text" @click="handleViewDetail(scope.row)"
              >详情</el-button
            >
            <el-button type="text" @click="handleViewDetail(scope.row)">详情</el-button>
          </template>
        </el-table-column>
      </Table>
@@ -116,24 +60,10 @@
          <div>二 、检验结果</div>
        </div>
      </div>
      <Table
        :data="inspectionResultData"
        :total="0"
        :height="null"
        class="rwuTable"
      >
        <el-table-column
          prop="projectName"
          label="所属课题方案"
        ></el-table-column>
        <el-table-column
          prop="experimentCode"
          label="所属实验编号"
        ></el-table-column>
        <el-table-column
          prop="experimentName"
          label="实验名称"
        ></el-table-column>
      <Table :data="inspectionResultData" :total="0" :height="null" class="rwuTable">
        <el-table-column prop="projectName" label="所属课题方案"></el-table-column>
        <el-table-column prop="experimentCode" label="所属实验编号"></el-table-column>
        <el-table-column prop="experimentName" label="实验名称"></el-table-column>
        <el-table-column prop="createTime" label="创建时间"></el-table-column>
        <el-table-column prop="createBy" label="创建人"></el-table-column>
        <el-table-column prop="status" label="状态">
@@ -145,11 +75,7 @@
        </el-table-column>
        <el-table-column label="操作" min-width="100" fixed="right">
          <template slot-scope="scope">
            <el-button
              type="text"
              @click="handleViewInspectionDetail(scope.row)"
              >详情</el-button
            >
            <el-button type="text" @click="handleViewInspectionDetail(scope.row)">详情</el-button>
          </template>
        </el-table-column>
      </Table>
@@ -160,54 +86,26 @@
        </div>
        <el-form :model="formMore" labelWidth="auto">
          <el-form-item label="" style="margin-bottom: 0">
            <el-input
              v-model="formMore.createBy"
              placeholder="请输入创建人"
            ></el-input>
            <el-input v-model="formMore.createBy" placeholder="请输入创建人"></el-input>
          </el-form-item>
          <el-form-item label="" style="margin-bottom: 0">
            <el-input
              v-model="formMore.termName"
              placeholder="请输入检测项名称"
            ></el-input>
            <el-input v-model="formMore.termName" placeholder="请输入检测项名称"></el-input>
          </el-form-item>

          <el-form-item label="" style="margin-bottom: 0">
            <el-button type="default" @click="resetForm">重置</el-button>
            <el-button
              type="primary"
              style="margin-left: 10px"
              @click="handleSearch"
              >查询</el-button
            >
            <el-button type="primary" style="margin-left: 10px" @click="handleSearch">查询</el-button>
          </el-form-item>
        </el-form>
      </div>

      <TableCustom
        :tableData="tableDataMore"
        :total="totalMore"
        :height="null"
        @handlePageChange="handlePageChange"
        @handleSizeChange="handleSizeChange"
      >
      <TableCustom :tableData="tableDataMore" :total="totalMore" :height="null" @handleCurrentChange="handlePageChange"
        @handleSizeChange="handleSizeChange">
        <template #table>
          <el-table-column
            prop="projectName"
            label="所属项目课题方案"
          ></el-table-column>
          <el-table-column
            prop="originalCode"
            label="原始检验记录编号"
          ></el-table-column>
          <el-table-column
            prop="experimentCode"
            label="所属实验编号"
          ></el-table-column>
          <el-table-column
            prop="experimentName"
            label="实验名称"
          ></el-table-column>
          <el-table-column prop="projectName" label="所属项目课题方案"></el-table-column>
          <el-table-column prop="originalCode" label="原始检验记录编号"></el-table-column>
          <el-table-column prop="experimentCode" label="所属实验编号"></el-table-column>
          <el-table-column prop="experimentName" label="实验名称"></el-table-column>
          <el-table-column prop="termCode" label="检测项编号"></el-table-column>
          <el-table-column prop="termName" label="检测项名称"></el-table-column>
          <el-table-column prop="createTime" label="创建时间"></el-table-column>
@@ -228,9 +126,7 @@
          <el-table-column label="操作" width="180">
            <template slot-scope="scope">
              <template>
                <el-button type="text" @click="handleDetail(scope.row.id)"
                  >详情</el-button
                >
                <el-button type="text" @click="handleDetail(scope.row.id)">详情</el-button>
              </template>
            </template>
          </el-table-column>
@@ -245,13 +141,8 @@
      </div>

      <div class="content-box">
        <AiEditor
          ref="analysisEditor"
          :readOnly="isView"
          :value="form.experimentResult"
          height="400px"
          placeholder="暂无实验数据分析及结论..."
        />
        <AiEditor ref="analysisEditor" :readOnly="isView" :value="form.experimentResult" height="400px"
          placeholder="暂无实验数据分析及结论..." />
      </div>

      <div class="header-title">
@@ -263,31 +154,18 @@

      <div class="evaluate-card">
        <div class="evaluate-card-people">
          <div
            v-for="technician in labTechnicians"
            :key="technician.id"
            class="evaluate-card-people-item"
            :class="{
              'active-people': selectedLabTechnician?.id == technician.id,
            }"
            @click="handleSelectLabTechnician(technician)"
          >
          <div v-for="technician in labTechnicians" :key="technician.id" class="evaluate-card-people-item" :class="{
            'active-people': selectedLabTechnician?.id == technician.id,
          }" @click="handleSelectLabTechnician(technician)">
            {{ technician.nickName }}
          </div>
        </div>
        <div class="evaluate-card-cotent">
          <template v-if="selectedLabTechnician">
            <template v-if="selectedLabTechnician.data">
              <div
                class="evaluate-table-wrapper"
                @click="handleEvaluate('labTechnician')"
              >
                <EvaluateTable
                  class="evaluate-table"
                  :isReadonly="true"
                  :type="1"
                  :viewJson="selectedLabTechnician.data.resultEvaluateJson"
                />
              <div class="evaluate-table-wrapper" @click="handleEvaluate('labTechnician')">
                <EvaluateTable class="evaluate-table" :isReadonly="true" :type="1"
                  :viewJson="selectedLabTechnician.data.resultEvaluateJson" />
              </div>
            </template>
            <template v-else>
@@ -309,31 +187,18 @@

      <div class="evaluate-card">
        <div class="evaluate-card-people">
          <div
            v-for="experimenter in experimenters"
            :key="experimenter.id"
            class="evaluate-card-people-item"
            :class="{
              'active-people': selectedExperimenter?.id == experimenter.id,
            }"
            @click="handleSelectExperimenter(experimenter)"
          >
          <div v-for="experimenter in experimenters" :key="experimenter.id" class="evaluate-card-people-item" :class="{
            'active-people': selectedExperimenter?.id == experimenter.id,
          }" @click="handleSelectExperimenter(experimenter)">
            {{ experimenter.nickName }}
          </div>
        </div>
        <div class="evaluate-card-cotent">
          <template v-if="selectedExperimenter">
            <template v-if="selectedExperimenter.data">
              <div
                class="evaluate-table-wrapper"
                @click="handleEvaluate('experimenter')"
              >
                <EvaluateTable
                  ref="experimenterEvaluateTable"
                  class="evaluate-table"
                  :isReadonly="true"
                  :viewJson="selectedExperimenter.data.resultEvaluateJson"
                />
              <div class="evaluate-table-wrapper" @click="handleEvaluate('experimenter')">
                <EvaluateTable ref="experimenterEvaluateTable" class="evaluate-table" :isReadonly="true"
                  :viewJson="selectedExperimenter.data.resultEvaluateJson" />
              </div>
            </template>
            <template v-else>
@@ -354,42 +219,25 @@

      <div class="evaluate-card" v-if="isView">
        <div class="evaluate-card-people">
          <div
            v-for="engineer in processEngineers"
            :key="engineer.id"
            class="evaluate-card-people-item"
            :class="{
              'active-people': selectedProcessEngineer?.id == engineer.id,
            }"
            @click="handleSelectProcessEngineer(engineer)"
          >
          <div v-for="engineer in processEngineers" :key="engineer.id" class="evaluate-card-people-item" :class="{
            'active-people': selectedProcessEngineer?.id == engineer.id,
          }" @click="handleSelectProcessEngineer(engineer)">
            {{ engineer.nickName }}
          </div>
        </div>
        <div class="evaluate-card-cotent">
          <template v-if="selectedProcessEngineer">
            <template v-if="selectedProcessEngineer.data">
              <div
                class="evaluate-table-wrapper"
                @click="handleEvaluate('processEngineer')"
              >
                <EvaluateTable
                  class="evaluate-table"
                  :isReadonly="true"
                  :type="1"
                  :viewJson="selectedProcessEngineer.data.resultEvaluateJson"
                />
              <div class="evaluate-table-wrapper" @click="handleEvaluate('processEngineer')">
                <EvaluateTable class="evaluate-table" :isReadonly="true" :type="1"
                  :viewJson="selectedProcessEngineer.data.resultEvaluateJson" />
              </div>
            </template>
            <template v-else>
              <div class="no-data">暂未评定</div>
              <div
                v-if="
                  isView && form.status == 2 && (userRole == 1 || userRole == 2)
                "
                class="to-evaluate"
                @click="handleEvaluate('processEngineer')"
              >
              <div v-if="
                isView && form.status == 2 && (userRole == 1 || userRole == 2)
              " class="to-evaluate" @click="handleEvaluate('processEngineer')">
                去评价
              </div>
            </template>
@@ -397,44 +245,24 @@
        </div>
      </div>
      <div class="add-project-footer" v-if="!isView">
        <el-button type="primary" class="save-btn" @click="handleSubmit(1)"
          >提交</el-button
        >
        <el-button type="primary" class="save-btn" @click="handleSubmit(1)">提交</el-button>
        <el-button @click="handleSubmit(-1)">存草稿</el-button>
      </div>
      <div
        class="add-project-footer"
        v-if="isView && form.status == 2 && (userRole == 1 || userRole == 2)"
      >
        <el-button
          type="primary"
          class="save-btn"
          @click="handleEvaluate('processEngineer')"
          >工艺工程师评定</el-button
        >
      <div class="add-project-footer" v-if="isView && form.status == 2 && (userRole == 1 || userRole == 2)">
        <el-button type="primary" class="save-btn" @click="handleEvaluate('processEngineer')">工艺工程师评定</el-button>
        <!-- <el-button @click="handleSubmit(-1)">存草稿</el-button> -->
      </div>
    </el-form>
    <!-- 选择实验调度弹窗 -->
    <experimental-scheduling
      :show="schedulingDialogVisible"
      @close="handleSchedulingClose"
      @submit="handleSchedulingSelect"
    />
    <experimental-scheduling :show="schedulingDialogVisible" @close="handleSchedulingClose"
      @submit="handleSchedulingSelect" />
    <!-- 评价弹窗 -->
    <evaluation-dialog
      :modelValue="evaluationDialogVisible"
      :type="currentEvaluationType"
      :viewJson="currentEvaluationData ? currentEvaluationData : ''"
      @update:modelValue="updateEvaluationDialogVisible"
      @submit="handleEvaluationSubmit"
    />
    <evaluation-dialog :modelValue="evaluationDialogVisible" :type="currentEvaluationType"
      :viewJson="currentEvaluationData ? currentEvaluationData : ''" @update:modelValue="updateEvaluationDialogVisible"
      @submit="handleEvaluationSubmit" />
    <!-- 检验结果详情弹窗 -->
    <checkout-result
      :visible="checkoutResultVisible"
      :data="currentCheckoutResult"
      @close="handleCheckoutResultClose"
    />
    <checkout-result :visible="checkoutResultVisible" :data="currentCheckoutResult"
      @close="handleCheckoutResultClose" />
    <!-- 新增组件弹窗 -->
    <!-- <add-component-dialog
      v-if="showNewDialog"
@@ -442,15 +270,9 @@
      @confirm="handleAddComponent"
    /> -->
    <!-- 实验结果详情 -->
    <ExperimentResultDialog
      :visible.sync="experimentResultDialogVisible"
      :type="'view'"
      :data="currentExperimentResult"
    />
    <RecordDetail
      :visible.sync="recordDetailVisible"
      :data="currentRecordDetail"
    />
    <ExperimentResultDialog :visible.sync="experimentResultDialogVisible" :type="'view'"
      :data="currentExperimentResult" />
    <RecordDetail :visible.sync="recordDetailVisible" :data="currentRecordDetail" />
  </Card>
</template>

@@ -555,7 +377,7 @@
  },
  watch: {
    selectedLabTechnician: {
      handler(newVal) {},
      handler(newVal) { },
    },
  },
  computed: {
@@ -647,7 +469,7 @@
            this.$message.success("删除成功");
          }
        })
        .catch(() => {});
        .catch(() => { });
    },
    handleTaskSubmit(formData) {
      const photos = formData.photos.map((file) => ({
@@ -779,8 +601,8 @@
          type == "labTechnician"
            ? this.selectedLabTechnician.id
            : type == "experimenter"
            ? this.selectedExperimenter.id
            : this.selectedProcessEngineer.id,
              ? this.selectedExperimenter.id
              : this.selectedProcessEngineer.id,
        // teamId: this.selectedScheduling?.teamId,
        status: 1,
      };
@@ -1168,7 +990,9 @@
            };
            this.taskTableData = [res.experimentDispatchVO];
            // 获取其他信息
            await this.getInfomationByDispatchId(res.experimentDispatchVO);
            this.getInfomationByDispatchId(res.experimentDispatchVO);

            this.getOriginalPageList(res.experimentDispatchVO);
          }
          if (res.experimentDispatchParticipants) {
            // 处理实验人员数据
@@ -1278,7 +1102,8 @@
          }
        }
      } catch (error) {
        this.$message.error("获取详情失败");
        // this.$message.error("获取详情失败");
        console.log('errrrrrrrrrrrrrrr', error)
      }
    },
    // 判断是否可以评定
@@ -1336,10 +1161,11 @@
      this.getOriginalPageList();
    },
    getOriginalPageList(selectedData) {
      console.log('taskTableData', this.taskTableData)
      if (selectedData || this.taskTableData.length > 0) {
        this.formMore.dispatchId = selectedData.id || this.taskTableData[0].id;
        this.formMore.dispatchId = selectedData ? selectedData.id : this.taskTableData[0].id;
      } else {
        return ;
        return;
      }

      getOriginalPageListByDispatchId({

 laboratory/src/views/dataManagement/testResultReport/list.vue

@@ -5,7 +5,7 @@
      :tableData="tableData"
      :total="total"
      :height="null"
      @handlePageChange="handlePageChange"
      @handleCurrentChange="handlePageChange"
      @handleSizeChange="handleSizeChange"
    >
      <template #search>

 laboratory/src/views/deliveryAssessment/chemistEvaluate/index.vue

@@ -58,7 +58,7 @@
                    <template #default="{ row }">
                        <el-button type="text" style="color: #1890ff" @click="handleDetail(row)">详情</el-button>
                        <el-button type="text" style="color: #1890ff" @click="handleEdit(row)">编辑</el-button>
                        <el-button type="text" style="color: #1890ff" @click="handleDelete(row)">删除</el-button>
                        <!-- <el-button type="text" style="color: #1890ff" @click="handleDelete(row)">删除</el-button> -->
                    </template>
                </el-table-column>
            </template>

 laboratory/src/views/deliveryAssessment/experimenterJobEvaluation/index.vue

@@ -5,7 +5,7 @@
        :tableData="tableData"
        :total="total"
        :height="null"
        @handlePageChange="handlePageChange"
        @handleCurrentChange="handlePageChange"
        @handleSizeChange="handleSizeChange"
      >
        <template #search>

 laboratory/src/views/deliveryAssessment/technicianJobEvaluation/index.vue

@@ -5,7 +5,7 @@
      :tableData="tableData"
      :total="total"
      :height="null"
      @handlePageChange="handlePageChange"
      @handleCurrentChange="handlePageChange"
      @handleSizeChange="handleSizeChange"
    >
      <template #search>

 laboratory/src/views/deliveryAssessment/testerWorkerEvaluate/index.vue

@@ -57,7 +57,7 @@
          <template #default="{ row }">
            <el-button type="text" style="color: #1890ff" @click="handleDetail(row)">详情</el-button>
            <el-button type="text" style="color: #1890ff" @click="handleEdit(row)">编辑</el-button>
            <el-button type="text" style="color: #1890ff" @click="handleDelete(row)">删除</el-button>
            <!-- <el-button type="text" style="color: #1890ff" @click="handleDelete(row)">删除</el-button> -->
          </template>
        </el-table-column>
      </template>

 laboratory/src/views/deliveryAssessment/testingAndEvaluation/index.vue

@@ -139,7 +139,7 @@
            <template #default="{ row }">
              <template>
                <el-button
                  v-if="row.status == 2 && isProcessEngineer"
                  v-if="row.status == 2 && isApprovaler"
                  type="text"
                  @click="handleReportDetail(row, 'approve')"
                  >评定</el-button

 laboratory/src/views/projectList/addProject.vue

@@ -19,7 +19,7 @@
            <div class="member-list">
                <div v-for="item in 4" :key="item" class="member-list-card">
                    <div class="member-item">
                        <div class="member-title">{{ ['审批人', '工艺工程师', '实验员', '化验师'][item - 1] }}</div>
                        <div class="member-title">{{ ['审批人', '工艺工程师', '化验师','实验员'][item - 1] }}</div>
                        <div :class="item == 1 || item == 2 ? 'member-name-box' : 'member-name-box-2'">
                            <el-tooltip v-for="i in memberList(item)" :key="i.userId" class="member-name" effect="dark"
                                :content="i.nickName" placement="top">
@@ -87,6 +87,8 @@
                            roleType: member.roleType
                        }))
                    }
                    console.log('this.selectMemberData',this.selectMemberData)
                    return 
                    addProject(data).then(res => {
                        if (res.code == 200) {
                            this.$message.success('添加成功')
@@ -109,9 +111,10 @@
                case 2:
                    return this.selectMemberData.filter(item => item.roleName == '工艺工程师')
                case 3:
                    return this.selectMemberData.filter(item => item.roleName == '实验员')
                return this.selectMemberData.filter(item => item.roleName == '化验师')
                case 4:
                    return this.selectMemberData.filter(item => item.roleName == '化验师')
                return this.selectMemberData.filter(item => item.roleName == '实验员')
                    
                default:
                    break;
            }
@@ -125,6 +128,7 @@
                }
            }
            this.selectMemberData = data;
            console.log('选择的人员',data)
            this.$refs.selectMember.close();
        },
        editUserList() {

 laboratory/src/views/projectList/detailProject.vue

@@ -18,7 +18,7 @@
            <div class="member-list">
                <div v-for="item in 4" :key="item" class="member-list-card">
                    <div class="member-item">
                        <div class="member-title">{{ ['审批人', '工艺工程师', '实验员', '化验师'][item - 1] }}</div>
                        <div class="member-title">{{ ['审批人', '工艺工程师',  '化验师','实验员',][item - 1] }}</div>
                        <div :class="item == 1 || item == 2 ? 'member-name-box' : 'member-name-box-2'">
                            <el-tooltip v-for="i in memberList(item)" :key="i.userId" class="member-name" effect="dark"
                                :content="i.nickName" placement="top">
@@ -48,8 +48,8 @@
            ROLE_NAME_TO_TYPE: {
                '审批人': 2,
                '工艺工程师': 3,
                '实验员': 4,
                '化验师': 5
                '实验员': 5,
                '化验师': 4
            }
        }
    },
@@ -61,7 +61,7 @@
            }
            this.selectMemberData = res.staffs.map(item => ({
                userId: item.userId,
                roleName: ['审批人', '工艺工程师', '实验员', '化验师'][item.roleType - 2],
                roleName: ['审批人', '工艺工程师', '化验师', '实验员'][item.roleType - 2],
                nickName: item.nickName
            }))
        })
@@ -77,9 +77,10 @@
                case 2:
                    return this.selectMemberData.filter(item => item.roleName == '工艺工程师')
                case 3:
                    return this.selectMemberData.filter(item => item.roleName == '实验员')
                return this.selectMemberData.filter(item => item.roleName == '化验师')
                    
                case 4:
                    return this.selectMemberData.filter(item => item.roleName == '化验师')
                    return this.selectMemberData.filter(item => item.roleName == '实验员')
                default:
                    break;
            }

 laboratory/src/views/projectList/editProject.vue

@@ -19,7 +19,7 @@
            <div class="member-list">
                <div v-for="item in 4" :key="item" class="member-list-card">
                    <div class="member-item">
                        <div class="member-title">{{ ['审批人', '工艺工程师', '实验员', '化验师'][item - 1] }}</div>
                        <div class="member-title">{{ ['审批人', '工艺工程师', '化验师', '实验员'][item - 1] }}</div>
                        <div :class="item == 1 || item == 2 ? 'member-name-box' : 'member-name-box-2'">
                            <el-tooltip v-for="i in memberList(item)" :key="i.userId" class="member-name" effect="dark"
                                :content="i.nickName" placement="top">
@@ -61,8 +61,8 @@
            ROLE_NAME_TO_TYPE: {
                '审批人': 2,
                '工艺工程师': 3,
                '实验员': 4,
                '化验师': 5
                '实验员': 5,
                '化验师': 4
            }
        }
    },
@@ -74,7 +74,7 @@
            }
            this.selectMemberData = res.staffs.map(item => ({
                userId: item.userId,
                roleName: ['审批人', '工艺工程师', '实验员', '化验师'][item.roleType - 2],
                roleName: ['审批人', '工艺工程师', '化验师', '实验员'][item.roleType - 2],
                nickName: item.nickName
            }))
        })