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

maven

4 天以前 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -2,11 +2,11 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">供应商：</span>
        <span class="search_title">流程编号：</span>
        <el-input
            v-model="searchForm.supplier"
            v-model="searchForm.approveId"
            style="width: 240px"
            placeholder="请输入供应商搜索"
            placeholder="请输入流程编号搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
@@ -43,14 +43,15 @@
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref} from "vue";
import {ElMessageBox} from "element-plus";
import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
const userStore = useUserStore();

const data = reactive({
  searchForm: {
    supplier: "",
      approveId: "",
  },
});
const { searchForm } = toRefs(data);
@@ -59,6 +60,7 @@
    label: "审批状态",
    prop: "approveStatus",
    dataType: "tag",
      width: 100,
    formatData: (params) => {
      if (params == 0) {
        return "待审核";
@@ -85,23 +87,26 @@
  {
    label: "流程编号",
    prop: "approveId",
    width: 230
    width: 170
  },
  {
    label: "申请部门",
    prop: "approveDeptName",
      width: 220
  },
  {
    label: "审批事由",
    prop: "approveReason",
      width: 200
  },
  {
    label: "申请人",
    prop: "approveUser",
    prop: "approveUserName",
  },
  {
    label: "申请日期",
    prop: "approveTime",
      width: 120
  },
  {
    label: "结束日期",
@@ -110,7 +115,7 @@
  },
  {
    label: "当前审批人",
    prop: "checkCompany",
    prop: "approveUserCurrentName",
    width: 120
  },
  {
@@ -126,6 +131,7 @@
        clickFun: (row) => {
          openForm("edit", row);
        },
            disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
      },
      {
        name: "审核",
@@ -133,6 +139,7 @@
        clickFun: (row) => {
          openApprovalDia("approval", row);
        },
            disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
      },
      {
        name: "详情",
@@ -199,7 +206,7 @@
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
    ids = selectedRows.value.map((item) => item.id);
    ids = selectedRows.value.map((item) => item.approveId);
  } else {
    proxy.$modal.msgWarning("请选择数据");
    return;