diff --git a/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js b/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js new file mode 100644 index 00000000..e3301329 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Jzcksq/jzcksq.js @@ -0,0 +1,113 @@ +import request from '@/utils/request' +// 入库导入的记录 /enterprisecentre +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/listPage', + method: 'post', + data: params + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/submit ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/saveorUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/details', + method: 'get', + params: data + }) + }, + // 流程历史流转记录 + flowRecord: function(procInsId, deployId) { + return request({ + url: '/enterprisecentre/v1/sealrecord/task/flowRecord/' + procInsId + '/' + deployId, + method: 'get' + }) + }, + // 根据SID获取一条记录 + delBySids: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/delete', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 办理待办 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/complete', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取下一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/enterprisecentre/v1/QualityRelease/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue index 66db376c..5052305d 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -51,8 +51,8 @@ icon: "el-icon-menu", title: "解质出库申请", }, - name: "/NewList/outbound", - path: "/NewList/outbound" + name: "/Jzcksq/index", + path: "/Jzcksq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index dafb09e6..dee6d7f2 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -92,12 +92,12 @@ const codemenu = [{ } }] },{ - path: '/NewList', + path: '/Jzcksq', component: Layout, - redirect: '/NewList/outbound', + redirect: '/Jzcksq', children: [{ - path: '/NewList/outbound', - component: () => import('@/views/NewList/outbound.vue'), + path: '/Jzcksq/index', + component: () => import('@/views/Jzcksq/index.vue'), name: 'outbound', meta: { title: '货物解除质押出库申请', @@ -484,6 +484,27 @@ const codemenu = [{ import('@/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue'), name: 'rkzyEdit' }, + // 解质出库待办详情 + { + path: '/jiezhichukuFlow/jzckDaiBan', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue'), + name: 'jzckDaiBan' + }, + // 解质出库已办详情 + { + path: '/jiezhichukuFlow/jzckYiBan', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckYiBan.vue'), + name: 'jzckYiBan' + }, + // 解质出库的编辑 + { + path: '/jiezhichukuFlow/jzckEdit', + component: () => + import('@/views/workFlow/jiezhichukuFlow/jzckEdit.vue'), + name: 'jzckEdit' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Jzcksq/index.vue b/supervise-enterprise-ui/src/views/Jzcksq/index.vue new file mode 100644 index 00000000..14357321 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/index.vue @@ -0,0 +1,320 @@ + + + + diff --git a/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue b/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue new file mode 100644 index 00000000..d4c7e3b5 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/jzckAdd.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue b/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue new file mode 100644 index 00000000..dc12b874 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Jzcksq/jzckInfo.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue index bb6a74ed..fa700c76 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -105,14 +105,14 @@ export default { showAdd() { this.title = '【新增】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) this.formobj.userSid = window.sessionStorage.getItem('userSid') }, showEdit(row) { this.title = '【编辑】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) req.fetchDetailsBySid({ sid: row.sid }).then((resp) => { if (resp.success) { diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue new file mode 100644 index 00000000..136e4ad5 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckDaiBan.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue new file mode 100644 index 00000000..6da512b9 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckEdit.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue new file mode 100644 index 00000000..597543d4 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/jiezhichukuFlow/jzckYiBan.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index 4911c72c..483b9a93 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -120,7 +120,7 @@ export default { showInfo(sid) { this.title = '【编辑】货物入库质押' this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() + this.$refs['dataForm'].clearValidate() }) req.fetchDetailsBySid({ sid: sid }).then((resp) => { if (resp.success) {