diff --git a/src/api/business/index.js b/src/api/business/index.js index ed131492..467d2c65 100644 --- a/src/api/business/index.js +++ b/src/api/business/index.js @@ -157,3 +157,39 @@ export function deleteRedif(id) { method: 'delete' }) } + +// 直转审核-列表 +export function getDerateList(query) { + return request({ + url: '/material/directAudit/list', + method: 'get', + params: query + }) +} + +// 直转审核-详情 +export function getInfoById(query) { + return request({ + url: '/material/directAudit/getInfoById', + method: 'get', + params: query + }) +} + +// 直转审核-流程信息 +export function getAuditInfo(query) { + return request({ + url: '/material/directAudit/getAuditInfo', + method: 'get', + params: query + }) +} + +// 直转审核-审核 +export function auditDir(data) { + return request({ + url: '/material/directAudit/auditDir', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index e3146457..05d85cf3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -203,7 +203,7 @@ export const dynamicRoutes = [ path: '/business-details/direct-rotation-apply', component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 hidden: true, - permissions: ['*'], // 权限字符 + permissions: ['direct-apply:list'], // 权限字符 children: [ { path: 'index', diff --git a/src/views/business-examine/direct-rotation-apply/business-details.vue b/src/views/business-examine/direct-rotation-apply/business-details.vue index beab4cf6..2f3b292a 100644 --- a/src/views/business-examine/direct-rotation-apply/business-details.vue +++ b/src/views/business-examine/direct-rotation-apply/business-details.vue @@ -1,22 +1,450 @@ - - - - 左侧 - - - 右侧 - - - + + + + + 直转申请详情 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程记录 + + + + + + + + {{ step.nodeName }} + + 待审批 + 已通过 + 已驳回 + {{ step.creator }} + {{ step.createTime }} + {{ step.remark }} + + + + + + + + + + + 通过 + 驳回 + + + + + + - diff --git a/src/views/business-examine/direct-rotation-apply/components/title-tip.vue b/src/views/business-examine/direct-rotation-apply/components/title-tip.vue new file mode 100644 index 00000000..2970e850 --- /dev/null +++ b/src/views/business-examine/direct-rotation-apply/components/title-tip.vue @@ -0,0 +1,37 @@ + + + + {{ title }} + + + + + + diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue index 1a18d891..e06755cd 100644 --- a/src/views/business-examine/direct-rotation-apply/index.vue +++ b/src/views/business-examine/direct-rotation-apply/index.vue @@ -1,276 +1,227 @@ - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - 查看 - - - 审核 - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + 查询 + 重置 + + - - - - - - - - - - - - - + + + + + + + + + + + 待审核 + + 审核中 + + 已审核 + + + 已驳回 + + + + + + + + + 审核 + + + + + + + + + + + diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index 58834309..083714d6 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -654,8 +654,8 @@ export default { }, //获取任务详情--- 编辑回显数据 async getTaskInfo() { + const loading = this.$loading() try { - const loading = this.$loading() const res = await receiveDetail({ id: this.id }) console.log('🚀 ~ getTaskInfo ~ res:', res) this.maForm = res.data diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index 77396312..6e49d8b3 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -488,8 +488,8 @@ export default { }, async standardConfigChange(val) { console.log('🚀 ~ standardConfigChange ~ val:', val) + const loading = this.$loading() try { - const loading = this.$loading() const params = { configId: val.id } @@ -625,8 +625,8 @@ export default { }, //获取任务详情--- 编辑回显数据 async getTaskInfo() { + const loading = this.$loading() try { - const loading = this.$loading() const res = await getLeaseTaskDetail(this.id) console.log('🚀 ~ getTaskInfo ~ res:', res) this.maForm = res.data.leaseApplyInfo diff --git a/src/views/material/ma/mechEquipConfigMgmt/index.vue b/src/views/material/ma/mechEquipConfigMgmt/index.vue index 8d3a87f6..7899b24e 100644 --- a/src/views/material/ma/mechEquipConfigMgmt/index.vue +++ b/src/views/material/ma/mechEquipConfigMgmt/index.vue @@ -469,8 +469,8 @@ export default { console.log(this.form, '提交参数---') this.$refs['form'].validate(valid => { if (valid) { + const loading = this.$loading() try { - const loading = this.$loading() const params = { configId: this.form.configId, typeIds: this.form.typeModel diff --git a/src/views/material/repair/testExamine/component/addToolsApply.vue b/src/views/material/repair/testExamine/component/addToolsApply.vue index cb2de152..b1da04bf 100644 --- a/src/views/material/repair/testExamine/component/addToolsApply.vue +++ b/src/views/material/repair/testExamine/component/addToolsApply.vue @@ -48,7 +48,7 @@ plain icon="el-icon-check" size="mini" - :disabled="multiple" + @click="handlePassAll" >通过 @@ -59,7 +59,7 @@ plain icon="el-icon-close" size="mini" - :disabled="multiple" + @click="handleFailAll" >驳回 @@ -81,12 +81,12 @@ row-key="id" @selection-change="handleSelectionChange" > - + /> --> { - if (response.code == 200) { - this.$modal.msgSuccess("通过成功"); - } - this.getTaskInfo(); - }); - } + // if (this.ids.length == 0) { + // this.$alert("请至少勾选一条审核数据", "提示", { + // type: "warning", + // confirmButtonText: "确定", + // }); + // return; + // } else { + let param = []; + this.equipmentList.forEach((item) => { + param.push({ id: item.id, status: "1",specificationType: item.specificationType,machineTypeName:item.machineTypeName, + unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,scrapNum:item.scrapNum,typeId:item.typeId,taskId:item.taskId, + auditId:item.id,repairId:item.repairId,maId:item.maId,maCode:item.maCode }); + }) + + auditPass(param).then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess("通过成功"); + } + this.getTaskInfo(); + }); + // } }, //多个驳回 handleFailAll() { - if (this.ids.length == 0) { - this.$alert("请至少勾选一条审核数据", "提示", { - type: "warning", - confirmButtonText: "确定", - }); - return; - } else { - auditPass(this.failTemp).then((response) => { + // if (this.ids.length == 0) { + // this.$alert("请至少勾选一条审核数据", "提示", { + // type: "warning", + // confirmButtonText: "确定", + // }); + // return; + // } else { + let param = []; + this.equipmentList.forEach((item) => { + param.push({ id: item.id, status: "2",specificationType: item.specificationType,machineTypeName:item.machineTypeName, + unitName:item.unitName,repairNum:item.repairNum,repairedNum:item.repairedNum,scrapNum:item.scrapNum,typeId:item.typeId,taskId:item.taskId, + auditId:item.id,repairId:item.repairId,maId:item.maId,maCode:item.maCode + }); + }) + auditPass(param).then((response) => { if (response.code == 200) { this.$modal.msgSuccess("驳回成功"); } this.getTaskInfo(); }); - } + // } }, }, };