diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index 6cc9d886..2f605ff6 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -165,7 +165,7 @@ 重置 - + @@ -233,7 +233,7 @@ size="mini" type="danger" @click="handleReject(scope.row)" - v-if="scope.row.alNum == 0" + v-if="scope.row.alNum == 0 && taskType == '19'" > 驳回 @@ -409,7 +409,7 @@ -
+
领料单
@@ -779,7 +779,9 @@ export default { kgSignList: [], outSignList: [], approveSignList: [], - currentRowData: null // 当前查看的行数据 + currentRowData: null, // 当前查看的行数据 + leaseLoading: false, + taskType: '' } }, created() { @@ -892,7 +894,10 @@ export default { /** 查看按钮操作 */ handleView(row) { - const { id, publishTask } = row + console.log('🚀 ~ handleView ~ row:', row.taskType) + this.getListOutInfo = [] + const { id, publishTask, taskType } = row + this.taskType = taskType this.publishTask = publishTask this.currentRowData = row // 保存当前行数据,用于驳回时获取taskId this.title = '查看' @@ -952,14 +957,19 @@ export default { /** 出库按钮操作 */ handleOut(row) { + this.getListOutInfo = [] const { id, publishTask } = row this.publishTask = publishTask this.title = '出库' this.showOutInfo = true this.queryOutInfo.id = row.id + this.loadingView = true outInfoList(id, { keyWord: this.queryOutInfo.keyWord, publishTask }).then(response => { this.getListOutInfo = response.data.leaseApplyDetailsList // this.loading = false; + this.loadingView = false + }).catch(() => { + this.loadingView = false }) }, @@ -1110,12 +1120,19 @@ export default { // var ids = row.id const { id, publishTask } = row this.publishTask = publishTask - const res = await getApplyInfo(id, { keyWord: this.queryOutView.keyWord, publishTask }) - this.leaseApplyDetails = res.data.leaseApplyDetailsList - this.leaseApplyData = res.data.leaseApplyInfo - this.kgSignList = res.data.kgSignList || [] - this.outSignList = res.data.outSignList || [] - this.approveSignList = res.data.approveSignList || [] + this.leaseLoading = true + try { + const res = await getApplyInfo(id, { keyWord: this.queryOutView.keyWord, publishTask }) + this.leaseApplyDetails = res.data.leaseApplyDetailsList + this.leaseApplyData = res.data.leaseApplyInfo + this.kgSignList = res.data.kgSignList || [] + this.outSignList = res.data.outSignList || [] + this.approveSignList = res.data.approveSignList || [] + } catch (error) { + console.log('🚀 ~ handleLld ~ error:', error) + } finally { + this.leaseLoading = false + } }, //出库检验单打印 @@ -1340,4 +1357,7 @@ export default { border-collapse: collapse; } } +.my-loading { + z-index: 99999 !important; +}