Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi...

lxp

2025-03-18 db01bceab158251b846c5d6d43c1185172eb958d

 src/views/business/inspectionTask/index.vue

@@ -211,7 +211,7 @@
      </span>
    </el-dialog>
    <el-dialog title="检验交接" :visible.sync="connectVisible" width="400px">
      <div class="search_thing">
      <div class="search_thing" style="width: 100%">
        <div class="search_label" style="width: 90px">
          <span class="required-span">* </span>交接人员：
        </div>
@@ -241,7 +241,7 @@
          </el-select>
        </div>
      </div>
      <div class="search_thing">
      <div class="search_thing" style="width: 100%">
        <div class="search_label" style="width: 90px">
          <span class="required-span">* </span>试验室：
        </div>
@@ -269,9 +269,6 @@
        >
      </span>
    </el-dialog>
    <div style="width: 100%; height: 100%" v-if="activeFace > 0">
      <Add :active="activeFace" :currentId="currentId" :examine="examine" />
    </div>
    <Inspection
      v-if="state > 0"
      @goback="goback"
@@ -288,14 +285,14 @@
      width="100%"
      fullscreen
    >
      <!-- <div
      <div
        style="width: 100%; text-align: right; margin-bottom: 10px"
        v-if="premissionReviewFun()"
      >
        <el-button type="primary" size="small" @click="goReview(currentRow)"
          >前往复核</el-button
        >
      </div> -->
      </div>
      <lims-table
        ref="dataLookTable"
        highlightCurrentRow
@@ -741,6 +738,17 @@
  },
  computed: {
    ...mapGetters(["permissions", "nickName"]),
    title() {
      return this.selectTab + "检验结果显示";
    },
    isLeader() {
      const power = JSON.parse(sessionStorage.getItem("power"));
      if (power) {
        const filterList = power.filter((ele) => ele.menuMethod == "leader");
        return filterList.length > 0;
      }
      return false;
    },
  },
  data() {
    return {
@@ -895,7 +903,7 @@
                  row.userName == null ||
                  row.insState == 3 ||
                  row.insState == 5 ||
                  (row.userName && !row.userName.includes(this.nickName))
                  (row.userName && !this.hasExistUserName(row.userName))
                );
              },
            },
@@ -911,7 +919,7 @@
                  row.insState == 5 ||
                  row.insState == 3 ||
                  (row.userName &&
                    !row.userName.includes(this.nickName) &&
                    !this.hasExistUserName(row.userName) &&
                    !this.isLeader)
                );
              },
@@ -926,7 +934,7 @@
                return (
                  row.userName == null ||
                  row.insState != 3 ||
                  (row.checkName && !row.checkName.includes(this.nickName))
                  (row.checkName && !this.hasExistUserName(row.userName))
                );
              },
            },
@@ -1313,20 +1321,11 @@
      });
    },
  },
  computed: {
    title() {
      return this.selectTab + "检验结果显示";
    },
    isLeader() {
      const power = JSON.parse(sessionStorage.getItem("power"));
      if (power) {
        const filterList = power.filter((ele) => ele.menuMethod == "leader");
        return filterList.length > 0;
      }
      return false;
    },
  },
  methods: {
    //判断检验人中是否包含当前用户
    hasExistUserName(userName) {
      return userName.includes(this.nickName);
    },
    pagination({ page, limit }) {
      this.page.current = page;
      this.page.size = limit;
@@ -1876,9 +1875,20 @@
        inspectorList = row.userName.split(",");
      }
      inspectorList.push(this.nickName);
      this.inspectorList = inspectorList;
      this.state = 1;
      this.orderId = row.id;
      this.$router.push({
        name: "inspection",
        params: {
          inspectorList: inspectorList,
          state: 1,
          orderId: row.id,
          sonLaboratory: this.queryParams.sonLaboratory,
          handover: this.personList,
        },
      });

      // this.inspectorList = inspectorList;
      // this.state = 1;
      // this.orderId = row.id;
    },
    handleConnect(row) {
      this.orderId = row.id;