驳回提交2

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) {
@@ -59,45 +66,4 @@ export function exportNewBuy(purchaseId) {
     })
 }
   
-//人员 详情
-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',
-    })
-}

src/views/material/purchase/goodsAccept/detail.vue

@@ -209,10 +209,10 @@
       />
       <el-table-column label="操作" align="center" width="180" v-if="!isView">
         <template slot-scope="scope">
-          <el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2">
+          <el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
             合格
           </el-button>
-          <el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==2">
+          <el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
             不合格
           </el-button>
         </template>
@@ -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

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("是否确定驳回", "提示", {
+      this.$modal
-        confirmButtonText: "确定",
+        .confirm("是否确定驳回？")
-        cancelButtonText: "取消",
+        .then(function () {
-        type: "warning",
+          return rejectBind({"purchaseId":row.id}) 
+        })
+        .then(() => {
+          this.getCodeList();
+          this.$modal.msgSuccess("驳回成功");
         })
-        .then(() => {})
         .catch(() => {});
     },
 

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)"
                         >驳回</el-button
                     >
                 </template>
@@ -202,7 +202,7 @@
 </template>
 
 <script>
-import { getNewBuyBindListApi } from '@/api/purchase/goodsBind'
+import { getNewBuyBindListApi,rejectBind } from '@/api/purchase/goodsBind'
 
 export default {
     name: 'Home',
@@ -277,14 +277,17 @@ export default {
             this.$emit('openBindTools', row.taskId, row.id, 2)
         },
         // 驳回
-        handleNotice(row) {
+        handleReject(row) {
-            this.$confirm('是否确定驳回', '提示', {
+            this.$modal
-                confirmButtonText: '确定',
+                .confirm("是否确定驳回？")
-                cancelButtonText: '取消',
+                .then(function () {
-                type: 'warning',
+                return rejectBind({"taskId":row.taskId}) 
                 })
-                .then(() => {})
+                .then(() => {
-                .catch(() => {})
+                this.getList();
+                this.$modal.msgSuccess("驳回成功");
+                })
+                .catch(() => {}); 
         },
         // 下载二维码
         onDownloadQr() {