diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue index a1ea8fb..dc739bb 100644 --- a/src/views/modules/processManagement/processBindingInfo.vue +++ b/src/views/modules/processManagement/processBindingInfo.vue @@ -1201,7 +1201,10 @@ this.queryTableParam = { tableType: 'plm_project_tool_applyHeader', passTable: [], - addTable: [] + addTable: [ + 'plm_project_tool_applyHeader', + 'plm_project_tool_applyDetail' + ] } } else { return diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 52bb300..0b17099 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -58,6 +58,7 @@ label="操作"> @@ -236,7 +237,7 @@ width="800px" v-drag :title="'刀模申请修改'" :close-on-click-modal="false" - :visible.sync="visible"> + :visible.sync="visibleU"> @@ -319,9 +320,7 @@ {{'保存'}} - {{'取消'}} - 同意 - 驳回 + {{'取消'}} @@ -411,7 +410,7 @@ - {{'保存'}} + {{'取消'}} 同意 驳回 @@ -539,6 +538,7 @@ endDate:'', }, toolData:[], + visibleU:false, dataForm:{ site: '', applyNo: '', @@ -1402,6 +1402,39 @@ }) this.visible=true }, + editModalU (row) { + this.getNodeAuthority(row) + this.dataForm = { + site: row.site, + applyNo: row.applyNo, + applyBy: row.applyBy, + applyDate: row.applyDate, + applySumQty: row.applySumQty, + applyReason: row.applyReason, + remark: row.remark, + createBy: row.createBy, + department:row.department, + detailList: [], + status: row.status, + rejectOpinion: '', + nodeConclusion: '', + quoter: row.quoter, + quoterName: row.quoterName, + tp: row.tp, + tpName: row.tpName, + purchaser: row.purchaser, + purchaserName: row.purchaserName, + menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, + } + searchProjectToolApplyDetail({ site: row.site, + applyNo: row.applyNo,}).then(({data}) => { + if (data.code == 0) { + this.toolData = data.rows + } + }) + this.visibleU=true + }, comfirmApply (row) { this.$confirm(`确定下达这个申请`, '提示', { confirmButtonText: '确定', @@ -1663,6 +1696,7 @@ } } this.visible = false + this.visibleU = false this.refreshCurrentTabTable() this.$message({ message: '操作成功',