Merge remote-tracking branch 'origin/dev_New' into dev_New

张诺

8 小时以前 11e1de7bb345bc937cce53a2ac7672476b5b4db3

 src/views/safeProduction/dangerInvestigation/index.vue

@@ -125,7 +125,7 @@
            <el-button link
                       type="primary"
                       size="small"
                       :disabled="!isPeople(scope.row.rectifyUserId)"
                       :disabled="scope.row.isRectify"
                       @click="openForm('edit2', scope.row)">整改</el-button>
            <el-button link
                       type="primary"
@@ -659,6 +659,14 @@
        tableLoading.value = false;
        tableData.value = res.data.records;
        total.value = res.data.total;
        tableData.value.forEach(item => {
          // console.log(item.rectifyUserId, currentUserId.value, "=======");
          if (Number(item.rectifyUserId) != Number(currentUserId.value)) {
            item.isRectify = true;
          } else {
            item.isRectify = false;
          }
        });
        return res;
      })
      .catch(() => {
@@ -893,8 +901,8 @@
        proxy.$modal.msg("已取消");
      });
  };
  const isPeople = row => {
    return row.rectifyUserId === Number(currentUserId.value);
  const isPeople = rectifyUserId => {
    return Number(rectifyUserId) == Number(currentUserId.value);
  };

  /**
@@ -976,11 +984,11 @@
  };

  onMounted(() => {
    getCurrentFactoryName();
    getList();
    userListNoPage().then(res => {
      userList.value = res.data;
    });
    getCurrentFactoryName();
  });
  // 上传附件
  const handleUpload = async () => {