Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
76e845e7 by lihua
Options

连接器推送的不能编辑删除重新提交

1 parent 2ff950d8
Inline Side-by-side
Showing 4 changed files with 7 additions and 7 deletions
src/views/data_facilitator/settleDetail.vue
......@@ -42,7 +42,7 @@ const toolBtns: any = computed(() => {
if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
}
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) {
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid && !flowDetail.value.nodeId) {
btnsArr.push({ label: "撤销", value: "revoke" });
}
return btnsArr;
......
src/views/data_facilitator/settleManagement.vue
......@@ -170,10 +170,10 @@ const getTableBtns = (row, includeDetail = true) => {
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid && row.createUserId == userData.userGuid) {
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid && !row.nodeId) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid && row.createUserId == userData.userGuid) {
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid && !row.nodeId) {
isShowCancel = true;
}
......
src/views/data_product/productListing.vue
......@@ -159,13 +159,13 @@ const tableInfo = ref({
flowState = 2;
}
//自己提交的才可以重新提交，从连接器推送的不可以
if ((bizApproveState == 'D' || approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') && staffGuid == currentStaffGuid && userData.userGuid == row.createUserId) {
if ((bizApproveState == 'D' || approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') && staffGuid == currentStaffGuid && !row.nodeId) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid && row.createUserId == userData.userGuid) {
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid && !row.nodeId) {
isShowCancel = true;
}
if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid && row.createUserId == userData.userGuid) {
if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid && !row.nodeId) {
if (row.listingStatus == 'Y') {
list.push({ label: "下架", value: "down" });
} else {
......
src/views/data_product/productListingDetail.vue
......@@ -1528,7 +1528,7 @@ const toolBtns: any = computed(() => {
if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
}
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) {
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid && !flowDetail.value.nodeId) {
btnsArr.push({ label: "撤销", value: "revoke" });
}
return btnsArr;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!