diff --git a/src/api/purchase/goodsBind.js b/src/api/purchase/goodsBind.js index 5318fdfb..db64b5f0 100644 --- a/src/api/purchase/goodsBind.js +++ b/src/api/purchase/goodsBind.js @@ -31,7 +31,6 @@ export function getMaCodeInfo(query) { }) } -//任务 详情 export function bindAllData(data) { return request({ url: '/material/purchase/bind/bind', @@ -39,6 +38,14 @@ export function bindAllData(data) { data: data, }) } +//绑定驳回 +export function rejectBind(data) { + return request({ + url: '/material/purchase/bind/reject', + method: 'post', + data: data, + }) +} //二级页面 详情 export function getListDetailById(query) { @@ -58,46 +65,5 @@ export function exportNewBuy(purchaseId) { responseType: 'blob', }) } + -//人员 详情 -export function getNoticePeople(query) { - return request({ - url: '/material/purchase_notice_person/list', - method: 'get', - params: query, - }) -} - -// 人员--删除 -export function delPeople(ids) { - return request({ - url: '/material/purchase_notice_person/' + ids, - method: 'post', - }) -} - -// 人员管理--新增 -export function addNoticeUser(data) { - return request({ - url: '/material/purchase_notice_person/batchAddNoticePerson', - method: 'post', - data: data, - }) -} - -// 仓库管理--修改 -export function bmNoticeInfo(data) { - return request({ - url: '/material/purchase_notice_person/batchSendSms', - method: 'put', - data: data, - }) -} - -//机具类型管理列表信息 -export function getUserAll() { - return request({ - url: '/system/user/list', - method: 'get', - }) -} diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue index 44be823c..27681deb 100644 --- a/src/views/material/purchase/goodsAccept/detail.vue +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -209,10 +209,10 @@ /> @@ -413,7 +413,7 @@ export default { //是否可用勾选框 selectable(row) { console.log(row) - if (row.status == 2) { + if (row.status == 2||row.status == 13 ||row.status == 14) { return true } else { return false diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue index e2fc9c9e..eb63f20a 100644 --- a/src/views/material/purchase/goodsBind/component/bindTools.vue +++ b/src/views/material/purchase/goodsBind/component/bindTools.vue @@ -402,6 +402,7 @@ import { getNewBuyBindListDetailsApi, getMaCodeInfo, exportNewBuy, + rejectBind } from "@/api/purchase/goodsBind"; import { downloadFile } from '@/utils/download' import { getToken } from "@/utils/auth"; @@ -601,12 +602,15 @@ export default { }, // 驳回 handleReject(row) { - this.$confirm("是否确定驳回", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => {}) + this.$modal + .confirm("是否确定驳回?") + .then(function () { + return rejectBind({"purchaseId":row.id}) + }) + .then(() => { + this.getCodeList(); + this.$modal.msgSuccess("驳回成功"); + }) .catch(() => {}); }, diff --git a/src/views/material/purchase/goodsBind/component/home.vue b/src/views/material/purchase/goodsBind/component/home.vue index 6068792d..11e5e5c0 100644 --- a/src/views/material/purchase/goodsBind/component/home.vue +++ b/src/views/material/purchase/goodsBind/component/home.vue @@ -184,7 +184,7 @@ size="mini" type="danger" v-if="row.taskStatusName=='未完成'" icon="el-icon-close" - @click="handleNotice(row)" + @click="handleReject(row)" >驳回 @@ -202,7 +202,7 @@