Commit e495cdc9a889b9b6963d451e6f2d8dbd841a981a
1 parent
193fcece
v1.9 优化物品放行提交者自己结束
Showing
2 changed files
with
9 additions
and
2 deletions
src/views/work/itemReleaseDetailLang.js
| ... | ... | @@ -44,7 +44,8 @@ export const messages = { |
| 44 | 44 | selectNextHandler: 'Please select next handler', |
| 45 | 45 | submitSuccess: 'Submit successfully', |
| 46 | 46 | submitFailed: 'Submit failed', |
| 47 | - administrator: 'Administrator' | |
| 47 | + administrator: 'Administrator', | |
| 48 | + end: 'End' | |
| 48 | 49 | } |
| 49 | 50 | }, |
| 50 | 51 | zh: { |
| ... | ... | @@ -92,7 +93,8 @@ export const messages = { |
| 92 | 93 | selectNextHandler: '请选择下一节点处理人', |
| 93 | 94 | submitSuccess: '提交成功', |
| 94 | 95 | submitFailed: '提交失败', |
| 95 | - administrator: '管理员' | |
| 96 | + administrator: '管理员', | |
| 97 | + end: '结束' | |
| 96 | 98 | } |
| 97 | 99 | } |
| 98 | 100 | } |
| 99 | 101 | \ No newline at end of file | ... | ... |
src/views/work/itemReleaseDetailList.vue
| ... | ... | @@ -138,6 +138,7 @@ |
| 138 | 138 | <el-option v-if="itemReleaseDetailInfo.nextAudit.backIndex" value="1400" |
| 139 | 139 | :label="$t('itemReleaseDetail.returnToSubmitter')" /> |
| 140 | 140 | <el-option value="1300" :label="$t('itemReleaseDetail.transfer')" /> |
| 141 | + <el-option v-if="itemReleaseDetailInfo.nextAudit.exit && userId == itemReleaseDetailInfo.pools.createUserId" value="1500" :label="$t('itemReleaseDetail.end')" /> | |
| 141 | 142 | </el-select> |
| 142 | 143 | </el-form-item> |
| 143 | 144 | <el-form-item :label="$t('itemReleaseDetail.workOrderDescription')"> |
| ... | ... | @@ -189,6 +190,7 @@ import { |
| 189 | 190 | listRunWorkflowImage, |
| 190 | 191 | queryNextDealUser |
| 191 | 192 | } from '@/api/work/itemReleaseDetailApi' |
| 193 | +import {getUserId} from '@/api/user/userApi' | |
| 192 | 194 | |
| 193 | 195 | export default { |
| 194 | 196 | name: 'ItemReleaseDetailList', |
| ... | ... | @@ -198,6 +200,7 @@ export default { |
| 198 | 200 | data() { |
| 199 | 201 | return { |
| 200 | 202 | communityId: '', |
| 203 | + userId:'', | |
| 201 | 204 | itemReleaseDetailInfo: { |
| 202 | 205 | irId: '', |
| 203 | 206 | flowId: '', |
| ... | ... | @@ -205,6 +208,7 @@ export default { |
| 205 | 208 | resNames: [], |
| 206 | 209 | comments: [], |
| 207 | 210 | action: '', |
| 211 | + | |
| 208 | 212 | audit: { |
| 209 | 213 | auditCode: '1100', |
| 210 | 214 | auditMessage: '', |
| ... | ... | @@ -220,6 +224,7 @@ export default { |
| 220 | 224 | }, |
| 221 | 225 | created() { |
| 222 | 226 | this.communityId = getCommunityId() |
| 227 | + this.userId = getUserId() | |
| 223 | 228 | this.initData() |
| 224 | 229 | }, |
| 225 | 230 | methods: { | ... | ... |