2 커밋 1f4ccce520 ... 0d091a3eb4

작성자 SHA1 메시지 날짜
  wangmengwei 0d091a3eb4 提交 3 주 전
  wangmengwei 71f4d25a62 提交 3 주 전
3개의 변경된 파일9개의 추가작업 그리고 37개의 파일을 삭제
  1. 2 1
      src/views/project/boxlist.vue
  2. 5 34
      src/views/zhaoshang/Information/index.vue
  3. 2 2
      src/views/zhaoshang/completed/index.vue

+ 2 - 1
src/views/project/boxlist.vue

@@ -35,7 +35,7 @@
         			  </div>
             <div class="lbtab isno">
               <div class="tit">项目进度</div>
-              <div class="txt coa">建设中</div>
+              <div class="txt coa"><dict-tag :options="dict.type.project_schedule" :value="item.progress"/></div>
             </div>
             
           </div>
@@ -113,6 +113,7 @@
 <script>
 import { number } from 'echarts'
   export default{
+	  dicts: ['project_schedule', ],
     props: {
       info: {
         type: Object,

+ 5 - 34
src/views/zhaoshang/Information/index.vue

@@ -4,8 +4,8 @@
     <div class="addbox">
       <!-- 步骤条 -->
       <div class="steps">
-        <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="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="line"></div>
           </div>
           <div class="list" v-for="(aite,aidx) in ite.desc" :key="aidx">
@@ -101,12 +101,6 @@
 		infotc: {},
 		id:null,
 		xmbh:null,
-    qxtab:[{tit:'签约双方信息'},{tit:'签约项目信息'},{tit:'附件上传'}],
-    kgtab:[{tit:'开工前相关手续办理'},{tit:'开工信息'},{tit:'附件上传'}],
-    sstab:[{tit:'建设时间'},{tit:'建设进度跟踪'},{tit:'附件上传'}],
-    tctab:[{tit:'投产信息'},{tit:'年度统计'},{tit:'附件上传'}],
-    wctab:[{tit:'提交'}],
-    progress:1,
     cylbOptions:[],
     qybjOptions:[],
     jsxmjzData:[],
@@ -123,28 +117,6 @@
     });
     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:{
@@ -152,7 +124,6 @@
         getQyxx(this.id).then(res=>{
           if(res.code==200){
             this.infoqy=res.data;
-            this.progress=Number(res.data.progress)
             // this.xmbh=res.data.xmbh;
             // this.isdisabled=false;
             // this.progress=Number(res.data.progress)
@@ -366,12 +337,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;}

+ 2 - 2
src/views/zhaoshang/completed/index.vue

@@ -106,7 +106,7 @@
 			  </div>
               <div class="lbtab isno">
                 <div class="tit">项目进度</div>
-                <div class="txt coa">建设中</div>
+                <div class="txt coa"><dict-tag :options="dict.type.project_schedule" :value="item.progress"/></div>
               </div>
               
             </div>
@@ -143,7 +143,7 @@
 import { listQyxx, getQyxx, delQyxx, addQyxx, updateQyxx } from "@/api/zhaoshang/qyxx"
 export default {
   name: "Notice",
-  dicts: ['sys_notice_status', 'sys_notice_type'], 
+  dicts: ['sys_notice_status', 'sys_notice_type','project_schedule'], 
   components:{
   },
   data() {