Merge remote-tracking branch 'origin/dev' into dev

src/api/purchase/workSpace.js

@@ -31,4 +31,13 @@ export function getWorkDetailList(data) {
     method: 'post',
     data: data
   })
+}
+
+// 收回
+export function oaBack(data) {
+  return request({
+    url: `/oaflow/rollback`,
+    method: "POST",
+    data: data,
+  });
 }

src/views/purchase/task/tui-hui-xu-qiu/index.vue

@@ -20,7 +20,12 @@ export default {
   computed: {
     disabled: {
       get() {
-        return !this.selectData.length;
+        if (this.selectData.length > 0) {
+          // status: '4' 已关闭
+          let close = this.selectData.findIndex((item) => item.status === "4");
+          return close !== -1;
+        }
+        return true;
       },
       set() {},
     },

src/views/purchase/workSpace/index.vue

@@ -85,9 +85,9 @@
             <el-button type="text" :size="size" @click.stop="audit(scope.row)"
               >审批</el-button
             >
-            <!-- <el-button type="text" :size="size" @click.stop="reject(scope.row)"
+            <el-button type="text" :size="size" @click.stop="reject(scope.row)"
               >驳回</el-button
-            > -->
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -169,6 +169,7 @@ import {
   getWorkSpaceList,
   auditWork,
   getWorkDetailList,
+  oaBack,
 } from "@/api/purchase/workSpace.js";
 import RULE from "./columns";
 import { dicts } from "./dicts";
@@ -326,12 +327,21 @@ export default {
         }
       )
         .then(async ({ value }) => {
-          console.log(value, "value");
           try {
             this.$modal.loading("加载中...");
-            // let {code,msg} = await
-            // if(code=== 200){
-            // }
+            let params = {
+              checkAmount: false,
+              fdTemplateId: row.fdTemplateId,
+              fdId: row.fdId,
+              billCode: row.billCode,
+              backReason: value,
+            };
+            console.log(params, "params");
+            const { msg, code } = await oaBack(params);
+            if (code === 200) {
+              this.$emit("success");
+              this.$notify.success(msg);
+            }
           } catch (error) {
           } finally {
             this.$modal.closeLoading();