sr 4 жил өмнө
parent
commit
5e111d44b5

+ 8 - 0
ruoyi-ui/src/api/projectInfo/info.js

@@ -17,6 +17,14 @@ export function setPass(data) {
   })
   })
 }
 }
 
 
+// 撤销审核
+export function setBack(data) {
+  return request({
+    url: '/bmProject/project/back',
+    method: 'post',
+    data: data
+  })
+}
 // 驳回项目
 // 驳回项目
 export function setReject(data) {
 export function setReject(data) {
   return request({
   return request({

+ 30 - 0
ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -11,6 +11,14 @@
         <el-col :span="1.5">
         <el-col :span="1.5">
           <el-button type="primary" @click="goBtn">取消</el-button>
           <el-button type="primary" @click="goBtn">取消</el-button>
         </el-col>
         </el-col>
+        <el-col :span="1.5" :offset="16" v-if="setrd % 2 == 1&&setrd>2">
+          <el-button
+            type="danger"
+            @click="backProBtn"
+            v-hasPermi="['bmProject:project:back']"
+            >撤销审核</el-button
+          >
+        </el-col>
         <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
           <el-button type="danger" @click="applyBtn" v-hasPermi="['bmProject:project:pass']">审核</el-button>
           <el-button type="danger" @click="applyBtn" v-hasPermi="['bmProject:project:pass']">审核</el-button>
           <el-button type="danger" @click="backBtn" v-hasPermi="['bmProject:project:reject']">驳回</el-button>
           <el-button type="danger" @click="backBtn" v-hasPermi="['bmProject:project:reject']">驳回</el-button>
@@ -474,6 +482,7 @@
   } from "@/api/system/signContract";
   } from "@/api/system/signContract";
   import {
   import {
     setExamine,
     setExamine,
+    setBack,
     setReject
     setReject
   } from "@/api/projectInfo/info.js";
   } from "@/api/projectInfo/info.js";
   const defaultSettings = require("@/settings.js");
   const defaultSettings = require("@/settings.js");
@@ -764,6 +773,27 @@
       this.getShareholderList();
       this.getShareholderList();
     },
     },
     methods: {
     methods: {
+      backProBtn(){
+        var that=this
+        this.$prompt("请输入驳回意见", "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(({ value }) => {
+            return setBack({
+              code: 4,
+              bmProjectId: that.queryParams.bmProjectId,
+              remark:value
+            });
+           })
+          .then(() => {
+            this.msgSuccess("驳回成功");
+            setTimeout(res => {
+              this.$router.go(-1)
+            }, 1000)
+          });
+      },
       imgBtn(url) {
       imgBtn(url) {
         this.pir_imgs = url
         this.pir_imgs = url
         this.$refs.BigPicture.hidden.status = true
         this.$refs.BigPicture.hidden.status = true

+ 30 - 1
ruoyi-ui/src/views/management/nstruction/index.vue

@@ -24,6 +24,14 @@
           >下一页</el-button
           >下一页</el-button
         >
         >
       </el-col>
       </el-col>
+      <el-col :span="1.5" :offset="16" v-if="setrd % 2 == 1&&setrd>2">
+        <el-button
+          type="danger"
+          @click="backProBtn"
+          v-hasPermi="['bmProject:project:back']"
+          >撤销审核</el-button
+        >
+      </el-col>
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-button
         <el-button
           type="danger"
           type="danger"
@@ -718,6 +726,7 @@ import {
   const defaultSettings = require("@/settings.js");
   const defaultSettings = require("@/settings.js");
 import{
 import{
   setExamine,
   setExamine,
+  setBack,
   setReject
   setReject
 } from "@/api/projectInfo/info.js";
 } from "@/api/projectInfo/info.js";
 export default {
 export default {
@@ -881,6 +890,26 @@ export default {
     });
     });
   },
   },
   methods: {
   methods: {
+    backProBtn(){
+      var that=this
+      this.$prompt("请输入驳回意见", "提醒", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(({ value }) => {
+          return setBack({
+            code: 4,
+            bmProjectId: that.bmProjectId,
+            remark:value
+          });
+         })
+        .then(() => {
+          this.$router.go(-1);
+          // this.getList();
+          this.msgSuccess("驳回成功");
+        });
+    },
     //审核
     //审核
     applyBtn() {
     applyBtn() {
       var that=this
       var that=this
@@ -897,7 +926,7 @@ export default {
         })
         })
         .then(() => {
         .then(() => {
           this.$router.go(-1);
           this.$router.go(-1);
-          this.getList();
+          // this.getList();
           this.msgSuccess("审核成功");
           this.msgSuccess("审核成功");
         });
         });
     },
     },

+ 30 - 2
ruoyi-ui/src/views/management/roduction/index.vue

@@ -23,6 +23,14 @@
           >取消</el-button
           >取消</el-button
         >
         >
       </el-col>
       </el-col>
+      <el-col :span="1.5" :offset="16" v-if="setrd % 2 == 1&&setrd>2">
+        <el-button
+          type="danger"
+          @click="backProBtn"
+          v-hasPermi="['bmProject:project:back']"
+          >撤销审核</el-button
+        >
+      </el-col>
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-button
         <el-button
           type="danger"
           type="danger"
@@ -161,7 +169,7 @@ import {
   updateProduct,
   updateProduct,
   exportProduct,
   exportProduct,
 } from "@/api/production/production.js";
 } from "@/api/production/production.js";
-import { setExamine, setReject } from "@/api/projectInfo/info.js";
+import { setExamine, setReject,setBack } from "@/api/projectInfo/info.js";
   const defaultSettings = require("@/settings.js");
   const defaultSettings = require("@/settings.js");
 export default {
 export default {
   name: "production",
   name: "production",
@@ -229,6 +237,26 @@ export default {
     });
     });
   },
   },
   methods: {
   methods: {
+    backProBtn(){
+      var that=this
+      this.$prompt("请输入驳回意见", "提醒", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(({ value }) => {
+          return setBack({
+            code: 4,
+            bmProjectId: that.form.bmProjectId,
+            remark:value
+          });
+         })
+        .then(() => {
+          this.$router.go(-1);
+          // this.getList();
+          this.msgSuccess("驳回成功");
+        });
+    },
     reset() {
     reset() {
       var that = this;
       var that = this;
       that.form = {
       that.form = {
@@ -269,7 +297,7 @@ export default {
         })
         })
         .then(() => {
         .then(() => {
           this.$router.go(-1);
           this.$router.go(-1);
-          this.getList();
+          // this.getList();
           this.msgSuccess("审核成功");
           this.msgSuccess("审核成功");
         });
         });
     },
     },

+ 31 - 2
ruoyi-ui/src/views/under/index.vue

@@ -24,6 +24,14 @@
           v-hasPermi="['system:config:edit']"
           v-hasPermi="['system:config:edit']"
           >取消</el-button
           >取消</el-button
         >
         >
+      </el-col>
+      <el-col :span="1.5" :offset="16" v-if="setrd % 2 == 1&&setrd>2">
+        <el-button
+          type="danger"
+          @click="backProBtn"
+          v-hasPermi="['bmProject:project:back']"
+          >撤销审核</el-button
+        >
       </el-col>
       </el-col>
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-button
         <el-button
@@ -669,7 +677,8 @@ import {
   clearCache,
   clearCache,
 } from "@/api/system/config";
 } from "@/api/system/config";
 import{
 import{
-  setExamine,
+  setExamine,
+  setBack,
   setReject
   setReject
 } from "@/api/projectInfo/info.js";
 } from "@/api/projectInfo/info.js";
 export default {
 export default {
@@ -880,7 +889,27 @@ export default {
     this.getListthuy();
     this.getListthuy();
     console.log(this.queryParams);
     console.log(this.queryParams);
   },
   },
-  methods: {
+  methods: {
+    backProBtn(){
+      var that=this
+      this.$prompt("请输入驳回意见", "提醒", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(({ value }) => {
+          return setBack({
+            code: 4,
+            bmProjectId: that.bmProjectId,
+            remark:value
+          });
+         })
+        .then(() => {
+          this.$router.go(-1);
+          this.getList();
+          this.msgSuccess("驳回成功");
+        });
+    },
     handleChange(value){
     handleChange(value){
       //0
       //0
       this.queryParams.referralList[0].sysDeptId = value.pop()
       this.queryParams.referralList[0].sysDeptId = value.pop()