朱园亮 / erp-mobile · Commits

Commit bbfcf68d2cbd0eba1068ab2592c1853a1a09044c

Authored by 史婷婷
2 parents df0db9f3 f9c87491

Merge branch 'cjerp-1.0' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into cjerp-1.0

Inline Side-by-side
Showing 2 changed files with 34 additions and 30 deletions
... ... @@ -169,7 +169,8 @@ export default {
169 169 packaging: ''
170 170 },
171 171 productList: [],
172   - buttons: [{
  172 + buttons: [
  173 + {
173 174 text: '编辑',
174 175 visible: true,
175 176 variant: 'outline',
... ... @@ -257,19 +258,18 @@ export default {
257 258 const e = this.detail.showExamine || false
258 259 const f = this.detail.standardShowExamine || false
259 260 return [
260   - { ...this.buttons[0], visible: (s === 'DRAFT') },
261   - { ...this.buttons[1], visible: (s === 'DRAFT') },
262   - { ...this.buttons[2], visible: (s === 'FORMAL' && !l) },
263   - { ...this.buttons[3], visible: (s === 'FORMAL' && !l) },
264   - { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') },
265   - { ...this.buttons[5], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
266   - { ...this.buttons[6], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') },
267   - { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
268   - { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
269   - { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT') },
270   - { ...this.buttons[10], visible: (s === 'FORMAL' && t) },
271   - { ...this.buttons[11], visible: (s === 'STANDARD' && t) },
272   - { ...this.buttons[12], visible: (s === 'STANDARD' && a) },
  261 + { ...this.buttons[0], visible: (s === 'DRAFT') }, //编辑
  262 + { ...this.buttons[1], visible: (s === 'DRAFT') }, //删除
  263 + { ...this.buttons[2], visible: (s === 'FORMAL' && !l) }, //锁价
  264 + { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') },
  265 + { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
  266 + { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') },
  267 + { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
  268 + { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
  269 + { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT') },
  270 + { ...this.buttons[9], visible: (s === 'FORMAL' && t) },
  271 + { ...this.buttons[10], visible: (s === 'STANDARD' && t) },
  272 + { ...this.buttons[11], visible: (s === 'STANDARD' && a) },
273 273 ]
274 274 }
275 275 },
... ... @@ -411,6 +411,7 @@ export default {
411 411 uni.navigateTo({ url: '/pages/flow/audit' })
412 412 },
413 413 onAuditDetail(id, type) {
  414 + console.log('审核详情__id', id)
414 415 const CACHE_KEY = 'sourceBusinessId'
415 416 const TYPE = 'contractType'
416 417 uni.setStorageSync(TYPE, type)
... ...
... ... @@ -257,23 +257,26 @@ export default {
257 257 },
258 258 computed: {
259 259 displayButtons() {
260   - const s = this.detail && this.detail.status || ''
261   - const t = this.detail.standardApproved || ''
262   - const l = this.detail.priceSpecLocked || ''
  260 + const s = this.detail && this.detail.status || false
  261 + const t = this.detail.standardApproved || false
  262 + const a = this.detail.formalApproved || false
  263 + const l = this.detail.priceSpecLocked || false
  264 + const e = this.detail.showExamine || false
  265 + const f = this.detail.standardShowExamine || false
263 266 return [
264   - { ...this.buttons[0], visible: (s === 'DRAFT') },
265   - { ...this.buttons[1], visible: (s === 'DRAFT') },
266   - { ...this.buttons[2], visible: (s === 'FORMAL' && !l) },
267   - { ...this.buttons[3], visible: (s === 'FORMAL' && !l) },
268   - { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') },
269   - { ...this.buttons[5], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
270   - { ...this.buttons[6], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
271   - { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
272   - { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
273   - { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT') },
274   - { ...this.buttons[10], visible: (s === 'FORMAL' && t) },
275   - { ...this.buttons[11], visible: (s === 'STANDARD' && t) },
276   - { ...this.buttons[12], visible: (s === 'STANDARD' && a) },
  267 + { ...this.buttons[0], visible: (s === 'DRAFT') }, //编辑
  268 + { ...this.buttons[1], visible: (s === 'DRAFT') }, //删除
  269 + { ...this.buttons[2], visible: (s === 'FORMAL' && !l) }, //锁规
  270 + { ...this.buttons[3], visible: (s === 'FORMAL' && !l) }, //锁规延期申请
  271 + { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && a !== 'AUDIT' && a !== 'PASS') }, //上传正式合同附件
  272 + { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') }, //上传正式合同附件
  273 + { ...this.buttons[6], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') }, //上传标准合同附件
  274 + { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT') }, //审核正式合同
  275 + { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT') }, //审核正式合同
  276 + { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT') }, //审核标准合同
  277 + { ...this.buttons[10], visible: (s === 'FORMAL' && a) }, //正式合同审核详情
  278 + { ...this.buttons[11], visible: (s === 'STANDARD' && a) }, //正式合同审核详情
  279 + { ...this.buttons[12], visible: (s === 'STANDARD' && t) }, //标准合同审核详情
277 280 ]
278 281 }
279 282 },
... ...