diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js index 30340561..dbd6cc7f 100644 --- a/src/api/auth/authAdmin.js +++ b/src/api/auth/authAdmin.js @@ -81,3 +81,11 @@ export function filterByUser(query) { params: query }); } + +export function companyUserList(query) { + return axios({ + url: "/admin/auth/companyUser/list", + method: "get", + params: query + }); +} diff --git a/src/api/basic/sysApprovalFlow.js b/src/api/basic/sysApprovalFlow.js new file mode 100644 index 00000000..1f938a8b --- /dev/null +++ b/src/api/basic/sysApprovalFlow.js @@ -0,0 +1,19 @@ +import axios from "@/utils/request"; + +let BUSINESS_PRE = "/udiwms"; + +export function getDetailList(approvalFlowId) { + return axios({ + url: BUSINESS_PRE+`/sysApprovalFlow/approvalFlowDetailList/${approvalFlowId}`, + method: "GET" + }); +} + + +export function submitApprovalFlow(query) { + return axios({ + url: BUSINESS_PRE+"/sysApprovalFlow/submitApprovalFlow", + method: "post", + data: query + }); +} diff --git a/src/api/basic/sysApprovalFlowConfig.js b/src/api/basic/sysApprovalFlowConfig.js new file mode 100644 index 00000000..22c84b1a --- /dev/null +++ b/src/api/basic/sysApprovalFlowConfig.js @@ -0,0 +1,35 @@ +import axios from "@/utils/request"; +let BUSINESS_PRE = "/udiwms"; + +export function getList(query) { + return axios({ + url: BUSINESS_PRE + '/sysApprovalFlowConfig/filter', + method: 'get', + params: query + }) +} + +export function getConfigDetailList(query) { + return axios({ + url: BUSINESS_PRE + '/sysApprovalFlowConfig/detail', + method: 'get', + params: query + }) +} + +export function addConfigDetail(query) { + return axios({ + url: BUSINESS_PRE+"/sysApprovalFlowConfig/addConfigDetail", + method: "post", + data: query + }); +} + + +// 删除 +export function removeDetail(id) { + return axios({ + url: BUSINESS_PRE+`/sysApprovalFlowConfig/removeDetail/${id}`, + method: "DELETE" + }); +} diff --git a/src/components/ApprovalFlow/index.vue b/src/components/ApprovalFlow/index.vue new file mode 100644 index 00000000..7482d7a7 --- /dev/null +++ b/src/components/ApprovalFlow/index.vue @@ -0,0 +1,183 @@ + + + + + + + + + + 办理人: + 待办人: + {{ activity.approvalUserName }} + 办理时间:{{ activity.approvalTime }} + + + + 状态: + + {{ + activity.approvalStatus == 2 ? + '待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中' + }} + + + 审批意见:{{ activity.approvalOpinion }} + + + + + + + + + + + + + + + + + + + + + + + + 申请人:{{ activity.userName }} + 申请标题:{{ activity.title }} + 提交时间:{{ activity.createTime }} + + + + 状态: + + {{ + activity.approvalStatus == 2 ? '待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中' + }} + + + + + + + + + + + + + diff --git a/src/views/basic/approval/SysApprovalFlowConfig.vue b/src/views/basic/approval/SysApprovalFlowConfig.vue new file mode 100644 index 00000000..05e57d98 --- /dev/null +++ b/src/views/basic/approval/SysApprovalFlowConfig.vue @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + 显示/隐藏搜索栏 + 重置 + 查询 + + + + + + + + + + + + + 审批过程 + + + + + + + + + + + + + + + + diff --git a/src/views/basic/approval/sysApprovalFlowConfigEdit.vue b/src/views/basic/approval/sysApprovalFlowConfigEdit.vue new file mode 100644 index 00000000..1113c917 --- /dev/null +++ b/src/views/basic/approval/sysApprovalFlowConfigEdit.vue @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + 新增节点 + 取消新增节点 + + + + + + + + + + {{ item.employeeName }} + + + + + + + + + + + + + 提交 + + + + + + + + + + 审批人:{{ activity.approvalUserName }} + 审批顺序:{{ activity.approvalSort }} + + + + + + + + + + + + + + + + + diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue index d5a4b634..1693434b 100644 --- a/src/views/inout/receive/DialogNewReceive.vue +++ b/src/views/inout/receive/DialogNewReceive.vue @@ -254,9 +254,10 @@ export default { deleteLoading: false, orderNo: null, statusMap: { - 1: "草稿", - 2: "未审核", - 3: "已审核", + 0: "草稿", + 1: "未审核", + 2: "已审核", + 3: "已拒绝" }, orderEditor: true, iCount: 0, diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue index 3784eefe..9b0812e7 100644 --- a/src/views/inout/receive/receiveAdd.vue +++ b/src/views/inout/receive/receiveAdd.vue @@ -417,10 +417,10 @@ export default { update: "编辑领用单据", }, statusMap: { - 1: "草稿", - 2: "未审核", - 3: "已审核", - 4: "已拒绝" + 0: "草稿", + 1: "未审核", + 2: "已审核", + 3: "已拒绝" }, idQuery: {}, corpList: [], diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue index cc3184df..365c8c76 100644 --- a/src/views/inout/receive/receiveAudit.vue +++ b/src/views/inout/receive/receiveAudit.vue @@ -354,6 +354,7 @@ v-if="newSpDistributionVisible" :close-on-click-modal="false" :close-on-press-escape="false" + :before-close="handleClose" > + + + + + + + + + + + + + + 审核通过 - - 审核拒绝 - + @click.native="showApprovalFlowDetail()" + >审核过程 + + @@ -80,10 +86,30 @@ + + + + + +