diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue index fd870bfe..1cef75dc 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue @@ -717,9 +717,11 @@ export default { type: 'success', message: res.msg, }) - this.$tab.closeOpenPage({ - path: '/claimAndRefund/receive/receiveApply', - }) + // this.$tab.closeOpenPage({ + // path: '/claimAndRefund/receive/receiveApply', + // }) + + this.$emit('goBackPage') } } }) diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue index 08ee1075..e2800a0a 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue @@ -94,7 +94,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['picking:auditing']" + v-hasPermi="['picking:apply:apply']" >新建 @@ -105,6 +105,7 @@ icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['picking:apply:export']" >导出 @@ -256,6 +257,7 @@ type="text" icon="el-icon-zoom-in" @click="handleView(scope.row)" + v-hasPermi="['picking:apply:view']" >查看 编辑 驳回提交 删除 diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue index 7590a5e4..1fe63317 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue @@ -14,6 +14,7 @@ @addPicking="addPicking" @viewPicking="viewPicking" @editPicking="editPicking" + @goBackPage="goBack" /> diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue index 230a6e17..1967bded 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue @@ -216,14 +216,14 @@ type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus == 30" - v-hasPermi="['receive:examine:fgs']" + v-hasPermi="['picking:auditing:fgs']" >确 定 确 定 确 定 确 定 @@ -269,14 +269,14 @@ type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus == 30" - v-hasPermi="['receive:examine:fgs']" + v-hasPermi="['picking:auditing:fgs']" >确 定 确 定 确 定 确 定 @@ -509,9 +509,10 @@ export default { const res = await auditLeaseByCompany(params) if (res.code == 200) { this.examineVisible = false - this.$tab.closeOpenPage({ - path: '/claimAndRefund/receive/receiveManage', - }) + // this.$tab.closeOpenPage({ + // path: '/claimAndRefund/receive/receiveManage', + // }) + this.$emit('goBackPage') } // console.log('subAuditLeaseByCompany ==================', res) }, @@ -560,9 +561,10 @@ export default { const res = await rejectLeaseByCompany(params) if (res.code == 200) { this.examineVisible = false - this.$tab.closeOpenPage({ - path: '/claimAndRefund/receive/receiveManage', - }) + // this.$tab.closeOpenPage({ + // path: '/claimAndRefund/receive/receiveManage', + // }) + this.$emit('goBackPage') } console.log('subAuditLeaseByCompany ==================', res) }, diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue index be7b6b34..ceee89bb 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue @@ -102,6 +102,7 @@ icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['picking:auditing:export']" >导出 @@ -203,14 +204,17 @@ diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue index f2abe9ab..e01682c3 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue @@ -12,6 +12,7 @@ :auditingTaskId="auditingTaskId" @pickingView="pickingView" @pickingAuditing="pickingAuditing" + @goBackPage="goBack" /> diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index dad4822d..0e333e53 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -89,6 +89,7 @@ icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['picking:outbound:export']" >导出 @@ -157,7 +158,10 @@ class-name="small-padding fixed-width" >