Browse Source

首页查看详情不跳转bug修复

sr 4 years ago
parent
commit
6901dd182b

+ 5 - 1
ruoyi-ui/src/views/management/info/index.vue

@@ -54,7 +54,11 @@
       <el-table-column label="项目名称" align="center" prop="name" />
       <el-table-column label="总投资金额(万)" align="center" prop="totAmt" />
       <el-table-column label="填报单位" align="center" prop="deptName" />
-      <el-table-column label="审核情况" align="center" prop="remark" />
+      <el-table-column label="审核情况" align="center" prop="remark" >
+        <template slot-scope="scope">
+          <div v-html="scope.row.remark"></div>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="dictLabel" />
       <el-table-column label="填报日期" width="180" align="center" prop="createTime" />
       <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">

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

@@ -192,7 +192,7 @@ export default {
     } else {
       this.naueactive = this.$route.query.setrd - 0 - 1;
     }
-    console.log(this.naueactive);
+    this.tabIndex = this.$route.query.tabIndex-0
     this.getList();
     this.getDicts("sys_yes_no").then((response) => {
       this.typeOptions = response.data;

+ 9 - 3
ruoyi-ui/src/views/statistical/clue/index.vue

@@ -116,8 +116,14 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {
@@ -177,7 +183,7 @@
     scrollbar-width: none;
     /* firefox */
     -ms-overflow-style: none;
-    
+
     /* IE 10+ */
     &::-webkit-scrollbar {
       display: none;

+ 19 - 12
ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -77,7 +77,7 @@
         ehaersList: {},
         echartData: {
           name: '投产项目个数柱状图',
-          numName: '投产项目个数',
+          numName: '投产项目个数',
           numNameArr: ['投产项目个数']
         },
         loading: false,
@@ -106,14 +106,21 @@
           this.flags = true
         })
       },
-      bd_btn() {
+      bd_btn() {
         console.log(222)
         setInvestmentList().then(res => {
           this.unitList = res.rows
         })
       },
       dec_btn() {
-
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 4,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {
@@ -169,15 +176,15 @@
     box-sizing: border-box;
     margin-bottom: 31px;
     max-height: 270px;
-    overflow-y: auto;
-    scrollbar-width: none;
-    /* firefox */
-    -ms-overflow-style: none;
-
-    /* IE 10+ */
-    &::-webkit-scrollbar {
-      display: none;
-      /* Chrome Safari */
+    overflow-y: auto;
+    scrollbar-width: none;
+    /* firefox */
+    -ms-overflow-style: none;
+
+    /* IE 10+ */
+    &::-webkit-scrollbar {
+      display: none;
+      /* Chrome Safari */
     }
 
     .rig_items {

+ 9 - 2
ruoyi-ui/src/views/statistical/sign/index.vue

@@ -136,8 +136,15 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 2,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {

+ 8 - 1
ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -117,7 +117,14 @@
         })
       },
       dec_btn() {
-
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 3,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {