bug修改

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

@@ -54,12 +54,17 @@
       <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">
+        <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">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;"  v-hasPermi="['projectInfo:info:edit']" @click="chei(scope.row)" >查看/审核</el-button>
+          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+            @click="chei(scope.row)">查看/审核</el-button>
           <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
             @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button>
           <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button>

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

@@ -5,7 +5,7 @@
         项目详情 >
       </span>
     </div> -->
-    <div style="height: 85px"></div>
+    <div style="height: 15px"></div>
 
     <div class="naue">
       <!-- //步骤条 -->
@@ -193,6 +193,15 @@ export default {
       this.naueactive = this.$route.query.setrd - 0 - 1;
     }
     this.tabIndex = this.$route.query.tabIndex-0 || 0
+    if(this.tabIndex==0){
+      this.currentContent = 'one'
+    }else if(this.tabIndex==2){
+      this.currentContent = 'four'
+    }else if(this.tabIndex==3){
+      this.currentContent = 'two'
+    }else if(this.tabIndex==4){
+      this.currentContent = 'three'
+    }
     this.getList();
     this.getDicts("sys_yes_no").then((response) => {
       this.typeOptions = response.data;
@@ -329,6 +338,7 @@ export default {
     changeTab(index) {
       console.log(34);
       this.tabIndex = index.index;
+      
       this.currentContent = index.component;
       // this.$router.push('/tab');
     },

ruoyi-ui/src/views/statistical/clue/index.vue

@@ -116,8 +116,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: 1,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {
@@ -177,7 +184,7 @@
     scrollbar-width: none;
     /* firefox */
     -ms-overflow-style: none;
-    
+
     /* IE 10+ */
     &::-webkit-scrollbar {
       display: none;

ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -112,8 +112,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: 4,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {

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('是否确认销号', "提醒", {

ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -116,8 +116,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: 3,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {