1

src/views/project/boxlist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <block v-if="type=='xmgl'">
+    <template v-if="type=='xmgl'">
       <div class="boxlist" v-for="(item,index) in datalist.noticeList" :key="index" v-if='datalist.noticeList.length != 0'>
         <div class="ltop flex ">
             <div class="check">
@@ -53,10 +53,10 @@
 	  <div v-if='datalist.noticeList.length == 0'>
 	    <el-empty :image-size="200"></el-empty>
 	  </div>
-    </block>
+    </template>
 	
 	
-    <block v-if="type=='xmyq'">
+    <template v-if="type=='xmyq'">
       <div class="boxlist" v-for="ite in 5">
         <div class="ltop flex yqtop">
             <div class="check">
@@ -106,7 +106,7 @@
           </div>
         </div>
       </div>
-    </block>
+    </template>
   </div>
 </template>
 

src/views/zhaoshang/Information/index.vue

@@ -4,8 +4,8 @@
     <div class="addbox">
       <!-- 步骤条 -->
       <div class="steps">
-        <div class="step" :class="{'finish':active>idx+1,'act':active==idx+1}" v-for="(ite,idx) in step" :key="idx" >
-          <div class="tit flexc"><span>{{idx+1}}</span>{{ite.tit}}
+        <div class="step" :class="{'finish':progress>ite.dictValue,'act':progress==ite.dictValue}" v-for="(ite,idx) in step" :key="idx" >
+          <div class="tit flexc"><span>{{idx+1}}</span>{{ite.dictLabel}}
             <div class="line"></div>
           </div>
           <div class="list" v-for="(aite,aidx) in ite.desc" :key="aidx">
@@ -106,6 +106,12 @@
     jsxmjzData:[],
     jdqkData:[],//建工进度情况
 	 defaultSettings:defaultSettings,
+   qxtab:[{tit:'签约双方信息'},{tit:'签约项目信息'},{tit:'附件上传'}],
+   kgtab:[{tit:'开工前相关手续办理'},{tit:'开工信息'},{tit:'附件上传'}],
+   sstab:[{tit:'建设时间'},{tit:'建设进度跟踪'},{tit:'附件上传'}],
+   tctab:[{tit:'投产信息'},{tit:'年度统计'},{tit:'附件上传'}],
+   wctab:[{tit:'提交'}],
+   progress:1,
       }
     },
 	created() {
@@ -117,6 +123,28 @@
     });
     this.getDicts("enterprise_background").then(response => {
       this.qybjOptions = response.data;
+    });
+    // 项目进度project_schedule
+    this.getDicts("project_schedule").then(response => {
+      this.step = response.data.map(v => {
+        if(v.dictValue==1){
+          v.desc=this.qxtab
+        }else if(v.dictValue==2){
+          v.desc=this.kgtab
+        }else if(v.dictValue==3){
+          v.desc=this.sstab
+        }else if(v.dictValue==4){
+          v.desc=this.tctab
+        }else if(v.dictValue==5){
+          v.desc=this.wctab
+        }
+      	return {
+      		dictLabel: v.dictLabel,
+      		dictValue: v.dictValue,
+      		desc: v.desc
+      	}
+      })
+      // this.xmjdOptions = response.data;
     });
 	},
     methods:{
@@ -126,7 +154,7 @@
             this.infoqy=res.data;
             // this.xmbh=res.data.xmbh;
             // this.isdisabled=false;
-            // this.progress=Number(res.data.progress)
+            this.progress=Number(res.data.progress)
           }
         })
       },
@@ -337,12 +365,12 @@
           span{background: #1890FF;color: #FFFFFF;border: none;}
 
         }
+        .list{
+          .cir{background: #00A854;}
+        }
       }
       &.finish{
          .line{background-color: #1890FF !important;}
-         .list{
-           .cir{background: #00A854;}
-         }
       }
       &:last-child{
         .line{display: none !important;}