From e7172e3ac59911bb4e6349153f5f211a59d4e3a6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 11:29:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/Rkzysq/rkzysq.js | 109 ++++++ .../src/layout/components/Sidebar/index.vue | 4 +- .../src/router/modules/codemenu.js | 29 +- .../src/views/Rkzysq/index.vue | 320 ++++++++++++++++ .../src/views/Rkzysq/rkzyAdd.vue | 204 ++++++++++ .../src/views/Rkzysq/rkzyInfo.vue | 151 ++++++++ .../workFlow/rukuzhiyaFlow/rkzyDaiBan.vue | 348 ++++++++++++++++++ .../views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 208 +++++++++++ .../workFlow/rukuzhiyaFlow/rkzyYiBan.vue | 197 ++++++++++ 9 files changed, 1564 insertions(+), 6 deletions(-) create mode 100644 supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/index.vue create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue create mode 100644 supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue create mode 100644 supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue diff --git a/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js new file mode 100644 index 00000000..50e2c773 --- /dev/null +++ b/supervise-enterprise-ui/src/api/Rkzysq/rkzysq.js @@ -0,0 +1,109 @@ +import request from '@/utils/request' +// 入库导入的记录 /enterprisecentre +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/listPage', + method: 'post', + data: params + }) + }, + // 提交列表 + sealrecordSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/submit ', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存列表 + sealrecordSave: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/saveorUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据SID获取一条记录 + fetchDetailsBySid: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/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/WarehousingPledge/delete', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 办理待办 + complete: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/complete', + method: 'post', + data: data + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/reject', + method: 'post', + data: params + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/breakProcess', + method: 'post', + data: params + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/revokeProcess', + method: 'post', + data: params + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/getNextNodesForSubmit', + method: 'post', + params: data + }) + }, + // 审批流程(驳回)获取下一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/enterprisecentre/v1/WarehousingPledge/getPreviousNodesForReject', + method: 'post', + 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 ca410092..66db376c 100644 --- a/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue +++ b/supervise-enterprise-ui/src/layout/components/Sidebar/index.vue @@ -41,8 +41,8 @@ icon: "el-icon-menu", title: "入库质押申请", }, - name: "/NewList/warehouse", - path: "/NewList/warehouse" + name: "/Rkzysq/index", + path: "/Rkzysq/index" }, { alwaysShow: true, diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index 70bc5357..dafb09e6 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -53,12 +53,12 @@ const codemenu = [{ } }] },{ - path: '/NewList', + path: '/Rkzysq', component: Layout, - redirect: '/NewList/warehouse', + redirect: '/Rkzysq', children: [{ - path: '/NewList/warehouse', - component: () => import('@/views/NewList/warehouse.vue'), + path: '/Rkzysq/index', + component: () => import('@/views/Rkzysq/index.vue'), name: 'warehouse', meta: { title: '货物入库质押申请', @@ -463,6 +463,27 @@ const codemenu = [{ import('@/views/Yjsq/LookYzsq/index.vue'), name: 'LookYzsq' }, + // 入库质押待办详情 + { + path: '/rukuzhiyaFlow/rkzyDaiBan', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue'), + name: 'rkzyDaiBan' + }, + // 入库质押已办详情 + { + path: '/rukuzhiyaFlow/rkzyYiBan', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue'), + name: 'rkzyYiBan' + }, + // 入库质押的编辑 + { + path: '/rukuzhiyaFlow/rkzyEdit', + component: () => + import('@/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue'), + name: 'rkzyEdit' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Rkzysq/index.vue b/supervise-enterprise-ui/src/views/Rkzysq/index.vue new file mode 100644 index 00000000..10dea8ae --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/index.vue @@ -0,0 +1,320 @@ + + + + + + + {{ searchxianshitit }} + + + + + + + + + + + 至 + + + + + 查询 + 重置 + + + + + 入库质押列表 + + + + + + + + 办理 + 查看 + + + + + 待提交 + {{ scope.row.nodeState }} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue new file mode 100644 index 00000000..106d590a --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -0,0 +1,204 @@ + + + + + {{ title }} + + 保存 + 提交 + 关闭 + + + + + 货物入库质押 + + + + 项目名称 + + + + + + + + + + + + 申请日期 + + + + + + + + + + + + + 仓库名称 + + + + + + + + + + 申请人 + + + + + + + + + + + + 货物价值 + + + + + + + + + + + + + + + + + diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue new file mode 100644 index 00000000..3c0c7a28 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyInfo.vue @@ -0,0 +1,151 @@ + + + + + {{ title }} + + 关闭 + + + + + 货物入库质押 + + + + 项目名称 + + + + + {{ formobj.projectName }} + + + + + 申请日期 + + + + + {{ formobj.createTime }} + + + + + + + 仓库名称 + + + + + {{ formobj.warehouseName }} + + + + + 申请人 + + + + + {{ formobj.createByName }} + + + + + + + 货物价值 + + + + + {{ formobj.goodsValue }} + + + + + + + + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue new file mode 100644 index 00000000..b40703d9 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyDaiBan.vue @@ -0,0 +1,348 @@ + + + + + {{ title }} + + 同 意 + + 终 止 + + + + + 货物入库质押 + + + + 项目名称 + + + + + {{ formobj.projectName }} + + + + + 申请日期 + + + + + {{ formobj.createTime }} + + + + + + + 仓库名称 + + + + + {{ formobj.warehouseName }} + + + + + 申请人 + + + + + {{ formobj.createByName }} + + + + + + + 货物价值 + + + + + {{ formobj.goodsValue }} + + + + + + + + + + + + 当前环节: + + + {{ current.taskName }}->{{ nextNode.name }} + + + + + 意见: + + + + + + + 确 定 + 取 消 + + + + + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue new file mode 100644 index 00000000..361bf651 --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -0,0 +1,208 @@ + + + + + {{ title }} + + 保存 + 提交 + + + + + 货物入库质押 + + + + 项目名称 + + + + + + + + + + + + 申请日期 + + + + + + + + + + + + + 仓库名称 + + + + + + + + + + 申请人 + + + + + + + + + + + + 货物价值 + + + + + + + + + + + + + + + + + diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue new file mode 100644 index 00000000..cd05d00d --- /dev/null +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyYiBan.vue @@ -0,0 +1,197 @@ + + + + + {{ title }} + + 撤 回 + + + + + 货物入库质押 + + + + 项目名称 + + + + + {{ formobj.projectName }} + + + + + 申请日期 + + + + + {{ formobj.createTime }} + + + + + + + 仓库名称 + + + + + {{ formobj.warehouseName }} + + + + + 申请人 + + + + + {{ formobj.createByName }} + + + + + + + 货物价值 + + + + + {{ formobj.goodsValue }} + + + + + + + + + + + + From 0966e8c40ca6030c8257350cc1e18c137afa12ac Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 11:36:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=B4=A8=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue | 7 ++----- .../src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue index 106d590a..bb6a74ed 100644 --- a/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue +++ b/supervise-enterprise-ui/src/views/Rkzysq/rkzyAdd.vue @@ -85,10 +85,7 @@ export default { return { title: '', submitdisabled: false, - projectSidList: [{ - entryName: '喜相随贸易保证贷款项目', - sid: '99a0bb0e-539f-4d87-8ec7-1e079b0ecffe' - }], + projectSidList: [], formobj: { userSid: '', createByName: '', @@ -102,7 +99,7 @@ export default { } }, created() { - // this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) + this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) }, methods: { showAdd() { diff --git a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue index 361bf651..e1f40f04 100644 --- a/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue +++ b/supervise-enterprise-ui/src/views/workFlow/rukuzhiyaFlow/rkzyEdit.vue @@ -99,6 +99,7 @@ export default { } }, created() { + this.projectSidList = JSON.parse(window.sessionStorage.getItem('projectSidList')) console.log('url:' + window.location.href) var one = window.location.href.indexOf('&data') + 6 const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用