e68732fe by lihua

主平台驳回也需显示删除和重新提交

1 parent d0668ac8
...@@ -217,7 +217,7 @@ const getTableBtns = (row) => { ...@@ -217,7 +217,7 @@ const getTableBtns = (row) => {
217 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 217 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
218 flowState = 2; 218 flowState = 2;
219 } 219 }
220 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) { 220 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') && staffGuid == currentStaffGuid) {
221 flowState = 3; 221 flowState = 3;
222 } 222 }
223 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 223 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
...@@ -232,7 +232,7 @@ const getTableBtns = (row) => { ...@@ -232,7 +232,7 @@ const getTableBtns = (row) => {
232 if (flowState === 3) { 232 if (flowState === 3) {
233 btnsArr.push({ label: "删除", value: "del" }) 233 btnsArr.push({ label: "删除", value: "del" })
234 } 234 }
235 if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E')) { 235 if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R')) {
236 btnsArr.push({ label: "重新提交", value: "redit" }) 236 btnsArr.push({ label: "重新提交", value: "redit" })
237 } 237 }
238 if (isShowCancel) { 238 if (isShowCancel) {
......
...@@ -198,7 +198,7 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -198,7 +198,7 @@ const getTableBtns = (row, includeDetail = true) => {
198 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 198 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
199 flowState = 2; 199 flowState = 2;
200 } 200 }
201 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) { 201 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') && staffGuid == currentStaffGuid) {
202 flowState = 3; 202 flowState = 3;
203 } 203 }
204 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 204 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
...@@ -212,7 +212,7 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -212,7 +212,7 @@ const getTableBtns = (row, includeDetail = true) => {
212 if (flowState === 2) { 212 if (flowState === 2) {
213 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 213 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
214 } else if (flowState === 3) { 214 } else if (flowState === 3) {
215 if (bizApproveState != 'D' || row.crossPlatformApproveState == 'E') { 215 if (bizApproveState != 'D' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') {
216 btnsArr.push({ label: "重新提交", value: "edit" }) 216 btnsArr.push({ label: "重新提交", value: "edit" })
217 } 217 }
218 } 218 }
......
...@@ -151,7 +151,7 @@ const tableInfo = ref({ ...@@ -151,7 +151,7 @@ const tableInfo = ref({
151 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 151 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
152 flowState = 2; 152 flowState = 2;
153 } 153 }
154 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E') && staffGuid == currentStaffGuid) { 154 if ((approveState == 'C' || approveState == 'R' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R') && staffGuid == currentStaffGuid) {
155 flowState = 3; 155 flowState = 3;
156 } 156 }
157 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 157 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
...@@ -174,7 +174,7 @@ const tableInfo = ref({ ...@@ -174,7 +174,7 @@ const tableInfo = ref({
174 if (flowState === 3) { 174 if (flowState === 3) {
175 list.push({ label: "删除", value: "del" }) 175 list.push({ label: "删除", value: "del" })
176 } 176 }
177 if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E')) { 177 if (flowState === 3 && (bizApproveState != 'D' || row.crossPlatformApproveState == 'E' || row.crossPlatformApproveState == 'R')) {
178 list.push({ label: "重新提交", value: "redit" }) //已驳回 178 list.push({ label: "重新提交", value: "redit" }) //已驳回
179 } 179 }
180 if (isShowCancel) { 180 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!