新疆马铃薯 1.删除按钮添加操作权限

gaoluyang

3 天以前 bc365ef47ae4e01754aeadbae26170e11c9bb80e

 src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js

@@ -82,7 +82,7 @@
  const detailRow = ref({});
  const detailData = ref({});

  const approveDialog = reactive({ visible: false, row: null });
  const approveDialog = reactive({ visible: false, row: null, warehouse: ''});
  const approveOpinion = ref("");
  const approveSubmitting = ref(false);

@@ -192,13 +192,14 @@
        {
          name: "审批",
          type: "text",
          disabled: (row) => row.approvalStatus !== "pending" || !row.isApprove,
          disabled: (row) => row.approvalStatus !== "pending",
          clickFun: (row) => openApprove(row),
        },
        {
          name: "删除",
          type: "danger",
          clickFun: (row) => removeInstance(row),
          hasPermi: ['officeProcessAutomation:approveList:remove'],
        },
      ],
    },
@@ -366,6 +367,7 @@
    }
    approveDialog.row = { ...row };
    approveOpinion.value = "";
    approveDialog.warehouse = row?.warehouse || '';
    const bizType = Number(row.businessType);
    // 报价审批：用审批事由字段承载的"报价单号"去查报价列表
    if (bizType === 6) {
@@ -642,7 +644,7 @@
    approveSubmitting.value = true;
    try {
      await approveApprovalInstance(
        buildApproveInstanceDto(row, result, approveOpinion.value)
        buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse)
      );
      reimburseDialog.visible = false;
      await fetchApprovalList();
@@ -664,8 +666,13 @@
    if (approveSubmitting.value) return { ok: false };
    approveSubmitting.value = true;
    try {
      // 发货审批时传递出库批号
      const extraData = {};
      if (Number(row.businessType) === 7 && detailData.value?.shippingInfo?.outboundBatches) {
        extraData.outboundBatches = detailData.value.shippingInfo.outboundBatches;
      }
      await approveApprovalInstance(
        buildApproveInstanceDto(row, result, approveOpinion.value)
        buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse, extraData)
      );
      approveDialog.visible = false;
      await fetchApprovalList();