Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
@@ -1001,7 +1001,7 @@
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
isEditVerifi(val){
|
isEditVerifi(val) {
|
||||||
if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
|
if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' ||
|
||||||
val.verifyFlowStatus == 'Results to be reviewed') {
|
val.verifyFlowStatus == 'Results to be reviewed') {
|
||||||
return true
|
return true
|
||||||
@@ -1326,8 +1326,15 @@
|
|||||||
this.$set(this, 'rules', rules)
|
this.$set(this, 'rules', rules)
|
||||||
},
|
},
|
||||||
clickButtonToUpload(item) {
|
clickButtonToUpload(item) {
|
||||||
|
let isTrue = false
|
||||||
|
if (item == 'designDeliverableTemplate') {
|
||||||
|
isTrue = this.isEdit(this.formInline)
|
||||||
|
} else if (item == 'verifyDeliverableTemplate') {
|
||||||
|
isTrue = this.isEditVerifi(this.formInline)
|
||||||
|
}
|
||||||
this.$refs.uploadFile.perentHandleFunc()
|
this.$refs.uploadFile.perentHandleFunc()
|
||||||
this.$refs.uploadFile.visible = true
|
this.$refs.uploadFile.visible = true
|
||||||
|
this.$refs.uploadFile.disabled = isTrue
|
||||||
this.uploadName = item
|
this.uploadName = item
|
||||||
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
|
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
Reference in New Issue
Block a user