Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
f5a2ac31 by lihua
Options

添加发起失败的删除和重新提交

1 parent 2dc88524
Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
src/views/data_asset/qualityEvaluate.vue
......@@ -217,7 +217,7 @@ const getTableBtns = (row) => {
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
......@@ -232,7 +232,7 @@ const getTableBtns = (row) => {
if (flowState === 3) {
btnsArr.push({ label: "删除", value: "del" })
}
if (flowState === 3 && bizApproveState != 'D') {
if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E')) {
btnsArr.push({ label: "重新提交", value: "redit" })
}
if (isShowCancel) {
......
src/views/data_asset/registerManagemant.vue
......@@ -198,7 +198,7 @@ const getTableBtns = (row, includeDetail = true) => {
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
......@@ -212,7 +212,7 @@ const getTableBtns = (row, includeDetail = true) => {
if (flowState === 2) {
btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
} else if (flowState === 3) {
if (bizApproveState != 'D') {
if (bizApproveState != 'D' || row.crossPlatformApproveState == 'E') {
btnsArr.push({ label: "重新提交", value: "edit" })
}
}
......
src/views/data_product/productListing.vue
......@@ -151,7 +151,7 @@ const tableInfo = ref({
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
......@@ -174,7 +174,7 @@ const tableInfo = ref({
if (flowState === 3) {
list.push({ label: "删除", value: "del" })
}
if (flowState === 3 && bizApproveState != 'D') {
if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E')) {
list.push({ label: "重新提交", value: "redit" }) //已驳回
}
if (isShowCancel) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!