bug更新

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -722,16 +722,16 @@
           isIndependentLan: "", //是否独立供地(N:Y)
           landArea: "", //供地面积
           landAddress: "", //供地位置
-          landPhoto: "", //土地证ur
+          landPhoto: [], //土地证ur
           circulationLand: "", //流转土地面积
           circulationAddres: "", //流转土地位置
           circulationDoc: [], //土地流转合同
-          circulationPhoto: "", //产权证
+          circulationPhoto: [], //产权证
           leasePlantArea: "", //租赁厂房面积
           leasePlantAddress: "", //租赁厂房位置
-          leasePlantDoc: "", //租赁合同
-          leasePlantPhoto: "", //租赁产权证
-          agreementTot: "", //租赁产权证
+          leasePlantDoc: [], //租赁合同
+          leasePlantPhoto: [], //租赁产权证
+          agreementTot: '', //租赁产权证
           agreementTax: "", // 合同约定税收
           agreementStartdate: "", // 合同约定开工时间
           agreementEnddate: "", //合同约定竣工时间
@@ -774,21 +774,20 @@
     },
     methods: {
       backProBtn(){
-        var that=this
-        this.$prompt("请输入驳回意见", "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(({ value }) => {
+        var that = this
+        this.$confirm("是否确认撤销审核", "提醒", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(function() {
             return setBack({
               code: 4,
               bmProjectId: that.queryParams.bmProjectId,
-              remark:value
             });
-           })
+          })
           .then(() => {
-            this.msgSuccess("驳回成功");
+            this.msgSuccess("撤销成功");
             setTimeout(res => {
               this.$router.go(-1)
             }, 1000)

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -891,24 +891,24 @@ export default {
   },
   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("驳回成功");
-        });
+		var that = this
+		this.$confirm("是否确认撤销审核", "提醒", {
+		    confirmButtonText: "确定",
+		    cancelButtonText: "取消",
+		    type: "warning",
+		  })
+		  .then(function() {
+		    return setBack({
+		      code: 4,
+		      bmProjectId: that.bmProjectId,
+		    });
+		  })
+		  .then(() => {
+		    this.msgSuccess("撤销成功");
+		    setTimeout(res => {
+		      this.$router.go(-1)
+		    }, 1000)
+		  });
     },
     //审核
     applyBtn() {

ruoyi-ui/src/views/management/roduction/index.vue

@@ -238,24 +238,25 @@ export default {
   },
   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("驳回成功");
-        });
+		var that = this
+		this.$confirm("是否确认撤销审核", "提醒", {
+		    confirmButtonText: "确定",
+		    cancelButtonText: "取消",
+		    type: "warning",
+		  })
+		  .then(function() {
+		    return setBack({
+		      code: 4,
+		      bmProjectId: that.form.bmProjectId,
+		    });
+		  })
+		  .then(() => {
+		    this.msgSuccess("撤销成功");
+		    setTimeout(res => {
+		      this.$router.go(-1)
+		    }, 1000)
+		  });
+		  
     },
     reset() {
       var that = this;

ruoyi-ui/src/views/under/index.vue

@@ -892,25 +892,25 @@ export default {
     console.log(this.queryParams);
   },
   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("驳回成功");
-        });
+    backProBtn(){
+		var that = this
+		this.$confirm("是否确认撤销审核", "提醒", {
+		    confirmButtonText: "确定",
+		    cancelButtonText: "取消",
+		    type: "warning",
+		  })
+		  .then(function() {
+		    return setBack({
+		      code: 4,
+		      bmProjectId: that.bmProjectId,
+		    });
+		  })
+		  .then(() => {
+		    this.msgSuccess("撤销成功");
+		    setTimeout(res => {
+		      this.$router.go(-1)
+		    }, 1000)
+		  });
     },
     handleChange(value){
       //0