修改

ruoyi-ui/src/api/system/config.js

@@ -46,6 +46,13 @@ export function listConfigther(query) {
     // params:
   })
 }
+export function listConfigtheroie(query) {
+  return request({
+    url: '/bmProject/project/' + query,
+    method: 'get'
+    // params:
+  })
+}
 export function listConfigfive(query) {
   return request({
     url: '/projectConstruction/construction/' +query,
@@ -71,8 +78,8 @@ export function listConfigserve(query) {
 export function listConfigfunding(query) {
   return request({
     url: '/constructionPay/pay/list',
-    method: 'get'
-    // params:
+    method: 'get',
+    params:query
   })
 }
 

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

@@ -844,6 +844,8 @@ export default {
   created() {
     this.bmProjectId = this.$route.query.setid;
     this.bmjdeu.bmProjectId = this.$route.query.setid;
+    this.queryParamsstallation.bmProjectId = this.$route.query.setid;
+    this.queryParams.bmProjectId = this.$route.query.setid;
     this.setrd = this.$route.query.setrd;
     if(this.setrd !== 5){
       this.disfal = true
@@ -892,22 +894,23 @@ export default {
     //驳回
     backBtn() {
       var that=this
-      this.$confirm("是否确认驳回", "提醒", {
+      this.$prompt("请输入驳回意见", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(function () {
-          return setReject({
-            code: 2,
-            bmProjectId: that.bmProjectId,
+        .then(({ value }) => {
+            return setReject({
+              code: 2,
+              bmProjectId: that.bmProjectId,
+              remark:value
+            });
+           })
+          .then(() => {
+            this.$router.go(-1);
+            this.getList();
+            this.msgSuccess("驳回成功");
           });
-        })
-        .then(() => {
-          this.$router.go(-1);
-          this.getList();
-          this.msgSuccess("驳回成功");
-        });
     },
     handleChange(file, fileList){
       console.log(file, fileList)
@@ -1105,7 +1108,7 @@ export default {
     //项目到资列表接口
     getListfour() {
       this.loading = true;
-      listConfigfunding().then((response) => {
+      listConfigfunding(this.queryParams).then((response) => {
         this.configLisfour = response.rows;
         this.configLisfour.filter((route) => {
           if (route.photo !== null) {

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

@@ -11,9 +11,9 @@
       <!-- //步骤条 -->
       <div class="nuae_wtu">
         <div class="naue_one">
-          <p class="naue_name">项目名称：电子类企业</p>
-          <p>返乡创业：是</p>
-          <p>所属产业：电子产业</p>
+          <p class="naue_name">项目名称：{{oekjg.name == null ? '' : oekjg.name}}</p>
+          <p>返乡创业：{{oekjg.isBackbussiness == "Y"? '是' : '否'}}</p>
+          <p>所属产业：{{oekjg.industry == null ? '' : oekjg.industry}}</p>
         </div>
         <div class="naue_two">
           <el-steps :active="naueactive" align-center finish-status="success">
@@ -88,6 +88,7 @@
 import {
   listConfig,
   listConfigther,
+  listConfigtheroie,
   getConfig,
   delConfig,
   addConfig,
@@ -184,6 +185,8 @@ export default {
           { required: true, message: "参数键值不能为空", trigger: "blur" },
         ],
       },
+      bmProjectId:0,
+      oekjg:{}
     };
   },
   created() {
@@ -202,7 +205,9 @@ export default {
     }else if(this.tabIndex==4){
       this.currentContent = 'three'
     }
+    this.bmProjectId = this.$route.query.setid
     this.getList();
+    this.getListList(this.bmProjectId );
     this.getDicts("sys_yes_no").then((response) => {
       this.typeOptions = response.data;
     });
@@ -218,6 +223,16 @@ export default {
         this.loading = false;
       });
     },
+    getListList(index) {
+      this.loading = true;
+      listConfigtheroie(index).then((response) => {
+        console.log(response);
+        this.oekjg = response.data
+        // this.configList = response.data;
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
     // 参数系统内置字典翻译
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.configType);

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

@@ -883,27 +883,12 @@ export default {
             bmProjectId: that.bmProjectId,
             remark:value
           });
-                // this.$message({
-                //   type: 'success',
-                //   message: '你的邮箱是: ' + value
-                // });
          })
-        // .then(({ value }) {
-        //   // return setReject({
-        //   //   code: 2,
-        //   //   bmProjectId: that.bmProjectId,
-        //   // });
-        // })
-        .catch(() => {
-                  this.$router.go(-1);
-                    this.getList();
-                    this.msgSuccess("驳回成功");
-                })
-        // .then(() => {
-        //   // this.$router.go(-1);
-        //   // this.getList();
-        //   // this.msgSuccess("驳回成功");
-        // });
+        .then(() => {
+          this.$router.go(-1);
+          this.getList();
+          this.msgSuccess("驳回成功");
+        });
     },
     submitUpload() {
       this.$refs.upload.submit();